test: refactor simplify drm direct submission test logic

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe 2024-12-13 16:29:46 +00:00 committed by Compute-Runtime-Automation
parent 8f7bacdd95
commit 9f23867d30
1 changed files with 6 additions and 12 deletions

View File

@ -547,9 +547,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenTile0AndCompletionFenceSupportWhenSubmitt
MockBufferObject mockBO(0, drm); MockBufferObject mockBO(0, drm);
ringBuffer->getBufferObjectToModify(0) = &mockBO; ringBuffer->getBufferObjectToModify(0) = &mockBO;
auto &compilerProductHelper = device->getCompilerProductHelper(); auto initialCompletionValue = commandStreamReceiver.peekLatestSentTaskCount();
auto isHeapless = compilerProductHelper.isHeaplessModeEnabled();
auto isHeaplessStateInit = compilerProductHelper.isHeaplessStateInitEnabled(isHeapless);
for (auto i = 0u; i < 2; i++) { for (auto i = 0u; i < 2; i++) {
mockBO.passedExecParams.clear(); mockBO.passedExecParams.clear();
@ -558,7 +556,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenTile0AndCompletionFenceSupportWhenSubmitt
ASSERT_EQ(1u, mockBO.passedExecParams.size()); ASSERT_EQ(1u, mockBO.passedExecParams.size());
EXPECT_EQ(completionFenceBaseGpuAddress, mockBO.passedExecParams[0].completionGpuAddress); EXPECT_EQ(completionFenceBaseGpuAddress, mockBO.passedExecParams[0].completionGpuAddress);
auto expectedCompletionValue = isHeaplessStateInit ? (i + 2) : (i + 1); auto expectedCompletionValue = i + 1 + initialCompletionValue;
EXPECT_EQ(expectedCompletionValue, mockBO.passedExecParams[0].completionValue); EXPECT_EQ(expectedCompletionValue, mockBO.passedExecParams[0].completionValue);
} }
@ -593,9 +591,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenTile1AndCompletionFenceSupportWhenSubmitt
MockBufferObject mockBO(0, drm); MockBufferObject mockBO(0, drm);
ringBuffer->getBufferObjectToModify(0) = &mockBO; ringBuffer->getBufferObjectToModify(0) = &mockBO;
auto &compilerProductHelper = device->getCompilerProductHelper(); auto initialCompletionValue = commandStreamReceiver.peekLatestSentTaskCount();
auto isHeapless = compilerProductHelper.isHeaplessModeEnabled();
auto isHeaplessStateInit = compilerProductHelper.isHeaplessStateInitEnabled(isHeapless);
for (auto i = 0u; i < 2; i++) { for (auto i = 0u; i < 2; i++) {
mockBO.passedExecParams.clear(); mockBO.passedExecParams.clear();
@ -604,7 +600,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenTile1AndCompletionFenceSupportWhenSubmitt
ASSERT_EQ(1u, mockBO.passedExecParams.size()); ASSERT_EQ(1u, mockBO.passedExecParams.size());
EXPECT_EQ(completionFenceBaseGpuAddress, mockBO.passedExecParams[0].completionGpuAddress); EXPECT_EQ(completionFenceBaseGpuAddress, mockBO.passedExecParams[0].completionGpuAddress);
auto expectedCompletionValue = isHeaplessStateInit ? (i + 2) : (i + 1); auto expectedCompletionValue = i + 1 + initialCompletionValue;
EXPECT_EQ(expectedCompletionValue, mockBO.passedExecParams[0].completionValue); EXPECT_EQ(expectedCompletionValue, mockBO.passedExecParams[0].completionValue);
} }
ringBuffer->getBufferObjectToModify(0) = initialBO; ringBuffer->getBufferObjectToModify(0) = initialBO;
@ -644,9 +640,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenTwoTilesAndCompletionFenceSupportWhenSubm
MockBufferObject mockBO(0, drm); MockBufferObject mockBO(0, drm);
ringBuffer->getBufferObjectToModify(0) = &mockBO; ringBuffer->getBufferObjectToModify(0) = &mockBO;
auto &compilerProductHelper = device->getCompilerProductHelper(); auto initialCompletionValue = commandStreamReceiver.peekLatestSentTaskCount();
auto isHeapless = compilerProductHelper.isHeaplessModeEnabled();
auto isHeaplessStateInit = compilerProductHelper.isHeaplessStateInitEnabled(isHeapless);
for (auto i = 0u; i < 2; i++) { for (auto i = 0u; i < 2; i++) {
mockBO.passedExecParams.clear(); mockBO.passedExecParams.clear();
@ -655,7 +649,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenTwoTilesAndCompletionFenceSupportWhenSubm
ASSERT_EQ(2u, mockBO.passedExecParams.size()); ASSERT_EQ(2u, mockBO.passedExecParams.size());
EXPECT_EQ(completionFenceBaseGpuAddress, mockBO.passedExecParams[0].completionGpuAddress); EXPECT_EQ(completionFenceBaseGpuAddress, mockBO.passedExecParams[0].completionGpuAddress);
auto expectedCompletionValue = isHeaplessStateInit ? (i + 2) : (i + 1); auto expectedCompletionValue = i + initialCompletionValue + 1;
EXPECT_EQ(expectedCompletionValue, mockBO.passedExecParams[0].completionValue); EXPECT_EQ(expectedCompletionValue, mockBO.passedExecParams[0].completionValue);
EXPECT_EQ(completionFenceBaseGpuAddress + commandStreamReceiver.getImmWritePostSyncWriteOffset(), mockBO.passedExecParams[1].completionGpuAddress); EXPECT_EQ(completionFenceBaseGpuAddress + commandStreamReceiver.getImmWritePostSyncWriteOffset(), mockBO.passedExecParams[1].completionGpuAddress);