fix: update completion fence for previous ring during switch

Related-To: NEO-9330

Signed-off-by: Maciej Plewka <[email protected]>

Author: MaciejPlewka

shared/source/direct_submission/windows/wddm_direct_submission.h

@@ -36,7 +36,7 @@ class WddmDirectSubmission : public DirectSubmissionHw<GfxFamily, Dispatcher> {
     void handleStopRingBuffer() override;
     uint64_t updateTagValue(bool requireMonitorFence) override;
     bool dispatchMonitorFenceRequired(bool requireMonitorFence) override;
-    uint64_t updateTagValueImpl();
+    MOCKABLE_VIRTUAL uint64_t updateTagValueImpl(uint32_t completionBufferIndex);
     void getTagAddressValue(TagData &tagData) override;
     bool isCompleted(uint32_t ringBufferIndex) override;
     MOCKABLE_VIRTUAL void updateMonitorFenceValueForResidencyList(ResidencyContainer *allocationsForResidency);

shared/source/direct_submission/windows/wddm_direct_submission.inl

@@ -75,7 +75,7 @@ inline void WddmDirectSubmission<GfxFamily, Dispatcher>::flushMonitorFence() {
     this->unblockGpu();
     this->currentQueueWorkCount++;
 
-    this->updateTagValueImpl();
+    this->updateTagValueImpl(this->currentRingBuffer);
 }
 
 template <typename GfxFamily, typename Dispatcher>
@@ -124,15 +124,15 @@ bool WddmDirectSubmission<GfxFamily, Dispatcher>::handleResidency() {
 template <typename GfxFamily, typename Dispatcher>
 void WddmDirectSubmission<GfxFamily, Dispatcher>::handleStopRingBuffer() {
     if (this->disableMonitorFence) {
-        updateTagValueImpl();
+        updateTagValueImpl(this->currentRingBuffer);
     }
 }
 
 template <typename GfxFamily, typename Dispatcher>
 void WddmDirectSubmission<GfxFamily, Dispatcher>::handleSwitchRingBuffers(ResidencyContainer *allocationsForResidency) {
     if (this->disableMonitorFence) {
         auto lock = osContextWin->getResidencyController().acquireLock();
-        updateTagValueImpl();
+        updateTagValueImpl(this->previousRingBuffer);
         updateMonitorFenceValueForResidencyList(allocationsForResidency);
     }
 }
@@ -150,7 +150,7 @@ uint64_t WddmDirectSubmission<GfxFamily, Dispatcher>::updateTagValue(bool requir
     }
 
     if (requireMonitorFence) {
-        return this->updateTagValueImpl();
+        return this->updateTagValueImpl(this->currentRingBuffer);
     }
     MonitoredFence &currentFence = osContextWin->getResidencyController().getMonitoredFence();
     return currentFence.currentFenceValue;
@@ -162,12 +162,12 @@ bool WddmDirectSubmission<GfxFamily, Dispatcher>::dispatchMonitorFenceRequired(b
 }
 
 template <typename GfxFamily, typename Dispatcher>
-uint64_t WddmDirectSubmission<GfxFamily, Dispatcher>::updateTagValueImpl() {
+uint64_t WddmDirectSubmission<GfxFamily, Dispatcher>::updateTagValueImpl(uint32_t completionBufferIndex) {
     MonitoredFence &currentFence = osContextWin->getResidencyController().getMonitoredFence();
 
     currentFence.lastSubmittedFence = currentFence.currentFenceValue;
     currentFence.currentFenceValue++;
-    this->ringBuffers[this->currentRingBuffer].completionFence = currentFence.lastSubmittedFence;
+    this->ringBuffers[completionBufferIndex].completionFence = currentFence.lastSubmittedFence;
 
     return currentFence.lastSubmittedFence;
 }

shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp

@@ -1049,4 +1049,14 @@ HWTEST_F(WddmDirectSubmissionTest, givenDirectSubmissionWhenSwitchingRingBuffers
     EXPECT_FALSE(tryLock);
     wddmDirectSubmission.lockInTesting = false;
     th.join();
+}
+
+HWTEST_F(WddmDirectSubmissionTest, givenDirectSubmissionWhenSwitchingRingBuffersThenPrevRingIndexPassedForCompletionUpdate) {
+    using Dispatcher = RenderDispatcher<FamilyType>;
+
+    MockWddmDirectSubmission<FamilyType, Dispatcher> wddmDirectSubmission(*device->getDefaultEngine().commandStreamReceiver);
+    wddmDirectSubmission.currentRingBuffer = 0;
+    wddmDirectSubmission.previousRingBuffer = 1;
+    wddmDirectSubmission.handleSwitchRingBuffers(nullptr);
+    EXPECT_EQ(wddmDirectSubmission.ringBufferForCompletionFence, wddmDirectSubmission.previousRingBuffer);
 }

shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h

@@ -40,6 +40,7 @@ struct MockWddmDirectSubmission : public WddmDirectSubmission<GfxFamily, Dispatc
     using BaseClass::lastSubmittedThrottle;
     using BaseClass::miMemFenceRequired;
     using BaseClass::osContextWin;
+    using BaseClass::previousRingBuffer;
     using BaseClass::ringBuffers;
     using BaseClass::ringCommandStream;
     using BaseClass::ringFence;
@@ -58,7 +59,11 @@ struct MockWddmDirectSubmission : public WddmDirectSubmission<GfxFamily, Dispatc
         updateMonitorFenceValueForResidencyListCalled++;
         BaseClass::updateMonitorFenceValueForResidencyList(allocationsForResidency);
     }
-
+    uint64_t updateTagValueImpl(uint32_t completionBufferIndex) override {
+        ringBufferForCompletionFence = completionBufferIndex;
+        return BaseClass::updateTagValueImpl(completionBufferIndex);
+    }
     uint32_t updateMonitorFenceValueForResidencyListCalled = 0u;
+    uint32_t ringBufferForCompletionFence = 0u;
 };
 } // namespace NEO