test: use typename from walker

Related-To: NEO-10641
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk 2024-06-27 02:09:08 +00:00 committed by Compute-Runtime-Automation
parent 76e8be5c39
commit 940f23ddbf
3 changed files with 10 additions and 7 deletions

View File

@ -976,6 +976,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, AubWalkerPartitionZeroTest, givenNonBlockingAtomicO
HWCMDTEST_F(IGFX_XE_HP_CORE, AubWalkerPartitionZeroTest, givenPredicatedCommandBufferWhenItIsExecutedThenAtomicIsIncrementedEquallyToPartitionCountPlusOne) { HWCMDTEST_F(IGFX_XE_HP_CORE, AubWalkerPartitionZeroTest, givenPredicatedCommandBufferWhenItIsExecutedThenAtomicIsIncrementedEquallyToPartitionCountPlusOne) {
MockExecutionEnvironment mockExecutionEnvironment{}; MockExecutionEnvironment mockExecutionEnvironment{};
using DefaultWalkerType = typename FamilyType::DefaultWalkerType; using DefaultWalkerType = typename FamilyType::DefaultWalkerType;
using PostSyncType = typename DefaultWalkerType::PostSyncType;
auto streamCpuPointer = taskStream->getSpace(0); auto streamCpuPointer = taskStream->getSpace(0);
auto postSyncAddress = helperSurface->getGpuAddress(); auto postSyncAddress = helperSurface->getGpuAddress();
@ -985,7 +986,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, AubWalkerPartitionZeroTest, givenPredicatedCommandB
walkerCmd.setPartitionType(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X); walkerCmd.setPartitionType(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X);
walkerCmd.getInterfaceDescriptor().setNumberOfThreadsInGpgpuThreadGroup(1u); walkerCmd.getInterfaceDescriptor().setNumberOfThreadsInGpgpuThreadGroup(1u);
walkerCmd.getPostSync().setDestinationAddress(postSyncAddress); walkerCmd.getPostSync().setDestinationAddress(postSyncAddress);
walkerCmd.getPostSync().setOperation(POSTSYNC_DATA<FamilyType>::OPERATION::OPERATION_WRITE_TIMESTAMP); walkerCmd.getPostSync().setOperation(PostSyncType::OPERATION::OPERATION_WRITE_TIMESTAMP);
WalkerPartition::WalkerPartitionArgs testArgs = {}; WalkerPartition::WalkerPartitionArgs testArgs = {};
testArgs.initializeWparidRegister = true; testArgs.initializeWparidRegister = true;

View File

@ -1090,8 +1090,9 @@ HWCMDTEST_F(IGFX_GEN8_CORE, HardwareCommandsTest, GivenKernelWithSamplersWhenInd
} }
HWTEST2_F(HardwareCommandsTest, givenBindlessKernelWithBufferArgWhenSendIndirectStateThenSurfaceStateIsCopiedToHeapAndCrossThreadDataIsCorrectlyPatched, IsAtLeastXeHpCore) { HWTEST2_F(HardwareCommandsTest, givenBindlessKernelWithBufferArgWhenSendIndirectStateThenSurfaceStateIsCopiedToHeapAndCrossThreadDataIsCorrectlyPatched, IsAtLeastXeHpCore) {
using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA;
using DefaultWalkerType = typename FamilyType::DefaultWalkerType; using DefaultWalkerType = typename FamilyType::DefaultWalkerType;
using InterfaceDescriptorType = typename DefaultWalkerType::InterfaceDescriptorType;
CommandQueueHw<FamilyType> cmdQ(pContext, pClDevice, 0, false); CommandQueueHw<FamilyType> cmdQ(pContext, pClDevice, 0, false);
@ -1132,8 +1133,8 @@ HWTEST2_F(HardwareCommandsTest, givenBindlessKernelWithBufferArgWhenSendIndirect
auto isCcsUsed = EngineHelpers::isCcs(cmdQ.getGpgpuEngine().osContext->getEngineType()); auto isCcsUsed = EngineHelpers::isCcs(cmdQ.getGpgpuEngine().osContext->getEngineType());
auto kernelUsesLocalIds = HardwareCommandsHelper<FamilyType>::kernelUsesLocalIds(mockKernel); auto kernelUsesLocalIds = HardwareCommandsHelper<FamilyType>::kernelUsesLocalIds(mockKernel);
INTERFACE_DESCRIPTOR_DATA interfaceDescriptorData; InterfaceDescriptorType interfaceDescriptorData;
HardwareCommandsHelper<FamilyType>::template sendIndirectState<DefaultWalkerType, INTERFACE_DESCRIPTOR_DATA>( HardwareCommandsHelper<FamilyType>::template sendIndirectState<DefaultWalkerType, InterfaceDescriptorType>(
commandStream, commandStream,
dsh, dsh,
ioh, ioh,

View File

@ -148,8 +148,9 @@ INSTANTIATE_TEST_SUITE_P(
testing::ValuesIn(slmSizeInKb)); testing::ValuesIn(slmSizeInKb));
HWTEST_F(KernelSLMAndBarrierTest, GivenInterfaceDescriptorProgrammedWhenOverrideSlmAllocationSizeIsSetThenSlmSizeIsOverwritten) { HWTEST_F(KernelSLMAndBarrierTest, GivenInterfaceDescriptorProgrammedWhenOverrideSlmAllocationSizeIsSetThenSlmSizeIsOverwritten) {
using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA;
using DefaultWalkerType = typename FamilyType::DefaultWalkerType; using DefaultWalkerType = typename FamilyType::DefaultWalkerType;
using InterfaceDescriptorType = typename DefaultWalkerType::InterfaceDescriptorType;
DefaultWalkerType walkerCmd{}; DefaultWalkerType walkerCmd{};
uint32_t expectedSlmSize = 5; uint32_t expectedSlmSize = 5;
@ -166,9 +167,9 @@ HWTEST_F(KernelSLMAndBarrierTest, GivenInterfaceDescriptorProgrammedWhenOverride
const uint32_t threadGroupCount = 1u; const uint32_t threadGroupCount = 1u;
uint64_t interfaceDescriptorOffset = indirectHeap.getUsed(); uint64_t interfaceDescriptorOffset = indirectHeap.getUsed();
INTERFACE_DESCRIPTOR_DATA interfaceDescriptorData; InterfaceDescriptorType interfaceDescriptorData;
HardwareCommandsHelper<FamilyType>::template sendInterfaceDescriptorData<DefaultWalkerType, INTERFACE_DESCRIPTOR_DATA>( HardwareCommandsHelper<FamilyType>::template sendInterfaceDescriptorData<DefaultWalkerType, InterfaceDescriptorType>(
indirectHeap, indirectHeap,
interfaceDescriptorOffset, interfaceDescriptorOffset,
0, 0,