Revert "Flush small task adjustments"

Compute-Runtime-Validation · Compute-Runtime-Automation · commit 8c6fed21497f · 2021-10-28T09:19:32.000+02:00
This reverts commit 32ae955. Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl
@@ -176,6 +176,7 @@ ze_result_t CommandListCoreFamilyImmediate<gfxCoreFamily>::appendBarrier(
             NEO::PipeControlArgs args;
             this->csr->flushNonKernelTask(nullptr, 0, 0, args, false, false, false);
             if (this->isSyncModeQueue) {
+                this->csr->flushTagUpdate();
                 auto timeoutMicroseconds = NEO::TimeoutControls::maxTimeout;
                 this->csr->waitForCompletionWithTimeout(false, timeoutMicroseconds, this->csr->peekTaskCount());
             }
@@ -287,6 +288,7 @@ ze_result_t CommandListCoreFamilyImmediate<gfxCoreFamily>::appendSignalEvent(ze_
         }
         this->csr->flushNonKernelTask(&event->getAllocation(this->device), event->getGpuAddress(this->device), Event::STATE_SIGNALED, args, false, false, false);
         if (this->isSyncModeQueue) {
+            this->csr->flushTagUpdate();
             auto timeoutMicroseconds = NEO::TimeoutControls::maxTimeout;
             this->csr->waitForCompletionWithTimeout(false, timeoutMicroseconds, this->csr->peekTaskCount());
         }
@@ -320,6 +322,7 @@ ze_result_t CommandListCoreFamilyImmediate<gfxCoreFamily>::appendEventReset(ze_e
         }
         this->csr->flushNonKernelTask(&event->getAllocation(this->device), event->getGpuAddress(this->device), Event::STATE_CLEARED, args, false, false, false);
         if (this->isSyncModeQueue) {
+            this->csr->flushTagUpdate();
             auto timeoutMicroseconds = NEO::TimeoutControls::maxTimeout;
             this->csr->waitForCompletionWithTimeout(false, timeoutMicroseconds, this->csr->peekTaskCount());
         }
diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp
@@ -28,6 +28,7 @@ CommandListAllocatorFn commandListFactoryImmediate[IGFX_MAX_PRODUCT] = {};
 
 ze_result_t CommandListImp::destroy() {
     if (this->isFlushTaskSubmissionEnabled && !this->isSyncModeQueue) {
+        this->csr->flushTagUpdate();
         auto timeoutMicroseconds = NEO::TimeoutControls::maxTimeout;
         this->csr->waitForCompletionWithTimeout(false, timeoutMicroseconds, this->csr->peekTaskCount());
     }
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl
@@ -558,10 +558,6 @@ void CommandQueueHw<gfxCoreFamily>::dispatchTaskCountWrite(NEO::LinearStream &co
 
     UNRECOVERABLE_IF(csr == nullptr);
 
-    if (csr->isUpdateTagFromWaitEnabled()) {
-        return;
-    }
-
     auto taskCountToWrite = csr->peekTaskCount() + 1;
     auto gpuAddress = static_cast<uint64_t>(csr->getTagAllocation()->getGpuAddress());
 
diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue.cpp
@@ -243,34 +243,6 @@ HWTEST_F(CommandQueueCreate, given100CmdListsWhenExecutingThenCommandStreamIsNot
     commandQueue->destroy();
 }
 
-HWTEST_F(CommandQueueCreate, givenUpdateTaskCountFromWaitWhenDispatchTaskCountWriteThenNoPipeControlFlushed) {
-    using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
-
-    DebugManagerStateRestore restorer;
-    DebugManager.flags.UpdateTaskCountFromWait.set(1);
-
-    const ze_command_queue_desc_t desc = {};
-    ze_result_t returnValue;
-    auto commandQueue = whitebox_cast(CommandQueue::create(productFamily,
-                                                           device,
-                                                           neoDevice->getDefaultEngine().commandStreamReceiver,
-                                                           &desc,
-                                                           false,
-                                                           false,
-                                                           returnValue));
-
-    commandQueue->dispatchTaskCountWrite(*commandQueue->commandStream, false);
-
-    GenCmdList cmdList;
-    ASSERT_TRUE(FamilyType::PARSE::parseCommandBuffer(
-        cmdList, ptrOffset(commandQueue->commandStream->getCpuBase(), 0), commandQueue->commandStream->getUsed()));
-
-    auto itor = find<PIPE_CONTROL *>(cmdList.begin(), cmdList.end());
-    EXPECT_EQ(cmdList.end(), itor);
-
-    commandQueue->destroy();
-}
-
 HWTEST_F(CommandQueueCreate, givenContainerWithAllocationsWhenResidencyContainerIsEmptyThenMakeResidentWasNotCalled) {
     auto csr = std::make_unique<MockCommandStreamReceiver>(*neoDevice->getExecutionEnvironment(), 0, neoDevice->getDeviceBitfield());
     csr->setupContext(*neoDevice->getDefaultEngine().osContext);
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp
@@ -125,8 +125,6 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, GivenEmptyQueueWhenFinishingThenTa
 
 HWTEST_F(CommandStreamReceiverFlushTaskTests, givenTaskCountToWaitBiggerThanLatestSentTaskCountWhenWaitForCompletionThenFlushPipeControl) {
     typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL;
-    DebugManagerStateRestore restorer;
-    DebugManager.flags.UpdateTaskCountFromWait.set(1);
 
     auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
 
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
@@ -530,38 +530,6 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrInBatchingModeWhenFlushTas
     EXPECT_EQ(1u, mockCsr->peekLatestFlushedTaskCount());
 }
 
-HWTEST_F(CommandStreamReceiverFlushTaskTests, givenUpdateTaskCountFromWaitWhenFlushBatchedIsCalledThenFlushedTaskCountIsNotModifed) {
-    DebugManagerStateRestore restorer;
-    DebugManager.flags.UpdateTaskCountFromWait.set(1);
-
-    auto mockCsr = new MockCsrHw2<FamilyType>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
-    pDevice->resetCommandStreamReceiver(mockCsr);
-    mockCsr->useNewResourceImplicitFlush = false;
-    mockCsr->useGpuIdleImplicitFlush = false;
-    mockCsr->overrideDispatchPolicy(DispatchMode::BatchedDispatch);
-
-    DispatchFlags dispatchFlags = DispatchFlagsHelper::createDefaultDispatchFlags();
-    dispatchFlags.preemptionMode = PreemptionHelper::getDefaultPreemptionMode(pDevice->getHardwareInfo());
-    dispatchFlags.guardCommandBufferWithPipeControl = true;
-
-    mockCsr->flushTask(commandStream,
-                       0,
-                       dsh,
-                       ioh,
-                       ssh,
-                       taskLevel,
-                       dispatchFlags,
-                       *pDevice);
-
-    EXPECT_EQ(1u, mockCsr->peekLatestSentTaskCount());
-    EXPECT_EQ(0u, mockCsr->peekLatestFlushedTaskCount());
-
-    mockCsr->flushBatchedSubmissions();
-
-    EXPECT_EQ(1u, mockCsr->peekLatestSentTaskCount());
-    EXPECT_EQ(0u, mockCsr->peekLatestFlushedTaskCount());
-}
-
 HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrInDefaultModeWhenFlushTaskIsCalledThenFlushedTaskCountIsModifed) {
     CommandQueueHw<FamilyType> commandQueue(nullptr, pClDevice, 0, false);
     auto &commandStream = commandQueue.getCS(4096u);
@@ -1056,15 +1024,12 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenUpdateTaskCountFromWaitSetWhe
     DebugManager.flags.UpdateTaskCountFromWait.set(1);
 
     CommandQueueHw<FamilyType> commandQueue(nullptr, pClDevice, 0, false);
-    commandQueue.taskCount = 10;
 
     auto mockCsr = new MockCsrHw2<FamilyType>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
     pDevice->resetCommandStreamReceiver(mockCsr);
     mockCsr->useNewResourceImplicitFlush = false;
     mockCsr->useGpuIdleImplicitFlush = false;
     mockCsr->overrideDispatchPolicy(DispatchMode::BatchedDispatch);
-    mockCsr->taskCount.store(10);
-    mockCsr->latestFlushedTaskCount.store(5);
 
     commandQueue.waitForAllEngines(false, nullptr);
 
@@ -1087,15 +1052,12 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenEnabledDirectSubmissionUpdate
     };
 
     CommandQueueHw<FamilyType> commandQueue(nullptr, pClDevice, 0, false);
-    commandQueue.taskCount = 10;
 
     auto mockCsr = new MockCsrHwDirectSubmission(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
     pDevice->resetCommandStreamReceiver(mockCsr);
     mockCsr->useNewResourceImplicitFlush = false;
     mockCsr->useGpuIdleImplicitFlush = false;
     mockCsr->overrideDispatchPolicy(DispatchMode::BatchedDispatch);
-    mockCsr->taskCount.store(10);
-    mockCsr->latestFlushedTaskCount.store(5);
 
     commandQueue.waitForAllEngines(false, nullptr);
 
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp
@@ -917,27 +917,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterMultiTile
     verifyActivePartitionConfig<FamilyType>(commandStreamReceiver, true);
 }
 
-HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterMultiTileTests,
-            givenMultipleStaticActivePartitionsWhenFlushingTagUpdateThenExpectTagUpdatePipeControlWithPartitionFlagOnAndActivePartitionConfig) {
-    DebugManagerStateRestore restorer;
-    DebugManager.flags.UpdateTaskCountFromWait.set(1);
-
-    auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver<FamilyType>();
-    if (pDevice->getPreemptionMode() == PreemptionMode::MidThread || pDevice->isDebuggerActive()) {
-        commandStreamReceiver.createPreemptionAllocation();
-    }
-    EXPECT_EQ(1u, commandStreamReceiver.activePartitionsConfig);
-    commandStreamReceiver.activePartitions = 2;
-    commandStreamReceiver.taskCount = 3;
-    EXPECT_TRUE(commandStreamReceiver.staticWorkPartitioningEnabled);
-    flushTask(commandStreamReceiver, true);
-    commandStreamReceiver.flushTagUpdate();
-    EXPECT_EQ(2u, commandStreamReceiver.activePartitionsConfig);
-
-    prepareLinearStream<FamilyType>(commandStream, 0);
-    verifyPipeControl<FamilyType>(commandStreamReceiver, 4, true);
-}
-
 HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterMultiTileTests,
             givenMultipleDynamicActivePartitionsWhenFlushingTaskThenExpectTagUpdatePipeControlWithoutPartitionFlagOnAndNoActivePartitionConfig) {
     auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver<FamilyType>();
@@ -957,29 +936,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterMultiTile
     verifyActivePartitionConfig<FamilyType>(commandStreamReceiver, false);
 }
 
-HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterMultiTileTests,
-            givenMultipleDynamicActivePartitionsWhenFlushingTagUpdateThenExpectTagUpdatePipeControlWithoutPartitionFlagOnAndNoActivePartitionConfig) {
-    DebugManagerStateRestore restorer;
-    DebugManager.flags.UpdateTaskCountFromWait.set(1);
-
-    auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver<FamilyType>();
-    if (pDevice->getPreemptionMode() == PreemptionMode::MidThread || pDevice->isDebuggerActive()) {
-        commandStreamReceiver.createPreemptionAllocation();
-    }
-    commandStreamReceiver.activePartitions = 2;
-    commandStreamReceiver.taskCount = 3;
-    commandStreamReceiver.staticWorkPartitioningEnabled = false;
-    flushTask(commandStreamReceiver, true);
-    commandStreamReceiver.flushTagUpdate();
-    EXPECT_EQ(2u, commandStreamReceiver.activePartitionsConfig);
-
-    prepareLinearStream<FamilyType>(commandStream, 0);
-    verifyPipeControl<FamilyType>(commandStreamReceiver, 4, false);
-
-    prepareLinearStream<FamilyType>(commandStreamReceiver.commandStream, 0);
-    verifyActivePartitionConfig<FamilyType>(commandStreamReceiver, false);
-}
-
 HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterMultiTileTests,
             givenSingleStaticActivePartitionWhenFlushingTaskThenExpectTagUpdatePipeControlWithoutPartitionFlagOnAndNoActivePartitionConfig) {
     auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver<FamilyType>();
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
@@ -7,7 +7,6 @@
 
 #include "shared/source/command_stream/scratch_space_controller_base.h"
 #include "shared/source/direct_submission/dispatchers/blitter_dispatcher.h"
-#include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
@@ -349,37 +348,6 @@ HWTEST_F(BcsTests, whenBlitBufferThenCommandBufferHasProperTaskCount) {
     EXPECT_EQ(csr.getCS(0u).getGraphicsAllocation()->getResidencyTaskCount(csr.getOsContext().getContextId()), csr.peekTaskCount());
 }
 
-HWTEST_F(BcsTests, givenUpdateTaskCountFromWaitWhenBlitBufferThenCsrHasProperTaskCounts) {
-    DebugManagerStateRestore restorer;
-    DebugManager.flags.UpdateTaskCountFromWait.set(1);
-
-    auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
-
-    cl_int retVal = CL_SUCCESS;
-    auto buffer = clUniquePtr<Buffer>(Buffer::create(context.get(), CL_MEM_READ_WRITE, 1, nullptr, retVal));
-
-    constexpr size_t hostAllocationSize = MemoryConstants::pageSize;
-    auto hostAllocationPtr = allocateAlignedMemory(hostAllocationSize, MemoryConstants::pageSize);
-    void *hostPtr = reinterpret_cast<void *>(hostAllocationPtr.get());
-
-    auto graphicsAllocation = buffer->getGraphicsAllocation(pDevice->getRootDeviceIndex());
-
-    auto blitProperties = BlitProperties::constructPropertiesForReadWrite(BlitterConstants::BlitDirection::HostPtrToBuffer,
-                                                                          csr, graphicsAllocation, nullptr, hostPtr,
-                                                                          graphicsAllocation->getGpuAddress(), 0,
-                                                                          0, 0, {1, 1, 1}, 0, 0, 0, 0);
-
-    BlitPropertiesContainer blitPropertiesContainer;
-    blitPropertiesContainer.push_back(blitProperties);
-
-    auto taskCount = csr.peekTaskCount();
-
-    csr.blitBuffer(blitPropertiesContainer, false, false, *pDevice);
-
-    EXPECT_EQ(csr.peekTaskCount(), taskCount + 1);
-    EXPECT_EQ(csr.peekLatestFlushedTaskCount(), taskCount);
-}
-
 HWTEST_F(BcsTests, givenProfilingEnabledWhenBlitBufferThenCommandBufferIsConstructedProperly) {
     auto bcsOsContext = std::unique_ptr<OsContext>(OsContext::create(nullptr, 0,
                                                                      EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_BCS, EngineUsage::Regular}, pDevice->getDeviceBitfield())));
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp
@@ -318,30 +318,6 @@ TEST(CommandStreamReceiverSimpleTest, givenCsrWhenSubmitiingBatchBufferThenTaskC
     executionEnvironment.memoryManager->freeGraphicsMemoryImpl(commandBuffer);
 }
 
