Skip to content

Commit 93efb2c

Browse files
kcenceleCompute-Runtime-Automation
kcencele
authored and
Compute-Runtime-Automation
committed
Move DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE to ignore
Signed-off-by: Katarzyna Cencelewska <[email protected]>
1 parent e4a93f9 commit 93efb2c

File tree

7 files changed

+6
-81
lines changed

7 files changed

+6
-81
lines changed

‎opencl/test/unit_test/program/kernel_data_OCL2_0.cpp‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2021 Intel Corporation
2+
* Copyright (C) 2018-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -136,30 +136,3 @@ TEST_F(KernelDataTest, GIVENdataParameterObjectIdWHENdecodeTokensTHENoffsetLocat
136136
auto deviceSideEnqueueDesc = reinterpret_cast<NEO::ArgDescriptorDeviceSideEnqueue *>(pKernelInfo->kernelDescriptor.payloadMappings.explicitArgsExtendedDescriptors[argNum].get());
137137
EXPECT_EQ(offsetObjectId, deviceSideEnqueueDesc->objectId);
138138
}
139-
140-
TEST_F(KernelDataTest, GIVENdataParameterChildSimdSizeWHENdecodeTokensTHENchildsIdsStoredInKernelInfoWithOffset) {
141-
SPatchDataParameterBuffer patchList[3];
142-
uint32_t childrenKernelIds[3] = {7, 14, 21};
143-
uint32_t childrenSimdSizeOffsets[3] = {0x77, 0xAB, 0xCD};
144-
145-
for (int i = 0; i < 3; i++) {
146-
patchList[i].Token = PATCH_TOKEN_DATA_PARAMETER_BUFFER;
147-
patchList[i].Size = sizeof(SPatchDataParameterBuffer);
148-
patchList[i].Type = DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE;
149-
patchList[i].ArgumentNumber = childrenKernelIds[i];
150-
patchList[i].Offset = childrenSimdSizeOffsets[i];
151-
patchList[i].DataSize = sizeof(uint32_t);
152-
patchList[i].SourceOffset = 0;
153-
}
154-
155-
pPatchList = patchList;
156-
patchListSize = sizeof(patchList);
157-
158-
buildAndDecode();
159-
160-
ASSERT_GE(pKernelInfo->childrenKernelsIdOffset.size(), size_t(3u));
161-
for (int i = 0; i < 3; i++) {
162-
EXPECT_EQ(pKernelInfo->childrenKernelsIdOffset[i].first, childrenKernelIds[i]);
163-
EXPECT_EQ(pKernelInfo->childrenKernelsIdOffset[i].second, childrenSimdSizeOffsets[i]);
164-
}
165-
}

‎shared/source/device_binary_format/patchtokens_decoder.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,6 @@ inline void decodeKernelDataParameterToken(const SPatchDataParameterBuffer *toke
284284
case DATA_PARAMETER_PARENT_EVENT:
285285
crossthread.parentEvent = token;
286286
break;
287-
case DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE:
288-
crossthread.childBlockSimdSize.push_back(token);
289-
break;
290287
case DATA_PARAMETER_PREFERRED_WORKGROUP_MULTIPLE:
291288
crossthread.preferredWorkgroupMultiple = token;
292289
break;
@@ -303,6 +300,7 @@ inline void decodeKernelDataParameterToken(const SPatchDataParameterBuffer *toke
303300
case DATA_PARAMETER_EXECUTION_MASK:
304301
case DATA_PARAMETER_VME_IMAGE_TYPE:
305302
case DATA_PARAMETER_VME_MB_SKIP_BLOCK_TYPE:
303+
case DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE:
306304
// ignored intentionally
307305
break;
308306
}

‎shared/source/device_binary_format/patchtokens_decoder.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ struct KernelFromPatchtokens {
156156
const SPatchDataParameterBuffer *localMemoryStatelessWindowSize = nullptr;
157157
const SPatchDataParameterBuffer *localMemoryStatelessWindowStartAddress = nullptr;
158158
const SPatchDataParameterBuffer *preferredWorkgroupMultiple = nullptr;
159-
StackVec<const SPatchDataParameterBuffer *, 4> childBlockSimdSize;
160159
const SPatchDataParameterBuffer *implicitArgsBufferOffset = nullptr;
161160
} crossThreadPayloadArgs;
162161
} tokens;

