diff --git a/opencl/source/command_queue/enqueue_common.h b/opencl/source/command_queue/enqueue_common.h index 12cd8c90b4..1284b5e54f 100644 --- a/opencl/source/command_queue/enqueue_common.h +++ b/opencl/source/command_queue/enqueue_common.h @@ -272,7 +272,7 @@ cl_int CommandQueueHw::enqueueHandler(Surface **surfacesForResidency, } else if (computeCommandStreamReceiver.peekTimestampPacketWriteEnabled()) { if (CL_COMMAND_BARRIER == commandType && !isNonStallingIoqBarrier) { setStallingCommandsOnNextFlush(true); - if (NEO::DebugManager.flags.SkipDcFlushOnBarrierWithoutEvents.get() == 0 || event || getGpgpuCommandStreamReceiver().isMultiTileOperationEnabled()) { + if (NEO::DebugManager.flags.SkipDcFlushOnBarrierWithoutEvents.get() == 0 || event) { setDcFlushRequiredOnStallingCommandsOnNextFlush(true); } this->splitBarrierRequired = true; diff --git a/opencl/test/unit_test/command_queue/ooq_task_tests.cpp b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp index 4f5cbd27fd..172b5192ec 100644 --- a/opencl/test/unit_test/command_queue/ooq_task_tests.cpp +++ b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp @@ -388,29 +388,6 @@ HWTEST_F(OOQTaskTests, givenSkipDcFlushOnBarrierWithoutEventsDisableddWhenEnquei EXPECT_TRUE(pCmdQ->isDcFlushRequiredOnStallingCommandsOnNextFlush()); } -HWTEST_F(OOQTaskTests, givenSkipDcFlushOnBarrierWithoutEventsAndMultiTileContextWhenEnqueuingBarrierWithWaitlistThenDcFlushSet) { - auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); - if (false == commandStreamReceiver.peekTimestampPacketWriteEnabled()) { - GTEST_SKIP(); - } - commandStreamReceiver.setActivePartitions(2u); - commandStreamReceiver.staticWorkPartitioningEnabled = true; - EXPECT_TRUE(commandStreamReceiver.isMultiTileOperationEnabled()); - DebugManagerStateRestore restorer; - DebugManager.flags.SkipDcFlushOnBarrierWithoutEvents.set(1); - - const cl_uint numEventsInWaitList = 0; - const cl_event *eventWaitList = nullptr; - auto retVal = pCmdQ->enqueueBarrierWithWaitList( - numEventsInWaitList, - eventWaitList, - nullptr); - EXPECT_EQ(CL_SUCCESS, retVal); - - EXPECT_TRUE(pCmdQ->isStallingCommandsOnNextFlushRequired()); - EXPECT_TRUE(pCmdQ->isDcFlushRequiredOnStallingCommandsOnNextFlush()); -} - HWTEST_F(OOQTaskTests, givenEnqueueMarkerWithWaitListWhenIsMarkerWithPostSyncWriteThenBcsTimestapLastBarrierToWaitForIsNotEmpty) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); if (false == commandStreamReceiver.peekTimestampPacketWriteEnabled()) {