From c0b68db729a3273bad163ac1ed2cc13b2aeb3f1b Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Tue, 23 Jul 2024 14:19:18 +0000 Subject: [PATCH] test: use findWalkerTypeCmd method Related-To: NEO-10641 Signed-off-by: Kamil Kopryk --- .../cmdlist/test_cmdlist_append_launch_kernel_2.cpp | 4 ++-- .../cmdlist/test_cmdlist_append_launch_kernel_3.cpp | 4 ++-- .../cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp | 2 +- .../sources/cmdlist/test_cmdlist_xe2_and_later.cpp | 3 ++- .../command_queue/dispatch_walker_tests_dg2_and_later.cpp | 3 ++- .../command_queue/dispatch_walker_tests_xehp_and_later.cpp | 7 ++++--- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp index 0aa32702ef..ab1b5d7fb7 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp @@ -1550,7 +1550,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MultiTileCommandListAppendLaunchKernelXeHpCoreTest, ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer( cmdList, commandList->getCmdContainer().getCommandStream()->getCpuBase(), commandList->getCmdContainer().getCommandStream()->getUsed())); - auto itorWalker = find(cmdList.begin(), cmdList.end()); + auto itorWalker = NEO::UnitTestHelper::findWalkerTypeCmd(cmdList.begin(), cmdList.end()); auto cmd = genCmdCast(*itorWalker); ASSERT_NE(nullptr, cmd); @@ -1626,7 +1626,7 @@ HWTEST2_F(MultiTileCommandListAppendLaunchKernelXeHpCoreTest, ptrOffset(cmdStream->getCpuBase(), sizeBefore), sizeAfter - sizeBefore)); - auto itorWalker = find(cmdList.begin(), cmdList.end()); + auto itorWalker = NEO::UnitTestHelper::findWalkerTypeCmd(cmdList.begin(), cmdList.end()); auto cmd = genCmdCast(*itorWalker); EXPECT_TRUE(cmd->getWorkloadPartitionEnable()); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp index 83eb888a76..a4972a8cd6 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp @@ -1023,7 +1023,7 @@ HWTEST2_F(MultiTileImmediateCommandListAppendLaunchKernelXeHpCoreTest, givenImpl ptrOffset(cmdStream->getCpuBase(), sizeBefore), sizeAfter - sizeBefore)); - auto itorWalker = find(cmdList.begin(), cmdList.end()); + auto itorWalker = NEO::UnitTestHelper::findWalkerTypeCmd(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), itorWalker); auto cmdWalker = genCmdCast(*itorWalker); EXPECT_TRUE(cmdWalker->getWorkloadPartitionEnable()); @@ -1082,7 +1082,7 @@ HWTEST2_F(MultiTileImmediateCommandListAppendLaunchKernelXeHpCoreTest, givenImpl ptrOffset(cmdStream->getCpuBase(), sizeBefore), sizeAfter - sizeBefore)); - auto itorWalker = find(cmdList.begin(), cmdList.end()); + auto itorWalker = NEO::UnitTestHelper::findWalkerTypeCmd(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), itorWalker); auto cmdWalker = genCmdCast(*itorWalker); EXPECT_TRUE(cmdWalker->getWorkloadPartitionEnable()); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp index 1d699c0307..1369bcb0fd 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp @@ -481,7 +481,7 @@ void testSingleTileAppendMemoryCopySignalScopeEventToSubDevice(CopyTestInput &in ptrOffset(commandContainer.getCommandStream()->getCpuBase(), usedBefore), usedAfter - usedBefore)); - auto itorWalker = find(cmdList.begin(), cmdList.end()); + auto itorWalker = NEO::UnitTestHelper::findWalkerTypeCmd(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), itorWalker); auto pipeControls = findAll(itorWalker, cmdList.end()); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp index 0d0bb6f488..5ecb4f1012 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp @@ -9,6 +9,7 @@ #include "shared/source/helpers/register_offsets.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/hw_test.h" @@ -401,7 +402,7 @@ HWTEST2_F(InOrderCmdListTests, givenDebugFlagWhenPostSyncWithInOrderExecInfoIsCr GenCmdList cmdList; ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(cmdList, cmdStream->getCpuBase(), cmdStream->getUsed())); - auto walkerItor = find(cmdList.begin(), cmdList.end()); + auto walkerItor = NEO::UnitTestHelper::findWalkerTypeCmd(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), walkerItor); auto walkerCmd = genCmdCast(*walkerItor); diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp index 974e712f72..e0df77e48c 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp @@ -14,6 +14,7 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/fixtures/linear_stream_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" @@ -134,7 +135,7 @@ HWTEST2_F(Dg2AndLaterDispatchWalkerBasicTest, givenTimestampPacketWhenDispatchin auto contextStartAddress = TimestampPacketHelper::getContextStartGpuAddress(*timestampPacketContainer.peekNodes()[0]); EXPECT_EQ(contextStartAddress, walker->getPostSync().getDestinationAddress()); - auto secondWalkerItor = find(++hwParser.itorWalker, hwParser.cmdList.end()); + auto secondWalkerItor = NEO::UnitTestHelper::findWalkerTypeCmd(++hwParser.itorWalker, hwParser.cmdList.end()); auto secondWalker = genCmdCast(*secondWalkerItor); EXPECT_EQ(FamilyType::POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP, secondWalker->getPostSync().getOperation()); diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp index 3351f9d837..0efd1653e5 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp @@ -19,6 +19,7 @@ #include "shared/source/utilities/tag_allocator.h" #include "shared/test/common/fixtures/linear_stream_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" @@ -485,7 +486,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenTimestamp auto contextStartAddress = TimestampPacketHelper::getContextStartGpuAddress(*timestampPacketContainer.peekNodes()[0]); EXPECT_EQ(contextStartAddress, walker->getPostSync().getDestinationAddress()); - auto secondWalkerItor = find(++hwParser.itorWalker, hwParser.cmdList.end()); + auto secondWalkerItor = NEO::UnitTestHelper::findWalkerTypeCmd(++hwParser.itorWalker, hwParser.cmdList.end()); auto secondWalker = genCmdCast(*secondWalkerItor); EXPECT_EQ(FamilyType::POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP, secondWalker->getPostSync().getOperation()); @@ -1630,7 +1631,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTestStaticPartition, HardwareParse hwParser; hwParser.parseCommands(*cmdQ->commandStream); - auto firstComputeWalkerItor = find(hwParser.cmdList.begin(), hwParser.cmdList.end()); + auto firstComputeWalkerItor = NEO::UnitTestHelper::findWalkerTypeCmd(hwParser.cmdList.begin(), hwParser.cmdList.end()); ASSERT_NE(hwParser.cmdList.end(), firstComputeWalkerItor); auto computeWalker = reinterpret_cast(*firstComputeWalkerItor); EXPECT_EQ(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X, computeWalker->getPartitionType()); @@ -1639,7 +1640,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTestStaticPartition, auto nextCmdItor = firstComputeWalkerItor; ++nextCmdItor; - auto secondComputeWalkerItor = find(nextCmdItor, hwParser.cmdList.end()); + auto secondComputeWalkerItor = NEO::UnitTestHelper::findWalkerTypeCmd(nextCmdItor, hwParser.cmdList.end()); ASSERT_NE(hwParser.cmdList.end(), secondComputeWalkerItor); computeWalker = reinterpret_cast(*secondComputeWalkerItor); EXPECT_EQ(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_DISABLED, computeWalker->getPartitionType());