Skip to content

Commit ffb1d29

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
fix: merge hasPrintfCalls and usesPrintf flags within KernelAttributes flags
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent f84a5fb commit ffb1d29

File tree

13 files changed

+21
-57
lines changed

13 files changed

+21
-57
lines changed

‎level_zero/core/source/kernel/kernel_imp.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,14 +1343,12 @@ std::unique_ptr<KernelImp> KernelImp::makeDependentClone() {
13431343

13441344
void KernelImp::createPrintfBuffer() {
13451345
auto &sharedState = *(this->sharedState);
1346-
if (this->getImmutableData()->getDescriptor().kernelAttributes.flags.hasPrintfCalls) {
1346+
if (this->getImmutableData()->getDescriptor().kernelAttributes.flags.usesPrintf) {
13471347
sharedState.printfBuffer = PrintfHandler::createPrintfBuffer(this->module->getDevice());
13481348
this->privateState.internalResidencyContainer.push_back(sharedState.printfBuffer);
1349-
if (this->getImmutableData()->getDescriptor().kernelAttributes.flags.usesPrintf) {
1350-
NEO::patchPointer(getCrossThreadDataSpan(),
1351-
this->getImmutableData()->getDescriptor().payloadMappings.implicitArgs.printfSurfaceAddress,
1352-
static_cast<uintptr_t>(sharedState.printfBuffer->getGpuAddressToPatch()));
1353-
}
1349+
NEO::patchPointer(getCrossThreadDataSpan(),
1350+
this->getImmutableData()->getDescriptor().payloadMappings.implicitArgs.printfSurfaceAddress,
1351+
static_cast<uintptr_t>(sharedState.printfBuffer->getGpuAddressToPatch()));
13541352
if (privateState.pImplicitArgs) {
13551353
privateState.pImplicitArgs->setPrintfBuffer(sharedState.printfBuffer->getGpuAddress());
13561354
}

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@ HWTEST_F(ImmediateCommandListTest,
15961596

15971597
auto kernel = new Mock<KernelImp>{};
15981598
kernel->setModule(module.get());
1599-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
1599+
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
16001600
kernel->createPrintfBuffer();
16011601
module->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
16021602

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfUsedWhenAppendedToC
239239
auto kernel = new Mock<KernelImp>{};
240240
kernel->setModule(module.get());
241241
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
242-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
243242
kernel->createPrintfBuffer();
244243
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
245244

@@ -258,7 +257,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfUsedWhenAppendedToC
258257
auto kernel = new Mock<KernelImp>{};
259258
kernel->setModule(module.get());
260259
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
261-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
262260
kernel->createPrintfBuffer();
263261
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
264262

@@ -282,7 +280,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfWhenAppendedToSynch
282280
auto kernel = new Mock<KernelImp>{};
283281
kernel->setModule(module.get());
284282
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
285-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
286283
kernel->createPrintfBuffer();
287284
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
288285

@@ -310,7 +307,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfWhenAppendedToAsync
310307
auto kernel = new Mock<KernelImp>{};
311308
kernel->setModule(module.get());
312309
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
313-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
314310
kernel->createPrintfBuffer();
315311
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
316312

@@ -346,7 +342,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfWhenAppendToSynchro
346342
auto kernel = new Mock<KernelImp>{};
347343
kernel->setModule(module.get());
348344
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
349-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
350345
kernel->createPrintfBuffer();
351346
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
352347

@@ -384,7 +379,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfAppendedToCommandLi
384379
auto kernel = new Mock<KernelImp>{};
385380
kernel->setModule(module.get());
386381
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
387-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
388382
kernel->createPrintfBuffer();
389383
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
390384

@@ -428,7 +422,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfAndEventAppendedToC
428422
auto kernel = new Mock<KernelImp>{};
429423
kernel->setModule(module.get());
430424
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
431-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
432425
kernel->createPrintfBuffer();
433426
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
434427

@@ -496,7 +489,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfAndEventAppendedToC
496489
auto kernel = new Mock<KernelImp>{};
497490
kernel->setModule(module.get());
498491
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
499-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
500492
kernel->createPrintfBuffer();
501493
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
502494

@@ -559,7 +551,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfAppendedToImmComman
559551
auto kernel = new Mock<KernelImp>{};
560552
kernel->setModule(module.get());
561553
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
562-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
563554
kernel->createPrintfBuffer();
564555
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
565556

@@ -587,7 +578,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfAndEventAppendedToI
587578
auto kernel = new Mock<KernelImp>{};
588579
kernel->setModule(module.get());
589580
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
590-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
591581
kernel->createPrintfBuffer();
592582
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
593583

@@ -639,7 +629,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithPrintfAndEventAppendedToI
639629
auto kernel = new Mock<KernelImp>{};
640630
kernel->setModule(module.get());
641631
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
642-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
643632
kernel->createPrintfBuffer();
644633
static_cast<ModuleImp *>(module.get())->getPrintfKernelContainer().push_back(std::shared_ptr<Kernel>{kernel});
645634

@@ -1889,4 +1878,4 @@ HWTEST2_F(CommandListAppendLaunchKernelMockModule,
18891878
}
18901879

18911880
} // namespace ult
1892-
} // namespace L0
1881+
} // namespace L0

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ struct CmdlistAppendLaunchKernelWithImplicitArgsTests : CmdlistAppendLaunchKerne
862862
kernelDescriptor->kernelAttributes.workgroupDimensionsOrder[0] = workgroupDimOrder[0];
863863
kernelDescriptor->kernelAttributes.workgroupDimensionsOrder[1] = workgroupDimOrder[1];
864864
kernelDescriptor->kernelAttributes.workgroupDimensionsOrder[2] = workgroupDimOrder[2];
865-
kernelDescriptor->kernelAttributes.flags.hasPrintfCalls = true;
865+
kernelDescriptor->kernelAttributes.flags.usesPrintf = true;
866866
createModuleFromMockBinary(0u, false, mockKernelImmData.get());
867867

868868
auto kernel = std::make_unique<MockKernel>(module.get());
@@ -1299,7 +1299,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenTwoKernelPrivateAllocsWhichTogether
12991299
auto &kernelDesc = const_cast<KernelDescriptor &>(kernelImmData[i]->getDescriptor());
13001300
kernelDesc.kernelAttributes.perHwThreadPrivateMemorySize = overAllocMinSize + static_cast<uint32_t>(i * MemoryConstants::cacheLineSize);
13011301
kernelDesc.kernelAttributes.flags.usesPrintf = false;
1302-
kernelDesc.kernelAttributes.flags.hasPrintfCalls = false;
13031302
kernelDesc.kernelMetadata.kernelName = kernelNames[i];
13041303
}
13051304

@@ -1336,7 +1335,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenTwoKernelPrivateAllocsWhichDontExce
13361335
auto &kernelDesc = const_cast<KernelDescriptor &>(kernelImmData[i]->getDescriptor());
13371336
kernelDesc.kernelAttributes.perHwThreadPrivateMemorySize = underAllocSize;
13381337
kernelDesc.kernelAttributes.flags.usesPrintf = false;
1339-
kernelDesc.kernelAttributes.flags.hasPrintfCalls = false;
13401338
kernelDesc.kernelMetadata.kernelName = kernelNames[i];
13411339
}
13421340

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenNonemptyAllocPrintfBufferKernelWhen
278278

