test: use findWalkerTypeCmd method
Related-To: NEO-10641 Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
parent
0dacb78d78
commit
c0b68db729
|
@ -1550,7 +1550,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MultiTileCommandListAppendLaunchKernelXeHpCoreTest,
|
||||||
ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(
|
ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(
|
||||||
cmdList, commandList->getCmdContainer().getCommandStream()->getCpuBase(), commandList->getCmdContainer().getCommandStream()->getUsed()));
|
cmdList, commandList->getCmdContainer().getCommandStream()->getCpuBase(), commandList->getCmdContainer().getCommandStream()->getUsed()));
|
||||||
|
|
||||||
auto itorWalker = find<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
|
auto itorWalker = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(cmdList.begin(), cmdList.end());
|
||||||
auto cmd = genCmdCast<DefaultWalkerType *>(*itorWalker);
|
auto cmd = genCmdCast<DefaultWalkerType *>(*itorWalker);
|
||||||
ASSERT_NE(nullptr, cmd);
|
ASSERT_NE(nullptr, cmd);
|
||||||
|
|
||||||
|
@ -1626,7 +1626,7 @@ HWTEST2_F(MultiTileCommandListAppendLaunchKernelXeHpCoreTest,
|
||||||
ptrOffset(cmdStream->getCpuBase(), sizeBefore),
|
ptrOffset(cmdStream->getCpuBase(), sizeBefore),
|
||||||
sizeAfter - sizeBefore));
|
sizeAfter - sizeBefore));
|
||||||
|
|
||||||
auto itorWalker = find<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
|
auto itorWalker = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(cmdList.begin(), cmdList.end());
|
||||||
auto cmd = genCmdCast<DefaultWalkerType *>(*itorWalker);
|
auto cmd = genCmdCast<DefaultWalkerType *>(*itorWalker);
|
||||||
EXPECT_TRUE(cmd->getWorkloadPartitionEnable());
|
EXPECT_TRUE(cmd->getWorkloadPartitionEnable());
|
||||||
|
|
||||||
|
|
|
@ -1023,7 +1023,7 @@ HWTEST2_F(MultiTileImmediateCommandListAppendLaunchKernelXeHpCoreTest, givenImpl
|
||||||
ptrOffset(cmdStream->getCpuBase(), sizeBefore),
|
ptrOffset(cmdStream->getCpuBase(), sizeBefore),
|
||||||
sizeAfter - sizeBefore));
|
sizeAfter - sizeBefore));
|
||||||
|
|
||||||
auto itorWalker = find<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
|
auto itorWalker = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(cmdList.begin(), cmdList.end());
|
||||||
ASSERT_NE(cmdList.end(), itorWalker);
|
ASSERT_NE(cmdList.end(), itorWalker);
|
||||||
auto cmdWalker = genCmdCast<DefaultWalkerType *>(*itorWalker);
|
auto cmdWalker = genCmdCast<DefaultWalkerType *>(*itorWalker);
|
||||||
EXPECT_TRUE(cmdWalker->getWorkloadPartitionEnable());
|
EXPECT_TRUE(cmdWalker->getWorkloadPartitionEnable());
|
||||||
|
@ -1082,7 +1082,7 @@ HWTEST2_F(MultiTileImmediateCommandListAppendLaunchKernelXeHpCoreTest, givenImpl
|
||||||
ptrOffset(cmdStream->getCpuBase(), sizeBefore),
|
ptrOffset(cmdStream->getCpuBase(), sizeBefore),
|
||||||
sizeAfter - sizeBefore));
|
sizeAfter - sizeBefore));
|
||||||
|
|
||||||
auto itorWalker = find<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
|
auto itorWalker = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(cmdList.begin(), cmdList.end());
|
||||||
ASSERT_NE(cmdList.end(), itorWalker);
|
ASSERT_NE(cmdList.end(), itorWalker);
|
||||||
auto cmdWalker = genCmdCast<DefaultWalkerType *>(*itorWalker);
|
auto cmdWalker = genCmdCast<DefaultWalkerType *>(*itorWalker);
|
||||||
EXPECT_TRUE(cmdWalker->getWorkloadPartitionEnable());
|
EXPECT_TRUE(cmdWalker->getWorkloadPartitionEnable());
|
||||||
|
|
|
@ -481,7 +481,7 @@ void testSingleTileAppendMemoryCopySignalScopeEventToSubDevice(CopyTestInput &in
|
||||||
ptrOffset(commandContainer.getCommandStream()->getCpuBase(), usedBefore),
|
ptrOffset(commandContainer.getCommandStream()->getCpuBase(), usedBefore),
|
||||||
usedAfter - usedBefore));
|
usedAfter - usedBefore));
|
||||||
|
|
||||||
auto itorWalker = find<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
|
auto itorWalker = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(cmdList.begin(), cmdList.end());
|
||||||
ASSERT_NE(cmdList.end(), itorWalker);
|
ASSERT_NE(cmdList.end(), itorWalker);
|
||||||
|
|
||||||
auto pipeControls = findAll<PIPE_CONTROL *>(itorWalker, cmdList.end());
|
auto pipeControls = findAll<PIPE_CONTROL *>(itorWalker, cmdList.end());
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "shared/source/helpers/register_offsets.h"
|
#include "shared/source/helpers/register_offsets.h"
|
||||||
#include "shared/test/common/cmd_parse/gen_cmd_parse.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/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_device.h"
|
||||||
#include "shared/test/common/mocks/mock_graphics_allocation.h"
|
#include "shared/test/common/mocks/mock_graphics_allocation.h"
|
||||||
#include "shared/test/common/test_macros/hw_test.h"
|
#include "shared/test/common/test_macros/hw_test.h"
|
||||||
|
@ -401,7 +402,7 @@ HWTEST2_F(InOrderCmdListTests, givenDebugFlagWhenPostSyncWithInOrderExecInfoIsCr
|
||||||
GenCmdList cmdList;
|
GenCmdList cmdList;
|
||||||
ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(cmdList, cmdStream->getCpuBase(), cmdStream->getUsed()));
|
ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(cmdList, cmdStream->getCpuBase(), cmdStream->getUsed()));
|
||||||
|
|
||||||
auto walkerItor = find<DefaultWalkerType *>(cmdList.begin(), cmdList.end());
|
auto walkerItor = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(cmdList.begin(), cmdList.end());
|
||||||
ASSERT_NE(cmdList.end(), walkerItor);
|
ASSERT_NE(cmdList.end(), walkerItor);
|
||||||
|
|
||||||
auto walkerCmd = genCmdCast<DefaultWalkerType *>(*walkerItor);
|
auto walkerCmd = genCmdCast<DefaultWalkerType *>(*walkerItor);
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include "shared/test/common/cmd_parse/hw_parse.h"
|
#include "shared/test/common/cmd_parse/hw_parse.h"
|
||||||
#include "shared/test/common/fixtures/linear_stream_fixture.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/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_allocation_properties.h"
|
||||||
#include "shared/test/common/mocks/mock_device.h"
|
#include "shared/test/common/mocks/mock_device.h"
|
||||||
#include "shared/test/common/mocks/mock_execution_environment.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]);
|
auto contextStartAddress = TimestampPacketHelper::getContextStartGpuAddress(*timestampPacketContainer.peekNodes()[0]);
|
||||||
EXPECT_EQ(contextStartAddress, walker->getPostSync().getDestinationAddress());
|
EXPECT_EQ(contextStartAddress, walker->getPostSync().getDestinationAddress());
|
||||||
|
|
||||||
auto secondWalkerItor = find<DefaultWalkerType *>(++hwParser.itorWalker, hwParser.cmdList.end());
|
auto secondWalkerItor = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(++hwParser.itorWalker, hwParser.cmdList.end());
|
||||||
auto secondWalker = genCmdCast<DefaultWalkerType *>(*secondWalkerItor);
|
auto secondWalker = genCmdCast<DefaultWalkerType *>(*secondWalkerItor);
|
||||||
|
|
||||||
EXPECT_EQ(FamilyType::POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP, secondWalker->getPostSync().getOperation());
|
EXPECT_EQ(FamilyType::POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP, secondWalker->getPostSync().getOperation());
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "shared/source/utilities/tag_allocator.h"
|
#include "shared/source/utilities/tag_allocator.h"
|
||||||
#include "shared/test/common/fixtures/linear_stream_fixture.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/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/helpers/variable_backup.h"
|
||||||
#include "shared/test/common/mocks/mock_allocation_properties.h"
|
#include "shared/test/common/mocks/mock_allocation_properties.h"
|
||||||
#include "shared/test/common/mocks/mock_device.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]);
|
auto contextStartAddress = TimestampPacketHelper::getContextStartGpuAddress(*timestampPacketContainer.peekNodes()[0]);
|
||||||
EXPECT_EQ(contextStartAddress, walker->getPostSync().getDestinationAddress());
|
EXPECT_EQ(contextStartAddress, walker->getPostSync().getDestinationAddress());
|
||||||
|
|
||||||
auto secondWalkerItor = find<DefaultWalkerType *>(++hwParser.itorWalker, hwParser.cmdList.end());
|
auto secondWalkerItor = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(++hwParser.itorWalker, hwParser.cmdList.end());
|
||||||
auto secondWalker = genCmdCast<DefaultWalkerType *>(*secondWalkerItor);
|
auto secondWalker = genCmdCast<DefaultWalkerType *>(*secondWalkerItor);
|
||||||
|
|
||||||
EXPECT_EQ(FamilyType::POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP, secondWalker->getPostSync().getOperation());
|
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;
|
HardwareParse hwParser;
|
||||||
hwParser.parseCommands<FamilyType>(*cmdQ->commandStream);
|
hwParser.parseCommands<FamilyType>(*cmdQ->commandStream);
|
||||||
|
|
||||||
auto firstComputeWalkerItor = find<DefaultWalkerType *>(hwParser.cmdList.begin(), hwParser.cmdList.end());
|
auto firstComputeWalkerItor = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(hwParser.cmdList.begin(), hwParser.cmdList.end());
|
||||||
ASSERT_NE(hwParser.cmdList.end(), firstComputeWalkerItor);
|
ASSERT_NE(hwParser.cmdList.end(), firstComputeWalkerItor);
|
||||||
auto computeWalker = reinterpret_cast<DefaultWalkerType *>(*firstComputeWalkerItor);
|
auto computeWalker = reinterpret_cast<DefaultWalkerType *>(*firstComputeWalkerItor);
|
||||||
EXPECT_EQ(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X, computeWalker->getPartitionType());
|
EXPECT_EQ(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X, computeWalker->getPartitionType());
|
||||||
|
@ -1639,7 +1640,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTestStaticPartition,
|
||||||
auto nextCmdItor = firstComputeWalkerItor;
|
auto nextCmdItor = firstComputeWalkerItor;
|
||||||
++nextCmdItor;
|
++nextCmdItor;
|
||||||
|
|
||||||
auto secondComputeWalkerItor = find<DefaultWalkerType *>(nextCmdItor, hwParser.cmdList.end());
|
auto secondComputeWalkerItor = NEO::UnitTestHelper<FamilyType>::findWalkerTypeCmd(nextCmdItor, hwParser.cmdList.end());
|
||||||
ASSERT_NE(hwParser.cmdList.end(), secondComputeWalkerItor);
|
ASSERT_NE(hwParser.cmdList.end(), secondComputeWalkerItor);
|
||||||
computeWalker = reinterpret_cast<DefaultWalkerType *>(*secondComputeWalkerItor);
|
computeWalker = reinterpret_cast<DefaultWalkerType *>(*secondComputeWalkerItor);
|
||||||
EXPECT_EQ(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_DISABLED, computeWalker->getPartitionType());
|
EXPECT_EQ(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_DISABLED, computeWalker->getPartitionType());
|
||||||
|
|
Loading…
Reference in New Issue