From e74c8c516a15843fe49145816d8a797cd9c261d8 Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Wed, 26 Jun 2024 00:39:52 +0000 Subject: [PATCH] refactor: use getInitGpuWalker function in ults Related-To: NEO-10641 Signed-off-by: Kamil Kopryk --- .../aub_multicontext_tests_xehp_and_later.cpp | 4 +- ..._walker_partition_tests_xehp_and_later.cpp | 2 +- .../command_queue/dispatch_walker_tests.cpp | 2 +- .../dispatch_walker_tests_dg2_and_later.cpp | 2 +- .../dispatch_walker_tests_xehp_and_later.cpp | 36 ++++++------- .../command_stream/cmd_parse_tests.cpp | 4 +- shared/source/gen12lp/hw_cmds_base.h | 5 ++ .../command_encoder_tests.cpp | 3 +- .../command_stream_receiver_tests.cpp | 14 ++--- ..._encode_dispatch_kernel_xehp_and_later.cpp | 19 +++---- .../test_implicit_scaling_xehp_and_later.cpp | 38 +++++++------- .../walker_partition_fixture_xehp_and_later.h | 4 +- ...alker_partition_tests_xehp_and_later_1.cpp | 6 +-- ...alker_partition_tests_xehp_and_later_2.cpp | 52 +++++++++---------- 14 files changed, 99 insertions(+), 92 deletions(-) diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp index 569ea56ef1..ac43b567a9 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp @@ -437,7 +437,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, StaticWalkerPartitionFourTilesTests, givenPreWalker auto taskStreamGpu = taskStream->getGraphicsAllocation()->getGpuAddress(); uint32_t totalBytesProgrammed = 0u; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); walkerCmd.setPartitionType(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X); walkerCmd.getInterfaceDescriptor().setNumberOfThreadsInGpgpuThreadGroup(1u); @@ -483,7 +483,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, StaticWalkerPartitionFourTilesTests, whenNoPreWalke auto taskStreamGpu = taskStream->getGraphicsAllocation()->getGpuAddress(); uint32_t totalBytesProgrammed = 0u; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); walkerCmd.setPartitionType(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X); walkerCmd.getInterfaceDescriptor().setNumberOfThreadsInGpgpuThreadGroup(1u); diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp index f0fac7fb21..c1229a555f 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp @@ -981,7 +981,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, AubWalkerPartitionZeroTest, givenPredicatedCommandB auto postSyncAddress = helperSurface->getGpuAddress(); uint32_t totalBytesProgrammed = 0u; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); walkerCmd.setPartitionType(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X); walkerCmd.getInterfaceDescriptor().setNumberOfThreadsInGpgpuThreadGroup(1u); walkerCmd.getPostSync().setDestinationAddress(postSyncAddress); 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 2a07ded899..7bbc899c45 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -125,7 +125,7 @@ HWTEST_F(DispatchWalkerTest, givenSimd1WhenSetGpgpuWalkerThreadDataThenSimdInWal using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); size_t globalOffsets[] = {0, 0, 0}; size_t startWorkGroups[] = {0, 0, 0}; 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 c052d5f1cb..4e12afe842 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 @@ -79,7 +79,7 @@ using matcherDG2AndLater = IsAtLeastXeHpgCore; HWTEST2_F(WalkerDispatchTestDg2AndLater, givenDebugVariableSetWhenProgramComputeWalkerThenApplyL3PrefetchAppropriately, matcherDG2AndLater) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DebugManagerStateRestore restore; - auto walkerCmd = FamilyType::cmdInitGpgpuWalker; + auto walkerCmd = FamilyType::template getInitGpuWalker(); MockExecutionEnvironment mockExecutionEnvironment{}; auto &rootDeviceEnvironment = *mockExecutionEnvironment.rootDeviceEnvironments[0]; 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 6b182f515a..b1606b1691 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 @@ -92,7 +92,7 @@ using XeHPAndLaterDispatchWalkerBasicTest = Test(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); auto localWorkSize = GpgpuWalkerHelper::setGpgpuWalkerThreadData( computeWalker, kernel->kernelInfo.kernelDescriptor, globalOffsets, startWorkGroups, numWorkGroups, localWorkSizesIn, simd, 3, true, false, 5u); @@ -111,7 +111,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimOne HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimTwoThenLocalWorkSizeEqualsProductLocalXandYDim) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); localWorkSizesIn[1] = 8; @@ -131,7 +131,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimTwo HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimThreeThenLocalWorkSizeEqualsProductLocalXandYandZDim) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); localWorkSizesIn[1] = 8; localWorkSizesIn[2] = 2; @@ -152,7 +152,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimThr HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOneWhenAskHwForLocalIdsThenExpectGenerationFieldsSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({1, 0, 0}); @@ -176,7 +176,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOn HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTwoWhenOnlyYIdPresentAskHwForLocalIdsThenExpectGenerationFieldsSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({0, 1, 0}); localWorkSizesIn[1] = 16; @@ -201,7 +201,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTw HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkThreeTwoWhenOnlyZIdPresentAskHwForLocalIdsThenExpectGenerationFieldsSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({0, 0, 1}); localWorkSizesIn[2] = 16; @@ -226,7 +226,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkThree HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDifferentSIMDsizesWhenLocalIdsGeneratedThenMessageSizeIsSetToProperValue) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({0, 0, 1}); localWorkSizesIn[2] = 16; @@ -237,7 +237,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDifferent for (uint32_t i = 0; i < 4; i++) { for (uint32_t j = 0; j < 3; j++) { - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); GpgpuWalkerHelper::setGpgpuWalkerThreadData(computeWalker, kernel->kernelInfo.kernelDescriptor, globalOffsets, startWorkGroups, numWorkGroups, localWorkSizesIn, simdProgramming[j][0], 2, walkerInput[i][0], walkerInput[i][1], 0u); @@ -251,7 +251,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDebugFlag debugManager.flags.ForceSimdMessageSizeInWalker.set(1); using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({0, 0, 1}); localWorkSizesIn[2] = 16; @@ -262,7 +262,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenDebugFlag for (uint32_t i = 0; i < 4; i++) { for (uint32_t j = 0; j < 3; j++) { - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); GpgpuWalkerHelper::setGpgpuWalkerThreadData(computeWalker, kernel->kernelInfo.kernelDescriptor, globalOffsets, startWorkGroups, numWorkGroups, localWorkSizesIn, simdProgramming[j], 2, walkerInput[i][0], walkerInput[i][1], 0u); @@ -275,7 +275,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTw using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({1, 1, 0}); localWorkSizesIn[1] = 8; @@ -299,7 +299,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTw HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsThenExpectGenerationFieldsSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({1, 1, 1}); localWorkSizesIn[1] = 8; @@ -323,7 +323,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTh HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsAndNoLocalIdsUsedThenExpectNoGenerationFieldsSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({0, 0, 0}); localWorkSizesIn[1] = 8; @@ -345,7 +345,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTh HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenNotAskHwForLocalIdsAndLocalIdsUsedThenExpectNoGenerationFieldsSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({1, 1, 1}); localWorkSizesIn[1] = 8; @@ -367,7 +367,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTh HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOneWhenAskForInlineDataAndNoLocalIdsPresentThenExpectOnlyInlineFieldSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); GpgpuWalkerHelper::setGpgpuWalkerThreadData(computeWalker, kernel->kernelInfo.kernelDescriptor, globalOffsets, startWorkGroups, numWorkGroups, localWorkSizesIn, simd, 1, true, true, 0u); @@ -384,7 +384,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOn HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOneWhenAskForInlineDataAndLocalIdsPresentThenExpectInlineAndDoNotExpectEmitLocalIdFieldSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({1, 0, 0}); @@ -404,7 +404,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimOn HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenAskForInlineDataAndLocalIdsPresentThenDoNotExpectEmitLocalIdFieldSetButExpectInlineSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({1, 1, 1}); GpgpuWalkerHelper::setGpgpuWalkerThreadData(computeWalker, kernel->kernelInfo.kernelDescriptor, globalOffsets, startWorkGroups, numWorkGroups, @@ -423,7 +423,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimTh HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, givenWorkDimThreeWhenAskHwForLocalIdsAndInlineDataThenExpectGenerationFieldsSet) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; DefaultWalkerType *computeWalker = static_cast(linearStream.getSpace(sizeof(DefaultWalkerType))); - *computeWalker = FamilyType::cmdInitGpgpuWalker; + *computeWalker = FamilyType::template getInitGpuWalker(); kernel->kernelInfo.setLocalIds({1, 1, 1}); localWorkSizesIn[1] = 8; diff --git a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp index 45a62b0ae6..e2c4bc2809 100644 --- a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp +++ b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -38,7 +38,7 @@ HWTEST_F(CommandParse, WhenGeneratingCommandBufferThenBufferIsCorrect) { typedef typename FamilyType::Parse Parse; typedef typename FamilyType::DefaultWalkerType DefaultWalkerType; GenCmdList cmds; - DefaultWalkerType buffer = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType buffer = FamilyType::template getInitGpuWalker(); EXPECT_TRUE(Parse::parseCommandBuffer(cmds, &buffer, 0)); EXPECT_FALSE(Parse::parseCommandBuffer(cmds, &buffer, 1)); diff --git a/shared/source/gen12lp/hw_cmds_base.h b/shared/source/gen12lp/hw_cmds_base.h index 7cb47c9683..ed83356f37 100644 --- a/shared/source/gen12lp/hw_cmds_base.h +++ b/shared/source/gen12lp/hw_cmds_base.h @@ -154,6 +154,11 @@ struct Gen12LpFamily : public Gen12Lp { static constexpr bool isHeaplessMode() { return false; } + + template + static WalkerType getInitGpuWalker() { + return cmdInitGpgpuWalker; + } }; } // namespace NEO diff --git a/shared/test/unit_test/command_container/command_encoder_tests.cpp b/shared/test/unit_test/command_container/command_encoder_tests.cpp index ed5b56072f..2ce925bbcf 100644 --- a/shared/test/unit_test/command_container/command_encoder_tests.cpp +++ b/shared/test/unit_test/command_container/command_encoder_tests.cpp @@ -286,6 +286,7 @@ HWTEST_F(CommandEncoderTests, givenInOrderExecInfoWhenPatchingThenSetCorrectValu } HWTEST_F(CommandEncoderTests, givenInOrderExecInfoWhenPatchingWalkerThenSetCorrectValues) { + using DefaultWalkerType = typename FamilyType::DefaultWalkerType; MockDevice mockDevice; MockExecutionEnvironment mockExecutionEnvironment{}; @@ -296,7 +297,7 @@ HWTEST_F(CommandEncoderTests, givenInOrderExecInfoWhenPatchingWalkerThenSetCorre auto inOrderExecInfo = std::make_shared(node, nullptr, memoryManager, 2, 0, false, false); - auto cmd = FamilyType::cmdInitGpgpuWalker; + auto cmd = FamilyType::template getInitGpuWalker(); InOrderPatchCommandHelpers::PatchCmd patchCmd(&inOrderExecInfo, &cmd, nullptr, 1, InOrderPatchCommandHelpers::PatchCmdType::walker, false, false); diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 2b30d733de..4b97956496 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -4231,7 +4231,7 @@ HWTEST2_F(CommandStreamReceiverHwTest, auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); auto startOffset = commandStream.getUsed(); - *commandStream.getSpaceForCmd() = FamilyType::cmdInitGpgpuWalker; + *commandStream.getSpaceForCmd() = FamilyType::template getInitGpuWalker(); uint64_t immediateStartAddress = commandStream.getGpuBase() + startOffset; commandStreamReceiver.flushImmediateTask(commandStream, startOffset, immediateFlushTaskFlags, *pDevice); @@ -4243,7 +4243,7 @@ HWTEST2_F(CommandStreamReceiverHwTest, EXPECT_EQ(immediateStartAddress, bbStartCmd->getBatchBufferStartAddress()); startOffset = commandStream.getUsed(); - *commandStream.getSpaceForCmd() = FamilyType::cmdInitGpgpuWalker; + *commandStream.getSpaceForCmd() = FamilyType::template getInitGpuWalker(); size_t usedSize = commandStreamReceiver.commandStream.getUsed(); commandStreamReceiver.flushImmediateTask(commandStream, startOffset, immediateFlushTaskFlags, *pDevice); @@ -4267,7 +4267,7 @@ HWTEST2_F(CommandStreamReceiverHwTest, auto startOffset = commandStream.getUsed(); auto immediateListCmdBufferAllocation = commandStream.getGraphicsAllocation(); - *commandStream.getSpaceForCmd() = FamilyType::cmdInitGpgpuWalker; + *commandStream.getSpaceForCmd() = FamilyType::template getInitGpuWalker(); auto csrTagAllocation = commandStreamReceiver.getTagAllocation(); uint64_t postsyncAddress = csrTagAllocation->getGpuAddress(); @@ -4302,7 +4302,7 @@ HWTEST2_F(CommandStreamReceiverHwTest, startOffset = commandStream.getUsed(); EXPECT_EQ(0u, (startOffset % MemoryConstants::cacheLineSize)); - *commandStream.getSpaceForCmd() = FamilyType::cmdInitGpgpuWalker; + *commandStream.getSpaceForCmd() = FamilyType::template getInitGpuWalker(); completionStamp = commandStreamReceiver.flushImmediateTask(commandStream, startOffset, immediateFlushTaskFlags, *pDevice); EXPECT_EQ(2u, completionStamp.taskCount); @@ -4347,7 +4347,7 @@ HWTEST2_F(CommandStreamReceiverHwTest, auto startOffset = commandStream.getUsed(); auto immediateListCmdBufferAllocation = commandStream.getGraphicsAllocation(); - *commandStream.getSpaceForCmd() = FamilyType::cmdInitGpgpuWalker; + *commandStream.getSpaceForCmd() = FamilyType::template getInitGpuWalker(); immediateFlushTaskFlags.hasStallingCmds = true; auto completionStamp = commandStreamReceiver.flushImmediateTask(commandStream, startOffset, immediateFlushTaskFlags, *pDevice); @@ -4372,7 +4372,7 @@ HWTEST2_F(CommandStreamReceiverHwTest, startOffset = commandStream.getUsed(); - *commandStream.getSpaceForCmd() = FamilyType::cmdInitGpgpuWalker; + *commandStream.getSpaceForCmd() = FamilyType::template getInitGpuWalker(); immediateFlushTaskFlags.hasRelaxedOrderingDependencies = true; completionStamp = commandStreamReceiver.flushImmediateTask(commandStream, startOffset, immediateFlushTaskFlags, *pDevice); @@ -4406,7 +4406,7 @@ HWTEST2_F(CommandStreamReceiverHwTest, auto startOffset = commandStream.getUsed(); auto immediateListCmdBufferAllocation = commandStream.getGraphicsAllocation(); - *commandStream.getSpaceForCmd() = FamilyType::cmdInitGpgpuWalker; + *commandStream.getSpaceForCmd() = FamilyType::template getInitGpuWalker(); immediateFlushTaskFlags.blockingAppend = true; commandStreamReceiver.flushReturnValue = NEO::SubmissionStatus::failed; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp index 7c79e7f932..ac30cacf8d 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp @@ -737,7 +737,8 @@ using WalkerThreadTestXeHPAndLater = WalkerThreadTest; HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenStartWorkGroupWhenIndirectIsFalseThenExpectStartGroupAndThreadDimensionsProgramming) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); + startWorkGroup[1] = 2u; startWorkGroup[2] = 3u; MockExecutionEnvironment executionEnvironment{}; @@ -773,7 +774,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenStartWorkGroupWh HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenNoStartWorkGroupWhenIndirectIsTrueThenExpectNoStartGroupAndThreadDimensionsProgramming) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); startWorkGroup[1] = 2u; startWorkGroup[2] = 3u; MockExecutionEnvironment executionEnvironment{}; @@ -808,7 +809,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenNoStartWorkGroup HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenSimdSizeOneWhenWorkGroupSmallerThanSimdThenExpectSimdSizeAsMaxAndExecutionMaskFull) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); startWorkGroup[1] = 2u; startWorkGroup[2] = 3u; workGroupSizes[0] = 30u; @@ -845,7 +846,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenSimdSizeOneWhenW HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenStartWorkGroupWhenWorkGroupSmallerThanSimdThenExpectStartGroupAndExecutionMaskNotFull) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); startWorkGroup[1] = 2u; startWorkGroup[2] = 3u; workGroupSizes[0] = 30u; @@ -881,7 +882,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenStartWorkGroupWh HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenLocalIdGenerationByHwWhenNoLocalIdsPresentThenExpectNoEmitAndGenerateLocalIds) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); localIdDimensions = 0u; MockExecutionEnvironment executionEnvironment{}; auto &rootDeviceEnvironment = *executionEnvironment.rootDeviceEnvironments[0]; @@ -915,7 +916,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenLocalIdGeneratio HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenLocalIdGenerationByHwWhenLocalIdsPresentThenExpectEmitAndGenerateLocalIds) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); requiredWorkGroupOrder = 2u; workGroupSizes[1] = workGroupSizes[2] = 2u; MockExecutionEnvironment executionEnvironment{}; @@ -955,7 +956,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenDebugVariableToO using DefaultWalkerType = typename FamilyType::DefaultWalkerType; MockExecutionEnvironment executionEnvironment{}; auto &rootDeviceEnvironment = *executionEnvironment.rootDeviceEnvironments[0]; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); requiredWorkGroupOrder = 2u; workGroupSizes[1] = workGroupSizes[2] = 2u; @@ -967,7 +968,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, givenDebugVariableToO HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, WhenInlineDataIsTrueThenExpectInlineDataProgramming) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); startWorkGroup[1] = 2u; startWorkGroup[2] = 3u; MockExecutionEnvironment executionEnvironment{}; @@ -1002,7 +1003,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, WhenInlineDataIsTrueT HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, WhenExecutionMaskNotZeroThenExpectOverrideExecutionMaskCalculation) { using DefaultWalkerType = typename FamilyType::DefaultWalkerType; - DefaultWalkerType walkerCmd = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walkerCmd = FamilyType::template getInitGpuWalker(); MockExecutionEnvironment executionEnvironment{}; auto &rootDeviceEnvironment = *executionEnvironment.rootDeviceEnvironments[0]; uint32_t expectedExecutionMask = 0xFFFFu; diff --git a/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp index c8b082cff1..d8f51706a9 100644 --- a/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_implicit_scaling_xehp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -24,7 +24,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenGetSizeWhenDispatchingCm uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -67,7 +67,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenWorkgroupOneAndNoPartiti uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -110,7 +110,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenWorkgroupOneAndPartition uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1); debugManager.flags.ExperimentalSetWalkerPartitionType.set(static_cast(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X)); auto &postSync = walker.getPostSync(); @@ -158,7 +158,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningWhenDi uint64_t workPartitionAllocationAddress = 0x987654; uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -210,7 +210,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningWhenPa uint64_t workPartitionAllocationAddress = 0x987654; uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -264,7 +264,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer uint64_t workPartitionAllocationAddress = 0x987654; uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -315,7 +315,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer uint64_t workPartitionAllocationAddress = 0x987654; uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -352,7 +352,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenStaticPartitioningPrefer uint64_t workPartitionAllocationAddress = 0x987654; uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -389,7 +389,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, GivenDynamicPartitioningPrefe uint64_t workPartitionAllocationAddress = 0x0; uint64_t postSyncAddress = (1ull << 48) | (1ull << 24); - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -429,7 +429,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(DefaultWalkerType) + @@ -496,7 +496,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(MI_LOAD_REGISTER_MEM) + @@ -564,7 +564,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(MI_LOAD_REGISTER_MEM) + @@ -624,7 +624,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(MI_LOAD_REGISTER_MEM) + @@ -685,7 +685,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(DefaultWalkerType) + @@ -752,7 +752,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(DefaultWalkerType) + @@ -816,7 +816,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(MI_LOAD_REGISTER_MEM) + @@ -880,7 +880,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(MI_ATOMIC) + NEO::EncodeSemaphore::getSizeMiSemaphoreWait() + @@ -948,7 +948,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, ImplicitScalingTests, uint64_t workPartitionAllocationAddress = 0x1000; - DefaultWalkerType walker = FamilyType::cmdInitGpgpuWalker; + DefaultWalkerType walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32); size_t expectedSize = sizeof(DefaultWalkerType) + diff --git a/shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h b/shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h index a541fda1db..9535b21079 100644 --- a/shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h +++ b/shared/test/unit_test/encoders/walker_partition_fixture_xehp_and_later.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ struct WalkerPartitionTests : public ::testing::Test { using WalkerType = typename GfxFamily::DefaultWalkerType; WalkerType walker; - walker = GfxFamily::cmdInitGpgpuWalker; + walker = GfxFamily::template getInitGpuWalker(); walker.setPartitionType(WalkerType::PARTITION_TYPE::PARTITION_TYPE_X); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); diff --git a/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_1.cpp b/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_1.cpp index 2754204419..51108300cd 100644 --- a/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_1.cpp +++ b/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_1.cpp @@ -23,7 +23,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerPartitionWhenConst uint64_t gpuVirtualAddress = 0x8000123000; uint64_t postSyncAddress = 0x8000456000; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setPartitionType(WalkerType::PARTITION_TYPE::PARTITION_TYPE_X); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -1084,7 +1084,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenDebugModesForWalkerParti uint64_t gpuVirtualAddress = 0x8000123000; uint64_t postSyncAddress = 0x8000456000; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setPartitionType(WalkerType::PARTITION_TYPE::PARTITION_TYPE_X); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -1308,7 +1308,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitionIsPreferr MockExecutionEnvironment mockExecutionEnvironment{}; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdStartingX(1u); checkForProperCmdBufferAddressOffset = false; diff --git a/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp b/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp index 2b418a139e..baf546e714 100644 --- a/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp +++ b/shared/test/unit_test/encoders/walker_partition_tests_xehp_and_later_2.cpp @@ -34,7 +34,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerPartitionWhenConst checkForProperCmdBufferAddressOffset = false; uint64_t gpuVirtualAddress = 0x8000123000; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setPartitionType(WalkerType::PARTITION_TYPE::PARTITION_TYPE_X); WalkerPartition::constructDynamicallyPartitionedCommandBuffer(cmdBuffer, @@ -419,7 +419,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenProgramComputeWalkerWhen auto expectedUsedSize = sizeof(WalkerType); WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(7u); walker.setThreadGroupIdYDimension(10u); walker.setThreadGroupIdZDimension(11u); @@ -468,7 +468,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWhenComputePartiti using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(16u); bool staticPartitioning = false; @@ -482,7 +482,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithNonUniformStar using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdStartingX(1u); bool staticPartitioning = false; @@ -512,7 +512,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithDifferentWorkg using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(64u); walker.setThreadGroupIdYDimension(64u); walker.setThreadGroupIdZDimension(64u); @@ -542,7 +542,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenDisabledMinimalPartition using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(64u); walker.setThreadGroupIdYDimension(64u); walker.setThreadGroupIdZDimension(64u); @@ -575,7 +575,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithDifferentWorkg using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(15u); walker.setThreadGroupIdYDimension(7u); walker.setThreadGroupIdZDimension(4u); @@ -608,7 +608,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithPartitionTypeH DebugManagerStateRestore restore{}; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(8u); walker.setThreadGroupIdYDimension(4u); walker.setThreadGroupIdZDimension(2u); @@ -645,7 +645,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenInvalidPartitionTypeIsRe DebugManagerStateRestore restore{}; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(8u); walker.setThreadGroupIdYDimension(4u); walker.setThreadGroupIdZDimension(2u); @@ -659,7 +659,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithSmallXDimensio using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32u); walker.setThreadGroupIdYDimension(1024u); walker.setThreadGroupIdZDimension(1u); @@ -675,7 +675,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithBigXDimensionS using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(16384u); walker.setThreadGroupIdYDimension(1u); walker.setThreadGroupIdZDimension(1u); @@ -691,7 +691,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenCustomMinimalPartitionSi using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(16384u); walker.setThreadGroupIdYDimension(1u); walker.setThreadGroupIdZDimension(1u); @@ -710,7 +710,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithPartitionTypeP using WalkerType = typename FamilyType::DefaultWalkerType; using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1u); walker.setThreadGroupIdYDimension(1u); walker.setThreadGroupIdZDimension(1u); @@ -725,7 +725,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenWalkerWithPartitionTypeP HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenXDimensionIsNotLargetAnd2DImagesAreUsedWhenPartitionTypeIsObtainedThenSelectXDimension) { using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(8u); walker.setThreadGroupIdYDimension(64u); walker.setThreadGroupIdZDimension(16u); @@ -741,7 +741,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenXDimensionIsNotLargetAnd HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndNonPartitionableWalkerWhenPartitionCountIsObtainedThenAllowPartitioning) { using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1u); walker.setThreadGroupIdYDimension(1u); walker.setThreadGroupIdZDimension(1u); @@ -756,7 +756,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndNon HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndPartitionableWalkerWhenPartitionCountIsObtainedThenAllowPartitioning) { using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1u); walker.setThreadGroupIdYDimension(2u); walker.setThreadGroupIdZDimension(1u); @@ -771,7 +771,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndPar HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndBigPartitionCountProgrammedInWalkerWhenPartitionCountIsObtainedThenNumberOfPartitionsIsEqualToNumberOfTiles) { using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1u); walker.setThreadGroupIdYDimension(16384u); walker.setThreadGroupIdZDimension(1u); @@ -786,7 +786,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndBig HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndAndNonUniformStartProgrammedInWalkerWhenPartitionCountIsObtainedThenDoNotAllowStaticPartitioningAndSetPartitionCountToOne) { using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1u); walker.setThreadGroupIdYDimension(16384u); walker.setThreadGroupIdZDimension(1u); @@ -805,7 +805,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningAndPar using WalkerType = typename FamilyType::DefaultWalkerType; DebugManagerStateRestore restore{}; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1u); walker.setThreadGroupIdYDimension(16384u); walker.setThreadGroupIdZDimension(1u); @@ -828,7 +828,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningWhenZD using WalkerType = typename FamilyType::DefaultWalkerType; DebugManagerStateRestore restore{}; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(1u); walker.setThreadGroupIdYDimension(16384u); walker.setThreadGroupIdZDimension(2u); @@ -851,7 +851,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningWhenYD using WalkerType = typename FamilyType::DefaultWalkerType; DebugManagerStateRestore restore{}; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(16384u); walker.setThreadGroupIdYDimension(2u); walker.setThreadGroupIdZDimension(1u); @@ -874,7 +874,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenStaticPartitioningWhenZD using WalkerType = typename FamilyType::DefaultWalkerType; DebugManagerStateRestore restore{}; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(512u); walker.setThreadGroupIdYDimension(512u); walker.setThreadGroupIdZDimension(513u); @@ -906,7 +906,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenSelfCleanupSectionWhenDe uint64_t gpuVirtualAddress = 0x8000123000; uint64_t postSyncAddress = 0x8000456000; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setPartitionType(WalkerType::PARTITION_TYPE::PARTITION_TYPE_X); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -1115,7 +1115,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenSelfCleanupAndAtomicsUse uint64_t gpuVirtualAddress = 0x8000123000; uint64_t postSyncAddress = 0x8000456000; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setPartitionType(WalkerType::PARTITION_TYPE::PARTITION_TYPE_X); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -1330,7 +1330,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenDynamicPartitioningWhenP uint64_t gpuVirtualAddress = 0x8000123000; uint64_t postSyncAddress = 0x8000456000; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setPartitionType(WalkerType::PARTITION_TYPE::PARTITION_TYPE_X); auto &postSync = walker.getPostSync(); postSync.setOperation(POSTSYNC_DATA::OPERATION::OPERATION_WRITE_TIMESTAMP); @@ -1750,7 +1750,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenBarrierProgrammingWhenEm HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerPartitionTests, givenForceExecutionOnSingleTileWhenProgramComputeWalkerThenWalkerIsProperlyProgrammed) { using WalkerType = typename FamilyType::DefaultWalkerType; WalkerType walker; - walker = FamilyType::cmdInitGpgpuWalker; + walker = FamilyType::template getInitGpuWalker(); walker.setThreadGroupIdXDimension(32u); walker.setThreadGroupIdYDimension(1u); walker.setThreadGroupIdZDimension(1u);