diff --git a/runtime/command_queue/command_queue_hw.h b/runtime/command_queue/command_queue_hw.h index 09abcc81f0..a081e36e9f 100644 --- a/runtime/command_queue/command_queue_hw.h +++ b/runtime/command_queue/command_queue_hw.h @@ -57,12 +57,8 @@ class CommandQueueHw : public CommandQueue { getCommandStreamReceiver().overrideDispatchPolicy(DispatchMode::BatchedDispatch); getCommandStreamReceiver().enableNTo1SubmissionModel(); } - - this->requiresCacheFlushAfterWalker = CommandQueueHw::requiresCacheFlushAfterWalkerBasedOnProperties(properties); } - static bool requiresCacheFlushAfterWalkerBasedOnProperties(const cl_queue_properties *properties); - static CommandQueue *create(Context *context, Device *device, const cl_queue_properties *properties) { diff --git a/runtime/command_queue/command_queue_hw_bdw_plus.inl b/runtime/command_queue/command_queue_hw_bdw_plus.inl index b16433bc79..3ac946fc34 100644 --- a/runtime/command_queue/command_queue_hw_bdw_plus.inl +++ b/runtime/command_queue/command_queue_hw_bdw_plus.inl @@ -9,11 +9,6 @@ namespace NEO { -template -bool CommandQueueHw::requiresCacheFlushAfterWalkerBasedOnProperties(const cl_queue_properties *properties) { - return false; -} - template void CommandQueueHw::submitCacheFlush(Surface **surfaces, size_t numSurfaces, diff --git a/runtime/os_interface/debug_variables_base.inl b/runtime/os_interface/debug_variables_base.inl index 8fa36ad889..85635d5d8f 100644 --- a/runtime/os_interface/debug_variables_base.inl +++ b/runtime/os_interface/debug_variables_base.inl @@ -83,7 +83,6 @@ DECLARE_DEBUG_VARIABLE(bool, DisableZeroCopyForUseHostPtr, false, "When active a DECLARE_DEBUG_VARIABLE(bool, DisableZeroCopyForBuffers, false, "When active all buffer allocations will not share memory with CPU.") DECLARE_DEBUG_VARIABLE(bool, EnableHostPtrTracking, true, "Enable host ptr tracking") DECLARE_DEBUG_VARIABLE(bool, DisableDcFlushInEpilogue, false, "Disable DC flush in epilogue") -DECLARE_DEBUG_VARIABLE(bool, EnableCacheFlushAfterWalkerForAllQueues, false, "Enable cache flush after walker even if queue doesn't require it") /*FEATURE FLAGS*/ DECLARE_DEBUG_VARIABLE(bool, EnableNV12, true, "Enables NV12 extension") diff --git a/unit_tests/command_queue/command_queue_tests.cpp b/unit_tests/command_queue/command_queue_tests.cpp index 051f89eede..649798b31c 100644 --- a/unit_tests/command_queue/command_queue_tests.cpp +++ b/unit_tests/command_queue/command_queue_tests.cpp @@ -391,7 +391,6 @@ TEST_F(CommandQueueCommandStreamTest, givenCommandQueueWhenGetCSIsCalledThenComm HWTEST_F(CommandQueueCommandStreamTest, givenMultiDispatchInfoWithSingleKernelWithFlushAllocationsDisabledWhenEstimatingNodesCountEqualMultiDispatchInfoSize) { DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(0); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); MockCommandQueueHw cmdQ(context.get(), pDevice, nullptr); cmdQ.multiEngineQueue = true; @@ -410,7 +409,6 @@ HWTEST_F(CommandQueueCommandStreamTest, givenMultiDispatchInfoWithSingleKernelWi HWTEST_F(CommandQueueCommandStreamTest, givenMultiDispatchInfoWithSingleKernelWithFlushAllocationsEnabledWhenEstimatingNodesCountEqualMultiDispatchInfoSizePlusOne) { DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(1); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); MockCommandQueueHw cmdQ(context.get(), pDevice, nullptr); MockKernelWithInternals mockKernelWithInternals(*pDevice, context.get()); diff --git a/unit_tests/command_queue/dispatch_walker_tests.cpp b/unit_tests/command_queue/dispatch_walker_tests.cpp index 4189f92829..4d030dc796 100644 --- a/unit_tests/command_queue/dispatch_walker_tests.cpp +++ b/unit_tests/command_queue/dispatch_walker_tests.cpp @@ -1104,7 +1104,6 @@ HWTEST_F(DispatchWalkerTest, GivenCacheFlushAfterWalkerDisabledWhenAllocationReq DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(0); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); MockKernel kernel1(program.get(), kernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, kernel1.initialize()); @@ -1139,7 +1138,6 @@ HWTEST_F(DispatchWalkerTest, GivenCacheFlushAfterWalkerEnabledWhenWalkerWithTwoK DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(1); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); MockKernel kernel1(program.get(), kernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, kernel1.initialize()); @@ -1179,7 +1177,6 @@ HWTEST_F(DispatchWalkerTest, GivenCacheFlushAfterWalkerEnabledWhenTwoWalkersForQ DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(1); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); MockKernel kernel1(program.get(), kernelInfo, *pDevice); ASSERT_EQ(CL_SUCCESS, kernel1.initialize()); diff --git a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp index d8d531dbee..f2e50c4e18 100644 --- a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp @@ -787,7 +787,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueKernelTest, givenCacheFlushAfterWalkerEnabled DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(1); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); MockKernelWithInternals mockKernel(*pDevice, context); CommandQueueHw cmdQ(context, pDevice, nullptr); diff --git a/unit_tests/helpers/kernel_commands_tests.cpp b/unit_tests/helpers/kernel_commands_tests.cpp index dc374e0495..a102510981 100644 --- a/unit_tests/helpers/kernel_commands_tests.cpp +++ b/unit_tests/helpers/kernel_commands_tests.cpp @@ -1238,7 +1238,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, KernelCommandsTest, givenCacheFlushAfterWalkerEnable DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(1); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); CommandQueueHw cmdQ(nullptr, pDevice, 0); auto &commandStream = cmdQ.getCS(1024); @@ -1273,7 +1272,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, KernelCommandsTest, givenCacheFlushAfterWalkerEnable DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(1); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); CommandQueueHw cmdQ(nullptr, pDevice, 0); auto &commandStream = cmdQ.getCS(1024); @@ -1312,7 +1310,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, KernelCommandsTest, givenCacheFlushAfterWalkerEnable DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(1); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); CommandQueueHw cmdQ(nullptr, pDevice, 0); auto &commandStream = cmdQ.getCS(1024); @@ -1344,7 +1341,6 @@ HWTEST_F(KernelCommandsTest, givenCacheFlushAfterWalkerDisabledWhenGettingRequir DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(0); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); CommandQueueHw cmdQ(nullptr, pDevice, 0); @@ -1356,7 +1352,6 @@ HWTEST_F(KernelCommandsTest, givenCacheFlushAfterWalkerDisabledWhenGettingRequir TEST_F(KernelCommandsTest, givenCacheFlushAfterWalkerEnabledWhenPlatformNotSupportFlushThenExpectNoCacheAllocationForFlush) { DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(-1); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(1); hardwareInfo.capabilityTable.supportCacheFlushAfterWalker = false; StackVec allocationsForCacheFlush; diff --git a/unit_tests/helpers/timestamp_packet_tests.cpp b/unit_tests/helpers/timestamp_packet_tests.cpp index 6943dc82ba..af1321e0de 100644 --- a/unit_tests/helpers/timestamp_packet_tests.cpp +++ b/unit_tests/helpers/timestamp_packet_tests.cpp @@ -1417,7 +1417,6 @@ HWTEST_F(TimestampPacketTests, givenKernelWhichDoesntRequireFlushWhenEnqueueingK HWTEST_F(TimestampPacketTests, givenKernelWhichRequiresFlushWhenEnqueueingKernelThenTwoNodesAreCreated) { DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableCacheFlushAfterWalker.set(true); - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(true); auto &csr = device->getUltCommandStreamReceiver(); csr.timestampPacketWriteEnabled = true; diff --git a/unit_tests/kernel/kernel_tests.cpp b/unit_tests/kernel/kernel_tests.cpp index 6691a08702..921711cd7a 100644 --- a/unit_tests/kernel/kernel_tests.cpp +++ b/unit_tests/kernel/kernel_tests.cpp @@ -2400,7 +2400,7 @@ TEST(KernelTest, whenAllocationRequiringCacheFlushThenAssignAllocationPointerToC EXPECT_EQ(&mockAllocation, kernel.mockKernel->kernelArgRequiresCacheFlush[0]); } -TEST(KernelTest, whenCacheFlushEnabledForAllQueuesAndKernelRequireCacheFlushAfterWalkerThenRequireCacheFlushAfterWalker) { +TEST(KernelTest, whenKernelRequireCacheFlushAfterWalkerThenRequireCacheFlushAfterWalker) { MockGraphicsAllocation mockAllocation; auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(platformDevices[0])); MockKernelWithInternals kernel(*device); @@ -2409,7 +2409,6 @@ TEST(KernelTest, whenCacheFlushEnabledForAllQueuesAndKernelRequireCacheFlushAfte MockCommandQueue queue; DebugManagerStateRestore debugRestore; - DebugManager.flags.EnableCacheFlushAfterWalkerForAllQueues.set(true); DebugManager.flags.EnableCacheFlushAfterWalker.set(true); queue.requiresCacheFlushAfterWalker = true; diff --git a/unit_tests/test_files/igdrcl.config b/unit_tests/test_files/igdrcl.config index c7596bc440..af4d329f6d 100644 --- a/unit_tests/test_files/igdrcl.config +++ b/unit_tests/test_files/igdrcl.config @@ -108,5 +108,4 @@ AUBDumpForceAllToLocalMemory = 0 EnableCacheFlushAfterWalker = 0 EnableHostPtrTracking = 1 DisableDcFlushInEpilogue = 0 -EnableCacheFlushAfterWalkerForAllQueues = 0 OverrideInvalidEngineWithDefault = 0