diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl index f959a9542d..56544bacae 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl @@ -1442,7 +1442,7 @@ bool CommandListCoreFamilyImmediate::isRelaxedOrderingDispatchAll auto numEvents = numWaitEvents + (this->hasInOrderDependencies() ? 1 : 0); - if (NEO::debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.get() == 1) { + if (NEO::debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.get() != 0) { uint32_t relaxedOrderingCounterThreshold = csr->getDirectSubmissionRelaxedOrderingQueueDepth(); auto queueTaskCount = getCmdQImmediate(copyOffload)->getTaskCount(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp index 8d3ebf3a56..e71b2a876c 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp @@ -1520,6 +1520,7 @@ HWTEST2_F(CommandListCreateTests, givenDirectSubmissionAndImmCmdListWhenDispatch DebugManagerStateRestore restore; debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); ze_command_queue_desc_t desc = {}; desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS; @@ -1660,6 +1661,7 @@ HWTEST2_F(CommandListCreateTests, givenInOrderExecutionWhenDispatchingRelaxedOrd DebugManagerStateRestore restore; debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); ze_command_queue_desc_t desc = {}; desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS; @@ -1715,6 +1717,7 @@ HWTEST2_F(CommandListCreateTests, givenInOrderExecutionWhenDispatchingBarrierThe DebugManagerStateRestore restore; debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); ze_command_queue_desc_t desc = {}; desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS; @@ -1853,6 +1856,7 @@ HWTEST2_F(CommandListCreateTests, givenInOrderExecutionWhenDispatchingRelaxedOrd DebugManagerStateRestore restore; debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp index 16f193078e..cc8e6c84b0 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp @@ -1970,6 +1970,7 @@ HWTEST2_F(InOrderCmdListTests, givenCmdsChainingWhenDispatchingKernelWithRelaxed using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); @@ -2014,6 +2015,7 @@ HWTEST2_F(InOrderCmdListTests, givenCmdsChainingWhenDispatchingKernelWithRelaxed HWTEST2_F(InOrderCmdListTests, givenRelaxedOrderingEnabledWhenSignalEventCalledThenPassStallingCmdsInfo, IsAtLeastXeHpcCore) { debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); ultCsr->recordFlushedBatchBuffer = true; @@ -2059,7 +2061,6 @@ HWTEST2_F(InOrderCmdListTests, givenRelaxedOrderingEnabledWhenSignalEventCalledT HWTEST2_F(InOrderCmdListTests, givenCounterHeuristicForRelaxedOrderingEnabledWhenAppendingThenEnableRelaxedOrderingCorrectly, IsAtLeastXeHpcCore) { debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); - debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(1); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); ultCsr->recordFlushedBatchBuffer = true; @@ -2133,7 +2134,6 @@ HWTEST2_F(InOrderCmdListTests, givenCounterHeuristicForRelaxedOrderingEnabledWhe HWTEST2_F(InOrderCmdListTests, givenCounterHeuristicForRelaxedOrderingEnabledWithFirstDeviceInitSubmissionWhenAppendingThenEnableRelaxedOrderingCorrectly, IsAtLeastXeHpcCore) { debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); - debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(1); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); ultCsr->recordFlushedBatchBuffer = true; @@ -2165,7 +2165,6 @@ HWTEST2_F(InOrderCmdListTests, givenCounterHeuristicForRelaxedOrderingEnabledWit HWTEST2_F(InOrderCmdListTests, givenRelaxedOrderingWithCounterHeuristicWhenSubmisionSplitThenDontIncrementCounterTwice, IsAtLeastXeHpcCore) { debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); debugManager.flags.SkipInOrderNonWalkerSignalingAllowed.set(1); - debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(1); debugManager.flags.EnableInOrderRelaxedOrderingForEventsChaining.set(1); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); @@ -2626,6 +2625,7 @@ HWTEST2_F(InOrderCmdListTests, givenRelaxedOrderingWhenProgrammingTimestampEvent debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); debugManager.flags.SkipInOrderNonWalkerSignalingAllowed.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); @@ -2760,6 +2760,7 @@ HWTEST2_F(InOrderCmdListTests, givenRelaxedOrderingWhenProgrammingTimestampEvent debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); debugManager.flags.SkipInOrderNonWalkerSignalingAllowed.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); @@ -2867,6 +2868,7 @@ HWTEST2_F(InOrderCmdListTests, givenDebugFlagSetWhenChainingWithRelaxedOrderingT debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); debugManager.flags.EnableInOrderRelaxedOrderingForEventsChaining.set(0); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp index 058471f460..00cf792915 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp @@ -613,6 +613,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe }; debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); auto immCmdList = createImmCmdListImpl(true); diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp index 4ad30cf58b..14b72ba3d3 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp @@ -978,6 +978,7 @@ HWTEST2_F(CommandQueueCommandsXeHpc, givenFlushTaskSubmissionEnabledAndSplitBcsC debugManager.flags.SplitBcsCopy.set(1); debugManager.flags.DirectSubmissionRelaxedOrdering.set(1); debugManager.flags.DirectSubmissionRelaxedOrderingForBcs.set(1); + debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0); ze_result_t returnValue; auto hwInfo = *NEO::defaultHwInfo;