279279
kernel->setModule(&module);
280280
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
281-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
282281
kernel->createPrintfBuffer();
283282

284283
ze_event_desc_t eventDesc = {};
@@ -308,7 +307,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenNonPrintfKernelForStackCallsWhenApp
308307

309308
kernel->setModule(&module);
310309
kernel->descriptor.kernelAttributes.flags.usesPrintf = false;
311-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = false;
312310
kernel->descriptor.kernelAttributes.flags.useStackCalls = true;
313311
kernel->privateState.pImplicitArgs = Clonable(new ImplicitArgs());
314312
kernel->privateState.pImplicitArgs->v0.header.structVersion = 0;
@@ -347,7 +345,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenEmptyAllocPrintfBufferKernelWhenApp
347345

348346
kernel->setModule(&module);
349347
kernel->descriptor.kernelAttributes.flags.usesPrintf = false;
350-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = false;
351348
kernel->setGroupSize(8, 1, 1);
352349

353350
ze_event_desc_t eventDesc = {};
@@ -376,7 +373,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenNonemptyAllocPrintfBufferKernelWhen
376373

377374
kernel->setModule(&module);
378375
kernel->descriptor.kernelAttributes.flags.usesPrintf = true;
379-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = true;
380376
kernel->createPrintfBuffer();
381377
kernel->setGroupSize(8, 1, 1);
382378

