Revert "performance: make resident before lock"

This reverts commit 7e7fac01e3.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2024-02-16 08:53:38 +01:00
committed by Compute-Runtime-Automation
parent a1fd3ab745
commit 4d159bd06c
8 changed files with 15 additions and 32 deletions

View File

@@ -91,6 +91,8 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenDirectIsInitializedAndStartedThe
if (gfxCoreHelper.isRelaxedOrderingSupported()) {
expectedAllocationsCnt += 2;
}
EXPECT_EQ(1u, wddm->makeResidentResult.called);
EXPECT_EQ(expectedAllocationsCnt, wddm->makeResidentResult.handleCount);
EXPECT_EQ(1u, wddmMockInterface->createMonitoredFenceCalled);
@@ -126,6 +128,8 @@ HWTEST_F(WddmDirectSubmissionNoPreemptionTest, givenWddmWhenDirectIsInitializedA
if (gfxCoreHelper.isRelaxedOrderingSupported()) {
expectedAllocationsCnt += 2;
}
EXPECT_EQ(1u, wddm->makeResidentResult.called);
EXPECT_EQ(expectedAllocationsCnt, wddm->makeResidentResult.handleCount);
EXPECT_EQ(1u, wddmMockInterface->createMonitoredFenceCalled);
@@ -169,6 +173,7 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenAllocateOsResourcesThenExpectRin
}
EXPECT_EQ(1u, wddmMockInterface->createMonitoredFenceCalled);
EXPECT_EQ(1u, wddm->makeResidentResult.called);
EXPECT_EQ(expectedAllocationsCnt, wddm->makeResidentResult.handleCount);
}
@@ -191,6 +196,8 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenAllocateOsResourcesFenceCreation
EXPECT_FALSE(ret);
EXPECT_EQ(1u, wddmMockInterface->createMonitoredFenceCalled);
EXPECT_EQ(0u, wddm->makeResidentResult.called);
EXPECT_EQ(0u, wddm->makeResidentResult.handleCount);
memoryManager->freeGraphicsMemory(ringBuffer);
}
@@ -210,6 +217,8 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenAllocateOsResourcesResidencyFail
}
EXPECT_EQ(0u, wddmMockInterface->createMonitoredFenceCalled);
// expect 2 makeResident calls, due to fail on 1st and then retry (which also fails)
EXPECT_EQ(2u, wddm->makeResidentResult.called);
EXPECT_EQ(expectedAllocationsCnt, wddm->makeResidentResult.handleCount);
}
@@ -231,11 +240,10 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenGettingTagDataThenExpectContextM
HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenHandleResidencyThenExpectWddmWaitOnPaginfFenceFromCpuCalled) {
MockWddmDirectSubmission<FamilyType, RenderDispatcher<FamilyType>> wddmDirectSubmission(*device->getDefaultEngine().commandStreamReceiver);
auto expectedMakeResidentCalled = wddm->makeResidentResult.called + 1;
wddmDirectSubmission.handleResidency();
EXPECT_EQ(expectedMakeResidentCalled, wddm->waitOnPagingFenceFromCpuResult.called);
EXPECT_EQ(1u, wddm->waitOnPagingFenceFromCpuResult.called);
}
HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenHandlingRingBufferCompletionThenExpectWaitFromCpuWithCorrectFenceValue) {
@@ -624,6 +632,7 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmResidencyEnabledWhenAllocatingResour
EXPECT_TRUE(ret);
EXPECT_EQ(1u, NEO::IoFunctions::mockFopenCalled);
EXPECT_EQ(10u, NEO::IoFunctions::mockVfptrinfCalled);
EXPECT_EQ(0u, NEO::IoFunctions::mockFcloseCalled);
}