‎shared/source/device_binary_format/patchtokens_dumper.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,9 +764,7 @@ std::string asString(const KernelFromPatchtokens &kern) {
764764
dumpOrNull(kern.tokens.crossThreadPayloadArgs.localMemoryStatelessWindowSize, "", stream, indentLevel1);
765765
dumpOrNull(kern.tokens.crossThreadPayloadArgs.localMemoryStatelessWindowStartAddress, "", stream, indentLevel1);
766766
dumpOrNull(kern.tokens.crossThreadPayloadArgs.preferredWorkgroupMultiple, "", stream, indentLevel1);
767-
dumpVecIfNotEmpty(kern.tokens.crossThreadPayloadArgs.childBlockSimdSize, "Child block simd size(s)", stream, indentLevel1);
768767
dumpOrNull(kern.tokens.crossThreadPayloadArgs.implicitArgsBufferOffset, "", stream, indentLevel1);
769-
770768
if (kern.tokens.kernelArgs.size() != 0) {
771769
stream << "Kernel arguments [" << kern.tokens.kernelArgs.size() << "] :\n";
772770
for (size_t i = 0; i < kern.tokens.kernelArgs.size(); ++i) {

‎shared/source/program/kernel_info_from_patchtokens.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019-2021 Intel Corporation
2+
* Copyright (C) 2019-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -38,10 +38,6 @@ void populateKernelInfo(KernelInfo &dst, const PatchTokenBinary::KernelFromPatch
3838

3939
dst.systemKernelOffset = src.tokens.stateSip ? src.tokens.stateSip->SystemKernelOffset : 0U;
4040

41-
for (auto &childSimdSize : src.tokens.crossThreadPayloadArgs.childBlockSimdSize) {
42-
dst.childrenKernelsIdOffset.push_back({childSimdSize->ArgumentNumber, childSimdSize->Offset});
43-
}
44-
4541
if (src.tokens.gtpinInfo) {
4642
dst.igcInfoForGtpin = reinterpret_cast<const gtpin::igc_info_t *>(src.tokens.gtpinInfo + 1);
4743
}

‎shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ bool hasEmptyTokensInfo(const NEO::PatchTokenBinary::KernelFromPatchtokens &kern
6363
empty &= nullptr == toks.crossThreadPayloadArgs.localMemoryStatelessWindowSize;
6464
empty &= nullptr == toks.crossThreadPayloadArgs.localMemoryStatelessWindowStartAddress;
6565
empty &= nullptr == toks.crossThreadPayloadArgs.preferredWorkgroupMultiple;
66-
empty &= toks.crossThreadPayloadArgs.childBlockSimdSize.empty();
6766
return empty;
6867
}
6968

@@ -576,9 +575,6 @@ TEST(KernelDecoder, GivenKernelWithValidNonArgCrossThreadDataPatchtokensThenDeco
576575
auto localMemoryStatelessWindowStartAddrOff = pushBackDataParameterToken(DATA_PARAMETER_LOCAL_MEMORY_STATELESS_WINDOW_START_ADDRESS, storage);
577576
auto parentEventOff = pushBackDataParameterToken(DATA_PARAMETER_PARENT_EVENT, storage);
578577
auto preferredWorkgroupMultipleOff = pushBackDataParameterToken(DATA_PARAMETER_PREFERRED_WORKGROUP_MULTIPLE, storage);
579-
auto childBlockSimdSize0Off = pushBackDataParameterToken(DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE, storage);
580-
auto childBlockSimdSize1Off = pushBackDataParameterToken(DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE, storage);
581-
auto childBlockSimdSize2Off = pushBackDataParameterToken(DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE, storage);
582578
auto implictArgBufferOffset = pushBackDataParameterToken(DATA_PARAMETER_IMPL_ARG_BUFFER, storage);
583579

584580
ASSERT_EQ(storage.data(), kernelToEncode.blobs.kernelInfo.begin());
@@ -618,10 +614,6 @@ TEST(KernelDecoder, GivenKernelWithValidNonArgCrossThreadDataPatchtokensThenDeco
618614
EXPECT_TRUE(tokenOffsetMatched(base, localMemoryStatelessWindowStartAddrOff, decodedKernel.tokens.crossThreadPayloadArgs.localMemoryStatelessWindowStartAddress));
619615
EXPECT_TRUE(tokenOffsetMatched(base, parentEventOff, decodedKernel.tokens.crossThreadPayloadArgs.parentEvent));
620616
EXPECT_TRUE(tokenOffsetMatched(base, preferredWorkgroupMultipleOff, decodedKernel.tokens.crossThreadPayloadArgs.preferredWorkgroupMultiple));
621-
ASSERT_EQ(3U, decodedKernel.tokens.crossThreadPayloadArgs.childBlockSimdSize.size());
622-
EXPECT_TRUE(tokenOffsetMatched(base, childBlockSimdSize0Off, decodedKernel.tokens.crossThreadPayloadArgs.childBlockSimdSize[0]));
623-
EXPECT_TRUE(tokenOffsetMatched(base, childBlockSimdSize1Off, decodedKernel.tokens.crossThreadPayloadArgs.childBlockSimdSize[1]));
624-
EXPECT_TRUE(tokenOffsetMatched(base, childBlockSimdSize2Off, decodedKernel.tokens.crossThreadPayloadArgs.childBlockSimdSize[2]));
625617
EXPECT_TRUE(tokenOffsetMatched(base, implictArgBufferOffset, decodedKernel.tokens.crossThreadPayloadArgs.implicitArgsBufferOffset));
626618
}
627619

‎shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp‎

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,6 @@ TEST(KernelDumper, GivenKernelWithNonArgCrossThreadDataPatchtokensThenProperlyCr
905905
auto localMemoryStatelessWindowSize = initDataParameterBufferToken(DATA_PARAMETER_LOCAL_MEMORY_STATELESS_WINDOW_SIZE);
906906
auto localMemoryStatelessWindowStartAddress = initDataParameterBufferToken(DATA_PARAMETER_LOCAL_MEMORY_STATELESS_WINDOW_START_ADDRESS);
907907
auto preferredWorkgroupMultiple = initDataParameterBufferToken(DATA_PARAMETER_PREFERRED_WORKGROUP_MULTIPLE);
908-
SPatchDataParameterBuffer childBlockSimdSize[2] = {initDataParameterBufferToken(DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE),
909-
initDataParameterBufferToken(DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE, 2U)};
910908
auto unknownToken0 = initDataParameterBufferToken(NUM_DATA_PARAMETER_TOKENS);
911909
auto unknownToken1 = initDataParameterBufferToken(NUM_DATA_PARAMETER_TOKENS);
912910

@@ -936,8 +934,6 @@ TEST(KernelDumper, GivenKernelWithNonArgCrossThreadDataPatchtokensThenProperlyCr
936934
kernel.tokens.crossThreadPayloadArgs.localMemoryStatelessWindowSize = &localMemoryStatelessWindowSize;
937935
kernel.tokens.crossThreadPayloadArgs.localMemoryStatelessWindowStartAddress = &localMemoryStatelessWindowStartAddress;
938936
kernel.tokens.crossThreadPayloadArgs.preferredWorkgroupMultiple = &preferredWorkgroupMultiple;
939-
kernel.tokens.crossThreadPayloadArgs.childBlockSimdSize.push_back(&childBlockSimdSize[0]);
940-
kernel.tokens.crossThreadPayloadArgs.childBlockSimdSize.push_back(&childBlockSimdSize[1]);
941937
kernel.unhandledTokens.push_back(&unknownToken0);
942938
kernel.unhandledTokens.push_back(&unknownToken1);
943939

@@ -1334,35 +1330,6 @@ Kernel-scope tokens section size : )==="
13341330
uint32_t LocationIndex2;// = 0
13351331
uint32_t IsEmulationArgument;// = 0
13361332
}
1337-
Child block simd size(s) [2] :
1338-
+ [0]:
1339-
| struct SPatchDataParameterBuffer :
1340-
| SPatchItemHeader (Token=17(PATCH_TOKEN_DATA_PARAMETER_BUFFER), Size=)==="
1341-
<< tokenSize << R"===()
1342-
| {
1343-
| uint32_t Type;// = 38(DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE)
1344-
| uint32_t ArgumentNumber;// = 0
1345-
| uint32_t Offset;// = 0
1346-
| uint32_t DataSize;// = 0
1347-
| uint32_t SourceOffset;// = 0
1348-
| uint32_t LocationIndex;// = 0
1349-
| uint32_t LocationIndex2;// = 0
1350-
| uint32_t IsEmulationArgument;// = 0
1351-
| }
1352-
+ [1]:
1353-
| struct SPatchDataParameterBuffer :
1354-
| SPatchItemHeader (Token=17(PATCH_TOKEN_DATA_PARAMETER_BUFFER), Size=)==="
1355-
<< tokenSize << R"===()
1356-
| {
1357-
| uint32_t Type;// = 38(DATA_PARAMETER_CHILD_BLOCK_SIMD_SIZE)
1358-
| uint32_t ArgumentNumber;// = 0
1359-
| uint32_t Offset;// = 0
1360-
| uint32_t DataSize;// = 0
1361-
| uint32_t SourceOffset;// = 8
1362-
| uint32_t LocationIndex;// = 0
1363-
| uint32_t LocationIndex2;// = 0
1364-
| uint32_t IsEmulationArgument;// = 0
1365-
| }
13661333
)===";
13671334
EXPECT_STREQ(expected.str().c_str(), generated.c_str());
13681335
}
@@ -2094,7 +2061,9 @@ TEST(PatchTokenDumper, GivenAnyTokenThenDumpingIsHandled) {
20942061
auto kernelDataParamToken = static_cast<iOpenCL::SPatchDataParameterBuffer *>(kernelToken);
20952062
*kernelDataParamToken = PatchTokensTestData::initDataParameterBufferToken(iOpenCL::DATA_PARAMETER_BUFFER_OFFSET);
20962063
kernelDataParamToken->Size = maxTokenSize;
2097-
std::unordered_set<int> dataParamTokensPasslist{6, 7, 17, 19, 36, 37, 39, 40, 41};
2064+
2065+
std::unordered_set<int> dataParamTokensPasslist{6, 7, 17, 19, 36, 37, 38, 39, 40, 41};
2066+
20982067
for (int i = 0; i < iOpenCL::NUM_DATA_PARAMETER_TOKENS; ++i) {
20992068
if (dataParamTokensPasslist.count(i) != 0) {
21002069
continue;

0 commit comments

Comments
 (0)