@@ -412,7 +408,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenNonPrintfKernelAndStackCallsWhenApp
412408

413409
kernel->setModule(&module);
414410
kernel->descriptor.kernelAttributes.flags.usesPrintf = false;
415-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = false;
416411
kernel->descriptor.kernelAttributes.flags.useStackCalls = true;
417412
kernel->privateState.pImplicitArgs = Clonable(new ImplicitArgs());
418413
kernel->privateState.pImplicitArgs->v0.header.structVersion = 0;
@@ -455,7 +450,6 @@ HWTEST_F(CommandListAppendLaunchKernel, givenEmptyAllocPrintfBufferKernelWhenApp
455450

456451
kernel->setModule(&module);
457452
kernel->descriptor.kernelAttributes.flags.usesPrintf = false;
458-
kernel->descriptor.kernelAttributes.flags.hasPrintfCalls = false;
459453

460454
ze_event_desc_t eventDesc = {};
461455
eventDesc.index = 0;

‎level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3824,7 +3824,6 @@ TEST_F(PrintfTest, givenKernelWithPrintfThenPrintfBufferIsCreated) {
38243824
Mock<Module> mockModule(this->device, nullptr);
38253825
Mock<KernelImp> mockKernel;
38263826
mockKernel.descriptor.kernelAttributes.flags.usesPrintf = true;
3827-
mockKernel.descriptor.kernelAttributes.flags.hasPrintfCalls = true;
38283827
mockKernel.setModule(&mockModule);
38293828

38303829
EXPECT_TRUE(mockKernel.getImmutableData()->getDescriptor().kernelAttributes.flags.usesPrintf);
@@ -3837,7 +3836,6 @@ TEST_F(PrintfTest, GivenKernelNotUsingPrintfWhenCreatingPrintfBufferThenAllocati
38373836
Mock<Module> mockModule(this->device, nullptr);
38383837
Mock<KernelImp> mockKernel;
38393838
mockKernel.descriptor.kernelAttributes.flags.usesPrintf = false;
3840-
mockKernel.descriptor.kernelAttributes.flags.hasPrintfCalls = false;
38413839
mockKernel.setModule(&mockModule);
38423840

38433841
mockKernel.createPrintfBuffer();
@@ -3848,7 +3846,6 @@ TEST_F(PrintfTest, WhenCreatingPrintfBufferThenAllocationAddedToResidencyContain
38483846
Mock<Module> mockModule(this->device, nullptr);
38493847
Mock<KernelImp> mockKernel;
38503848
mockKernel.descriptor.kernelAttributes.flags.usesPrintf = true;
3851-
mockKernel.descriptor.kernelAttributes.flags.hasPrintfCalls = true;
38523849
mockKernel.setModule(&mockModule);
38533850

38543851
mockKernel.createPrintfBuffer();
@@ -3864,7 +3861,6 @@ TEST_F(PrintfTest, WhenCreatingPrintfBufferThenCrossThreadDataIsPatched) {
38643861
Mock<Module> mockModule(this->device, nullptr);
38653862
Mock<KernelImp> mockKernel;
38663863
mockKernel.descriptor.kernelAttributes.flags.usesPrintf = true;
3867-
mockKernel.descriptor.kernelAttributes.flags.hasPrintfCalls = true;
38683864
mockKernel.setModule(&mockModule);
38693865

38703866
mockKernel.descriptor.payloadMappings.implicitArgs.printfSurfaceAddress.stateless = 0;
@@ -3906,7 +3902,6 @@ HWTEST_F(PrintfHandlerTests, givenKernelWithPrintfWhenPrintingOutputWithBlitterU
39063902

39073903
auto &kernelDescriptor = kernelInfo->kernelDescriptor;
39083904
kernelDescriptor.kernelAttributes.flags.usesPrintf = true;
3909-
kernelDescriptor.kernelAttributes.flags.hasPrintfCalls = true;
39103905
kernelDescriptor.kernelAttributes.flags.usesStringMapForPrintf = true;
39113906
kernelDescriptor.kernelAttributes.binaryFormat = DeviceBinaryFormat::patchtokens;
39123907
kernelDescriptor.kernelAttributes.gpuPointerSize = 8u;
@@ -3972,7 +3967,6 @@ HWTEST_F(PrintfHandlerTests, givenPrintDebugMessagesAndKernelWithPrintfWhenBlitt
39723967

39733968
auto &kernelDescriptor = kernelInfo->kernelDescriptor;
39743969
kernelDescriptor.kernelAttributes.flags.usesPrintf = true;
3975-
kernelDescriptor.kernelAttributes.flags.hasPrintfCalls = true;
39763970
kernelDescriptor.kernelAttributes.flags.usesStringMapForPrintf = true;
39773971
kernelDescriptor.kernelAttributes.binaryFormat = DeviceBinaryFormat::patchtokens;
39783972
kernelDescriptor.kernelAttributes.gpuPointerSize = 8u;
@@ -4011,7 +4005,6 @@ TEST_F(KernelPatchtokensPrintfStringMapTests, givenKernelWithPrintfStringsMapUsa
40114005

40124006
auto kernelDescriptor = mockKernelImmData->kernelDescriptor;
40134007
kernelDescriptor->kernelAttributes.flags.usesPrintf = true;
4014-
kernelDescriptor->kernelAttributes.flags.hasPrintfCalls = true;
40154008
kernelDescriptor->kernelAttributes.flags.usesStringMapForPrintf = true;
40164009
kernelDescriptor->kernelAttributes.binaryFormat = DeviceBinaryFormat::patchtokens;
40174010
std::string expectedString("test123");
@@ -4040,7 +4033,6 @@ TEST_F(KernelPatchtokensPrintfStringMapTests, givenKernelWithPrintfStringsMapUsa
40404033

40414034
auto kernelDescriptor = mockKernelImmData->kernelDescriptor;
40424035
kernelDescriptor->kernelAttributes.flags.usesPrintf = true;
4043-
kernelDescriptor->kernelAttributes.flags.hasPrintfCalls = true;
40444036
kernelDescriptor->kernelAttributes.flags.usesStringMapForPrintf = false;
40454037
kernelDescriptor->kernelAttributes.flags.requiresImplicitArgs = false;
40464038
kernelDescriptor->kernelAttributes.binaryFormat = DeviceBinaryFormat::patchtokens;
@@ -4070,7 +4062,6 @@ TEST_F(KernelPatchtokensPrintfStringMapTests, givenKernelWithPrintfStringsMapUsa
40704062

40714063
auto kernelDescriptor = mockKernelImmData->kernelDescriptor;
40724064
kernelDescriptor->kernelAttributes.flags.usesPrintf = true;
4073-
kernelDescriptor->kernelAttributes.flags.hasPrintfCalls = true;
40744065
kernelDescriptor->kernelAttributes.flags.usesStringMapForPrintf = false;
40754066
kernelDescriptor->kernelAttributes.flags.requiresImplicitArgs = true;
40764067
kernelDescriptor->kernelAttributes.binaryFormat = DeviceBinaryFormat::patchtokens;
@@ -4101,7 +4092,6 @@ TEST_F(KernelImplicitArgTests, givenKernelWithoutPrintfCallsWithImplicitArgsWhen
41014092
std::unique_ptr<MockImmutableData> mockKernelImmData = std::make_unique<MockImmutableData>(0u);
41024093
mockKernelImmData->kernelDescriptor->kernelAttributes.flags.requiresImplicitArgs = true;
41034094
mockKernelImmData->kernelDescriptor->kernelAttributes.flags.usesPrintf = false;
4104-
mockKernelImmData->kernelDescriptor->kernelAttributes.flags.hasPrintfCalls = false;
41054095

41064096
createModuleFromMockBinary(0u, false, mockKernelImmData.get());
41074097

@@ -4123,8 +4113,7 @@ TEST_F(KernelImplicitArgTests, givenKernelWithoutPrintfCallsWithImplicitArgsWhen
41234113
TEST_F(KernelImplicitArgTests, givenKernelWithPrintfCallsWithImplicitArgsWhenInitializeThenPrintfSurfaceIsCreatedAndProperlyPatchedInImplicitArgs) {
41244114
std::unique_ptr<MockImmutableData> mockKernelImmData = std::make_unique<MockImmutableData>(0u);
41254115
mockKernelImmData->kernelDescriptor->kernelAttributes.flags.requiresImplicitArgs = true;
4126-
mockKernelImmData->kernelDescriptor->kernelAttributes.flags.usesPrintf = false;
4127-
mockKernelImmData->kernelDescriptor->kernelAttributes.flags.hasPrintfCalls = true;
4116+
mockKernelImmData->kernelDescriptor->kernelAttributes.flags.usesPrintf = true;
41284117

41294118
createModuleFromMockBinary(0u, false, mockKernelImmData.get());
41304119

‎opencl/source/kernel/kernel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ void Kernel::unsetArg(uint32_t argIndex) {
17291729
}
17301730

17311731
bool Kernel::hasPrintfOutput() const {
1732-
return kernelInfo.kernelDescriptor.kernelAttributes.flags.hasPrintfCalls;
1732+
return kernelInfo.kernelDescriptor.kernelAttributes.flags.usesPrintf;
17331733
}
17341734

17351735
void Kernel::resetSharedObjectsPatchAddresses() {

‎shared/source/compiler_interface/external_functions.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ uint32_t resolveKernelDependencies(const ExternalFunctionInfosT &externalFunctio
9191
const auto &externalFunctionInfo = *externalFunctionInfos.at(funcNameToId.at(kernelDep->usedFuncName));
9292
kernelAttributes.barrierCount = std::max(externalFunctionInfo.barrierCount, kernelAttributes.barrierCount);
9393
kernelAttributes.flags.hasRTCalls |= externalFunctionInfo.hasRTCalls;
94-
kernelAttributes.flags.hasPrintfCalls |= externalFunctionInfo.hasPrintfCalls;
94+
kernelAttributes.flags.usesPrintf |= externalFunctionInfo.hasPrintfCalls;
9595
kernelAttributes.flags.hasIndirectCalls |= externalFunctionInfo.hasIndirectCalls;
9696
kernelAttributes.flags.usesAssert |= externalFunctionInfo.requireAssertBuffer;
9797
kernelAttributes.flags.usesSyncBuffer |= externalFunctionInfo.requireSyncBuffer;
@@ -118,4 +118,4 @@ void DependencyResolver::resolveDependency(size_t nodeId, const std::vector<size
118118
}
119119
resolved.push_back(nodeId);
120120
}
121-
} // namespace NEO
121+
} // namespace NEO

‎shared/source/device_binary_format/zebin/zeinfo_decoder.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ void populateKernelExecutionEnvironment(KernelDescriptor &dst, const KernelExecu
737737
dst.kernelAttributes.flags.hasSample = execEnv.hasSample;
738738
dst.kernelAttributes.flags.requiresImplicitArgs = execEnv.requireImplicitArgBuffer;
739739
dst.kernelAttributes.flags.hasIndirectCalls = execEnv.hasIndirectCalls;
740-
dst.kernelAttributes.flags.hasPrintfCalls = execEnv.hasPrintfCalls;
740+
dst.kernelAttributes.flags.usesPrintf = execEnv.hasPrintfCalls;
741741
dst.kernelAttributes.flags.usesAssert = execEnv.requireAssertBuffer;
742742
dst.kernelAttributes.flags.usesSyncBuffer = execEnv.requireSyncBuffer;
743743
dst.kernelAttributes.barrierCount = execEnv.barrierCount;
@@ -1394,7 +1394,6 @@ DecodeError populateKernelPayloadArgument(NEO::KernelDescriptor &dst, const Kern
13941394

13951395
case Types::Kernel::argTypePrintfBuffer:
13961396
dst.kernelAttributes.flags.usesPrintf = true;
1397-
dst.kernelAttributes.flags.hasPrintfCalls = true;
13981397
return populateArgPointerStateless(dst.payloadMappings.implicitArgs.printfSurfaceAddress);
13991398

14001399
case Types::Kernel::argTypeAssertBuffer:

‎shared/source/kernel/kernel_descriptor.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ struct KernelDescriptor : NEO::NonCopyableAndNonMovableClass {
144144
bool usesAssert : 1;
145145
// 3
146146
bool usesRegionGroupBarrier : 1;
147-
bool hasPrintfCalls : 1;
148-
bool reserved : 6;
147+
bool reserved : 7;
149148
};
150149
std::array<bool, 4> packed;
151150
} flags = {};

0 commit comments

Comments
 (0)