From 64bba71abbfd1b9017da513eae2b8db0f83e655f Mon Sep 17 00:00:00 2001 From: Bartosz Dunajski Date: Mon, 30 Nov 2020 18:32:05 +0000 Subject: [PATCH] Improve UnitTestHelper Signed-off-by: Bartosz Dunajski --- .../command_queue/dispatch_walker_tests.cpp | 4 ++-- .../command_stream_receiver_hw_1_tests.cpp | 8 ++++---- .../experimental_command_buffer_tests.cpp | 14 +++++++------- .../unit_test/helpers/timestamp_packet_tests.cpp | 12 ++++++------ opencl/test/unit_test/helpers/unit_test_helper.h | 6 ++---- opencl/test/unit_test/helpers/unit_test_helper.inl | 9 ++------- opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp | 10 +++++----- 7 files changed, 28 insertions(+), 35 deletions(-) diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index e583a49d6b..081fc7481c 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -1407,7 +1407,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ProfilingCommandsTest, givenKernelWhenProfilingComma if (MemorySynchronizationCommands::isPipeControlWArequired(pDevice->getHardwareInfo())) { itorPipeCtrl++; } - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { itorPipeCtrl++; } auto pipeControl = genCmdCast(*itorPipeCtrl); @@ -1422,7 +1422,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ProfilingCommandsTest, givenKernelWhenProfilingComma if (MemorySynchronizationCommands::isPipeControlWArequired(pDevice->getHardwareInfo())) { itorPipeCtrl++; } - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { itorPipeCtrl++; } ASSERT_NE(cmdList.end(), itorPipeCtrl); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp index c2833aa51f..d6237e1af6 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp @@ -869,8 +869,8 @@ HWTEST_F(BcsTests, givenBltSizeWithLeftoverWhenDispatchedThenProgramAllRequiredC EXPECT_TRUE(memcmp(&FamilyType::cmdInitArbCheck, miArbCheckCmd, sizeof(typename FamilyType::MI_ARB_CHECK)) == 0); } - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { - if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { + if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired()) { auto miSemaphoreWaitCmd = genCmdCast(*(cmdIterator++)); EXPECT_NE(nullptr, miSemaphoreWaitCmd); EXPECT_TRUE(UnitTestHelper::isAdditionalMiSemaphoreWait(*miSemaphoreWaitCmd)); @@ -898,8 +898,8 @@ HWTEST_F(BcsTests, givenBltSizeWithLeftoverWhenDispatchedThenProgramAllRequiredC EXPECT_EQ(csr.getTagAllocation()->getGpuAddress(), miFlushCmd->getDestinationAddress()); EXPECT_EQ(newTaskCount, miFlushCmd->getImmediateData()); - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { - if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { + if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired()) { auto miSemaphoreWaitCmd = genCmdCast(*(cmdIterator++)); EXPECT_NE(nullptr, miSemaphoreWaitCmd); EXPECT_TRUE(UnitTestHelper::isAdditionalMiSemaphoreWait(*miSemaphoreWaitCmd)); diff --git a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp index 9935043e37..69542c12b6 100644 --- a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp +++ b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp @@ -102,7 +102,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe it++; } - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { it++; } @@ -118,7 +118,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe EXPECT_EQ(expectedTsAddress, pipeControl->getAddress()); EXPECT_EQ(expectedTsAddressHigh, pipeControl->getAddressHigh()); - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { it++; } @@ -140,7 +140,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe EXPECT_EQ(1u, pipeControl->getCommandStreamerStallEnable()); } - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { it++; } @@ -157,7 +157,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe EXPECT_EQ(expectedTsAddress, pipeControl->getAddress()); EXPECT_EQ(expectedTsAddressHigh, pipeControl->getAddressHigh()); - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { it++; } @@ -240,7 +240,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe if (MemorySynchronizationCommands::isPipeControlWArequired(pDevice->getHardwareInfo())) { it++; } - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { it++; } //2nd PIPE_CONTROL @@ -258,7 +258,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe if (MemorySynchronizationCommands::isPipeControlWArequired(pDevice->getHardwareInfo())) { it++; } - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { it++; } it++; @@ -267,7 +267,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe expectedTsAddress = static_cast(timeStampAddress & 0x0000FFFFFFFFULL); expectedTsAddressHigh = static_cast(timeStampAddress >> 32); it++; - if (UnitTestHelper::isAdditionalSynchronizationRequired(pDevice->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalSynchronizationRequired()) { it++; } ASSERT_NE(end, it); diff --git a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp index 06d7a59672..c8e1975799 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp +++ b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp @@ -1352,7 +1352,7 @@ HWTEST_F(TimestampPacketTests, givenAlreadyAssignedNodeWhenEnqueueingThenDontKee atomicsFound++; } } - uint32_t expectedSemaphoresCount = (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo()) ? 2 : 0); + uint32_t expectedSemaphoresCount = (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() ? 2 : 0); EXPECT_EQ(expectedSemaphoresCount, semaphoresFound); EXPECT_EQ(0u, atomicsFound); } @@ -1418,7 +1418,7 @@ HWTEST_F(TimestampPacketTests, givenAlreadyAssignedNodeWhenEnqueueingToOoqThenDo atomicsFound++; } } - uint32_t expectedSemaphoresCount = (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo()) ? 2 : 0); + uint32_t expectedSemaphoresCount = (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() ? 2 : 0); EXPECT_EQ(expectedSemaphoresCount, semaphoresFound); EXPECT_EQ(0u, atomicsFound); } @@ -1449,7 +1449,7 @@ HWTEST_F(TimestampPacketTests, givenAlreadyAssignedNodeWhenEnqueueingWithOmitTim atomicsFound++; } } - uint32_t expectedSemaphoresCount = (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo()) ? 2 : 0); + uint32_t expectedSemaphoresCount = (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() ? 2 : 0); EXPECT_EQ(expectedSemaphoresCount, semaphoresFound); EXPECT_EQ(0u, atomicsFound); } @@ -1689,7 +1689,7 @@ HWTEST_F(TimestampPacketTests, givenBlockedEnqueueWithoutKernelWhenSubmittingThe auto queueSemaphores = findAll(hwParserCmdQ.cmdList.begin(), hwParserCmdQ.cmdList.end()); auto expectedQueueSemaphoresCount = 1u; - if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired()) { expectedQueueSemaphoresCount += 2; } EXPECT_EQ(expectedQueueSemaphoresCount, queueSemaphores.size()); @@ -1743,7 +1743,7 @@ HWTEST_F(TimestampPacketTests, givenWaitlistAndOutputEventWhenEnqueueingMarkerWi auto queueSemaphores = findAll(hwParserCmdQ.cmdList.begin(), hwParserCmdQ.cmdList.end()); auto expectedQueueSemaphoresCount = 1u; - if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired()) { expectedQueueSemaphoresCount += 2; } EXPECT_EQ(expectedQueueSemaphoresCount, queueSemaphores.size()); @@ -1786,7 +1786,7 @@ HWTEST_F(TimestampPacketTests, givenWaitlistAndOutputEventWhenEnqueueingBarrierW auto queueSemaphores = findAll(hwParserCmdQ.cmdList.begin(), hwParserCmdQ.cmdList.end()); auto expectedQueueSemaphoresCount = 1u; - if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo())) { + if (UnitTestHelper::isAdditionalMiSemaphoreWaitRequired()) { expectedQueueSemaphoresCount += 2; } EXPECT_EQ(expectedQueueSemaphoresCount, queueSemaphores.size()); diff --git a/opencl/test/unit_test/helpers/unit_test_helper.h b/opencl/test/unit_test/helpers/unit_test_helper.h index eff6b87da8..c579cf4b9d 100644 --- a/opencl/test/unit_test/helpers/unit_test_helper.h +++ b/opencl/test/unit_test/helpers/unit_test_helper.h @@ -35,13 +35,11 @@ struct UnitTestHelper { static bool evaluateGshAddressForScratchSpace(uint64_t usedScratchGpuAddress, uint64_t retrievedGshAddress); - static bool isSynchronizationWArequired(const HardwareInfo &hwInfo); - static bool isPipeControlWArequired(const HardwareInfo &hwInfo); - static bool isAdditionalSynchronizationRequired(const HardwareInfo &hwInfo); + static bool isAdditionalSynchronizationRequired(); - static bool isAdditionalMiSemaphoreWaitRequired(const HardwareInfo &hwInfo); + static bool isAdditionalMiSemaphoreWaitRequired(); static bool isAdditionalMiSemaphoreWait(const typename GfxFamily::MI_SEMAPHORE_WAIT &semaphoreWait); diff --git a/opencl/test/unit_test/helpers/unit_test_helper.inl b/opencl/test/unit_test/helpers/unit_test_helper.inl index 2ccc3e7038..2925d00233 100644 --- a/opencl/test/unit_test/helpers/unit_test_helper.inl +++ b/opencl/test/unit_test/helpers/unit_test_helper.inl @@ -50,23 +50,18 @@ bool UnitTestHelper::evaluateGshAddressForScratchSpace(uint64_t usedS return usedScratchGpuAddress == retrievedGshAddress; } -template -bool UnitTestHelper::isSynchronizationWArequired(const HardwareInfo &hwInfo) { - return false; -} - template bool UnitTestHelper::isPipeControlWArequired(const HardwareInfo &hwInfo) { return false; } template -bool UnitTestHelper::isAdditionalSynchronizationRequired(const HardwareInfo &hwInfo) { +bool UnitTestHelper::isAdditionalSynchronizationRequired() { return false; } template -bool UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(const HardwareInfo &hwInfo) { +bool UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() { return false; } diff --git a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp index 3aa9935189..a46c349784 100644 --- a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp @@ -619,7 +619,7 @@ void BcsBufferTests::waitForCacheFlushFromBcsTest(MockCommandQueueHw } auto bcsSemaphores = findAll(hwParserBcs.cmdList.begin(), hwParserBcs.cmdList.end()); - size_t additionalSemaphores = UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo()) ? 2 : 0; + size_t additionalSemaphores = UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() ? 2 : 0; if (isCacheFlushForBcsRequired) { EXPECT_NE(0u, cacheFlushWriteAddress); @@ -688,10 +688,10 @@ HWTEST_TEMPLATED_F(BcsBufferTests, givenPipeControlRequestWhenDispatchingBlitEnq auto semaphores = findAll(bcsHwParser.cmdList.begin(), bcsHwParser.cmdList.end()); if (cmdQ->isCacheFlushForBcsRequired()) { - EXPECT_EQ(UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo()) ? 4u : 2u, semaphores.size()); + EXPECT_EQ(UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() ? 4u : 2u, semaphores.size()); EXPECT_EQ(pipeControlWriteAddress, genCmdCast(*(semaphores[1]))->getSemaphoreGraphicsAddress()); } else { - EXPECT_EQ(UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo()) ? 3u : 1u, semaphores.size()); + EXPECT_EQ(UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() ? 3u : 1u, semaphores.size()); EXPECT_EQ(pipeControlWriteAddress, genCmdCast(*(semaphores[0]))->getSemaphoreGraphicsAddress()); } } @@ -773,9 +773,9 @@ HWTEST_TEMPLATED_F(BcsBufferTests, givenPipeControlRequestWhenDispatchingBlocked auto semaphores = findAll(bcsHwParser.cmdList.begin(), bcsHwParser.cmdList.end()); if (cmdQ->isCacheFlushForBcsRequired()) { - EXPECT_EQ(UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo()) ? 4u : 2u, semaphores.size()); + EXPECT_EQ(UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() ? 4u : 2u, semaphores.size()); } else { - EXPECT_EQ(UnitTestHelper::isAdditionalMiSemaphoreWaitRequired(device->getHardwareInfo()) ? 3u : 1u, semaphores.size()); + EXPECT_EQ(UnitTestHelper::isAdditionalMiSemaphoreWaitRequired() ? 3u : 1u, semaphores.size()); } cmdQ->isQueueBlocked();