intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-09 22:43:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use getInitGpuWalker function in ults

Browse Source 
Related-To: NEO-10641
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2024-06-26 00:39:52 +00:00
committed by Compute-Runtime-Automation
parent e39d478acd
commit e74c8c516a
14 changed files with 99 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp
View File

@@ -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<DefaultWalkerType>();
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<DefaultWalkerType>();
walkerCmd.setPartitionType(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X);
walkerCmd.getInterfaceDescriptor().setNumberOfThreadsInGpgpuThreadGroup(1u);

2
opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp
View File

@@ -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<DefaultWalkerType>();
walkerCmd.setPartitionType(DefaultWalkerType::PARTITION_TYPE::PARTITION_TYPE_X);
walkerCmd.getInterfaceDescriptor().setNumberOfThreadsInGpgpuThreadGroup(1u);
walkerCmd.getPostSync().setDestinationAddress(postSyncAddress);

2
opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
View File

@@ -125,7 +125,7 @@ HWTEST_F(DispatchWalkerTest, givenSimd1WhenSetGpgpuWalkerThreadDataThenSimdInWal
using DefaultWalkerType = typename FamilyType::DefaultWalkerType;
DefaultWalkerType *computeWalker = static_cast<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
size_t globalOffsets[] = {0, 0, 0};
size_t startWorkGroups[] = {0, 0, 0};

2
opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp
View File

@@ -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<DefaultWalkerType>();
MockExecutionEnvironment mockExecutionEnvironment{};
auto &rootDeviceEnvironment = *mockExecutionEnvironment.rootDeviceEnvironments[0];

36
opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp
View File

@@ -92,7 +92,7 @@ using XeHPAndLaterDispatchWalkerBasicTest = Test<XeHPAndLaterDispatchWalkerBasic
HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimOneThenLocalWorkSizeEqualsLocalXDim) {
using DefaultWalkerType = typename FamilyType::DefaultWalkerType;
DefaultWalkerType *computeWalker = static_cast<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
auto localWorkSize = GpgpuWalkerHelper<FamilyType>::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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType>();
GpgpuWalkerHelper<FamilyType>::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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType>();
GpgpuWalkerHelper<FamilyType>::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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
GpgpuWalkerHelper<FamilyType>::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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
kernel->kernelInfo.setLocalIds({1, 1, 1});
GpgpuWalkerHelper<FamilyType>::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<DefaultWalkerType *>(linearStream.getSpace(sizeof(DefaultWalkerType)));
*computeWalker = FamilyType::cmdInitGpgpuWalker;
*computeWalker = FamilyType::template getInitGpuWalker<DefaultWalkerType>();
kernel->kernelInfo.setLocalIds({1, 1, 1});
localWorkSizesIn[1] = 8;

4
opencl/test/unit_test/command_stream/cmd_parse_tests.cpp
View File

@@ -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<DefaultWalkerType>();
EXPECT_TRUE(Parse::parseCommandBuffer(cmds, &buffer, 0));
EXPECT_FALSE(Parse::parseCommandBuffer(cmds, &buffer, 1));