From 713aa05f27d956dfd93e9354d40b672f9054dc47 Mon Sep 17 00:00:00 2001
From: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
Date: Wed, 18 Oct 2023 10:51:25 +0200
Subject: [PATCH] Revert "performance: limit monitor fence dispatch only to
 task count dispatches"

This reverts commit f26f027ee70efcd4b9b1e112b104e013ff5627b6.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
---
 shared/source/direct_submission/direct_submission_hw.inl      | 4 ++--
 .../windows/wddm_direct_submission_tests.cpp                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shared/source/direct_submission/direct_submission_hw.inl b/shared/source/direct_submission/direct_submission_hw.inl
index b845c1b071..40fc4f7385 100644
--- a/shared/source/direct_submission/direct_submission_hw.inl
+++ b/shared/source/direct_submission/direct_submission_hw.inl
@@ -941,7 +941,7 @@ bool DirectSubmissionHw<GfxFamily, Dispatcher>::dispatchCommandBuffer(BatchBuffe
     this->startRingBuffer();
 
     bool relaxedOrderingSchedulerWillBeNeeded = (this->relaxedOrderingSchedulerRequired || batchBuffer.hasRelaxedOrderingDependencies);
-    bool dispatchMonitorFence = this->dispatchMonitorFenceRequired(batchBuffer.dispatchMonitorFence);
+    bool dispatchMonitorFence = this->dispatchMonitorFenceRequired(batchBuffer.hasStallingCmds);
 
     size_t dispatchSize = getSizeDispatch(relaxedOrderingSchedulerWillBeNeeded, batchBuffer.hasRelaxedOrderingDependencies, dispatchMonitorFence);
 
@@ -983,7 +983,7 @@ bool DirectSubmissionHw<GfxFamily, Dispatcher>::dispatchCommandBuffer(BatchBuffe
     currentQueueWorkCount++;
     DirectSubmissionDiagnostics::diagnosticModeOneSubmit(diagnostic.get());
 
-    uint64_t flushValue = updateTagValue(batchBuffer.dispatchMonitorFence);
+    uint64_t flushValue = updateTagValue(batchBuffer.hasStallingCmds);
     flushStamp.setStamp(flushValue);
 
     return ringStart;
diff --git a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
index 7125fe2f06..f2727a3891 100644
--- a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
+++ b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
@@ -629,7 +629,7 @@ HWTEST_F(WddmDirectSubmissionTest, givenMiMemFenceRequiredThenGpuVaForAdditional
 }
 
 HWTEST_F(WddmDirectSubmissionTest,
-         givenRenderDirectSubmissionWithDisabledMonitorFenceWhenMonitorFenceExplicitlyRequiredThenDispatchPostSyncOperation) {
+         givenRenderDirectSubmissionWithDisabledMonitorFenceWhenHasStallingCommandDispatchedThenDispatchPostSyncOperation) {
     using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
     using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION;
     using Dispatcher = RenderDispatcher<FamilyType>;
@@ -654,7 +654,7 @@ HWTEST_F(WddmDirectSubmissionTest,
     batchBuffer.usedSize = 0x40;
     batchBuffer.taskStartAddress = clientCommandBuffer->getGpuAddress();
     batchBuffer.stream = clientStream.get();
-    batchBuffer.dispatchMonitorFence = true;
+    batchBuffer.hasStallingCmds = true;
 
     FlushStampTracker flushStamp(true);