-HWTEST_F(CommandStreamReceiverTest, givenUpdateTaskCountFromWaitWhenSubmitiingBatchBufferThenTaskCountIsIncrementedAndLatestsValuesSetCorrectly) {
-    DebugManagerStateRestore restorer;
-    DebugManager.flags.UpdateTaskCountFromWait.set(1);
-
-    MockCsrHw<FamilyType> csr(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
-
-    GraphicsAllocation *commandBuffer = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr.getRootDeviceIndex(), MemoryConstants::pageSize});
-    ASSERT_NE(nullptr, commandBuffer);
-    LinearStream cs(commandBuffer);
-
-    BatchBuffer batchBuffer{cs.getGraphicsAllocation(), 0, 0, nullptr, false, false, QueueThrottle::MEDIUM, QueueSliceCount::defaultSliceCount, cs.getUsed(), &cs, nullptr, false};
-    ResidencyContainer residencyList;
-
-    auto previousTaskCount = csr.peekTaskCount();
-    auto currentTaskCount = previousTaskCount + 1;
-    csr.submitBatchBuffer(batchBuffer, residencyList);
-
-    EXPECT_EQ(currentTaskCount, csr.peekTaskCount());
-    EXPECT_EQ(previousTaskCount, csr.peekLatestFlushedTaskCount());
-    EXPECT_EQ(currentTaskCount, csr.peekLatestSentTaskCount());
-
-    memoryManager->freeGraphicsMemoryImpl(commandBuffer);
-}
-
 HWTEST_F(CommandStreamReceiverTest, givenOverrideCsrAllocationSizeWhenCreatingCommandStreamCsrGraphicsAllocationThenAllocationHasCorrectSize) {
     DebugManagerStateRestore restore;
 
diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp
@@ -472,7 +472,6 @@ class CommandStreamReceiverMock : public CommandStreamReceiver {
     void flushTagUpdate() override{};
     void flushNonKernelTask(GraphicsAllocation *eventAlloc, uint64_t immediateGpuAddress, uint64_t immediateData, PipeControlArgs &args, bool isWaitOnEvents, bool startOfDispatch, bool endOfDispatch) override{};
     void updateTagFromWait() override{};
-    bool isUpdateTagFromWaitEnabled() override { return false; };
 
     bool isMultiOsContextCapable() const override { return false; }
 
diff --git a/shared/source/command_stream/command_stream_receiver.cpp b/shared/source/command_stream/command_stream_receiver.cpp
@@ -89,9 +89,7 @@ int CommandStreamReceiver::submitBatchBuffer(BatchBuffer &batchBuffer, Residency
     this->latestSentTaskCount = taskCount + 1;
 
     auto flushed = this->flush(batchBuffer, allocationsForResidency);
-    if (!isUpdateTagFromWaitEnabled()) {
-        this->latestFlushedTaskCount = taskCount + 1;
-    }
+    this->latestFlushedTaskCount = taskCount + 1;
     taskCount++;
 
     return !flushed;
@@ -263,6 +261,10 @@ void CommandStreamReceiver::cleanupResources() {
 }
 
 bool CommandStreamReceiver::waitForCompletionWithTimeout(bool enableTimeout, int64_t timeoutMicroseconds, uint32_t taskCountToWait) {
+    if (this->latestSentTaskCount < taskCountToWait) {
+        this->flushTagUpdate();
+    }
+
     uint32_t latestSentTaskCount = this->latestFlushedTaskCount;
     if (latestSentTaskCount < taskCountToWait) {
         if (!this->flushBatchedSubmissions()) {
@@ -277,13 +279,7 @@ bool CommandStreamReceiver::baseWaitFunction(volatile uint32_t *pollAddress, boo
     std::chrono::high_resolution_clock::time_point time1, time2;
     int64_t timeDiff = 0;
 
-    uint32_t latestSentTaskCount = this->latestFlushedTaskCount;
-    if (latestSentTaskCount < taskCountToWait) {
-        updateTagFromWait();
-    }
-
     volatile uint32_t *partitionAddress = pollAddress;
-
     time1 = std::chrono::high_resolution_clock::now();
     for (uint32_t i = 0; i < activePartitions; i++) {
         while (*partitionAddress < taskCountToWait && timeDiff <= timeoutMicroseconds) {
diff --git a/shared/source/command_stream/command_stream_receiver.h b/shared/source/command_stream/command_stream_receiver.h
@@ -220,7 +220,6 @@ class CommandStreamReceiver {
     virtual void flushTagUpdate() = 0;
     virtual void flushNonKernelTask(GraphicsAllocation *eventAlloc, uint64_t immediateGpuAddress, uint64_t immediateData, PipeControlArgs &args, bool isWaitOnEvents, bool isStartOfDispatch, bool isEndOfDispatch) = 0;
     virtual void updateTagFromWait() = 0;
-    virtual bool isUpdateTagFromWaitEnabled() = 0;
 
     ScratchSpaceController *getScratchSpaceController() const {
         return scratchSpaceController.get();
diff --git a/shared/source/command_stream/command_stream_receiver_hw.h b/shared/source/command_stream/command_stream_receiver_hw.h
@@ -108,7 +108,7 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
                         size_t commandStreamStartTask);
     void flushHandler(BatchBuffer &batchBuffer, ResidencyContainer &allocationsForResidency);
 
-    bool isUpdateTagFromWaitEnabled() override;
+    bool isUpdateTagFromWaitEnabled();
     void updateTagFromWait() override;
 
     bool isMultiOsContextCapable() const override;
diff --git a/shared/source/command_stream/command_stream_receiver_hw_base.inl b/shared/source/command_stream/command_stream_receiver_hw_base.inl
diff --git a/shared/test/common/mocks/mock_command_stream_receiver.h b/shared/test/common/mocks/mock_command_stream_receiver.h

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ ze_result_t CommandListCoreFamilyImmediate<gfxCoreFamily>::appendBarrier(`
`176`	`176`	`NEO::PipeControlArgs args;`
`177`	`177`	`this->csr->flushNonKernelTask(nullptr, 0, 0, args, false, false, false);`
`178`	`178`	`if (this->isSyncModeQueue) {`
	`179`	`+ this->csr->flushTagUpdate();`
`179`	`180`	`auto timeoutMicroseconds = NEO::TimeoutControls::maxTimeout;`
`180`	`181`	`this->csr->waitForCompletionWithTimeout(false, timeoutMicroseconds, this->csr->peekTaskCount());`
`181`	`182`	`}`
`@@ -287,6 +288,7 @@ ze_result_t CommandListCoreFamilyImmediate<gfxCoreFamily>::appendSignalEvent(ze_`
`287`	`288`	`}`
`288`	`289`	`this->csr->flushNonKernelTask(&event->getAllocation(this->device), event->getGpuAddress(this->device), Event::STATE_SIGNALED, args, false, false, false);`
`289`	`290`	`if (this->isSyncModeQueue) {`
	`291`	`+ this->csr->flushTagUpdate();`
`290`	`292`	`auto timeoutMicroseconds = NEO::TimeoutControls::maxTimeout;`
`291`	`293`	`this->csr->waitForCompletionWithTimeout(false, timeoutMicroseconds, this->csr->peekTaskCount());`
`292`	`294`	`}`
`@@ -320,6 +322,7 @@ ze_result_t CommandListCoreFamilyImmediate<gfxCoreFamily>::appendEventReset(ze_e`
`320`	`322`	`}`
`321`	`323`	`this->csr->flushNonKernelTask(&event->getAllocation(this->device), event->getGpuAddress(this->device), Event::STATE_CLEARED, args, false, false, false);`
`322`	`324`	`if (this->isSyncModeQueue) {`
	`325`	`+ this->csr->flushTagUpdate();`
`323`	`326`	`auto timeoutMicroseconds = NEO::TimeoutControls::maxTimeout;`
`324`	`327`	`this->csr->waitForCompletionWithTimeout(false, timeoutMicroseconds, this->csr->peekTaskCount());`
`325`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ CommandListAllocatorFn commandListFactoryImmediate[IGFX_MAX_PRODUCT] = {};`
`28`	`28`
`29`	`29`	`ze_result_t CommandListImp::destroy() {`
`30`	`30`	`if (this->isFlushTaskSubmissionEnabled && !this->isSyncModeQueue) {`
	`31`	`+ this->csr->flushTagUpdate();`
`31`	`32`	`auto timeoutMicroseconds = NEO::TimeoutControls::maxTimeout;`
`32`	`33`	`this->csr->waitForCompletionWithTimeout(false, timeoutMicroseconds, this->csr->peekTaskCount());`
`33`	`34`	`}`