Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't program implicit args for builtin kernels 

Related-To: HSD-18023305082

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2022-08-18 16:19:50 +02:00 committed by Compute-Runtime-Automation
parent 18adbed233
commit 7a586111f2
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
level_zero/core/source/module/module_imp.cpp
View File

@ -882,7 +882,12 @@ bool ModuleImp::linkBinary() {
return LinkingStatus::LinkedPartially == linkStatus;
} else if (type != ModuleType::Builtin) {
copyPatchedSegments(isaSegmentsForPatching);
} else {
for (auto &kernelDescriptor : kernelDescriptors) {
kernelDescriptor->kernelAttributes.flags.requiresImplicitArgs = false;
}
}
DBG_LOG(PrintRelocations, NEO::constructRelocationsDebugMessage(this->symbols));
isFullyLinked = true;
for (auto kernelId = 0u; kernelId < kernelImmDatas.size(); kernelId++) {

1
level_zero/core/test/unit_tests/mocks/mock_module.h
View File

@ -28,6 +28,7 @@ struct WhiteBox<::L0::Module> : public ::L0::ModuleImp {
using BaseClass::importedSymbolAllocations;
using BaseClass::isFullyLinked;
using BaseClass::kernelImmDatas;
using BaseClass::maxGroupSize;
using BaseClass::symbols;
using BaseClass::translationUnit;
using BaseClass::type;

40
level_zero/core/test/unit_tests/sources/module/test_module.cpp
View File

@ -2868,6 +2868,46 @@ TEST_F(ModuleTests, givenConstDataStringSectionWhenLinkingModuleThenSegmentIsPat
EXPECT_EQ(static_cast<size_t>(stringsAddr), *reinterpret_cast<size_t *>(patchAddr));
}
TEST_F(ModuleTests, givenImplicitArgsRelocationAndStackCallsWhenLinkingBuiltinModuleThenSegmentIsNotPatchedAndImplicitArgsAreNotRequired) {
auto pModule = std::make_unique<WhiteBox<Module>>(device, nullptr, ModuleType::Builtin);
pModule->maxGroupSize = 32;
char data[64]{};
auto kernelInfo = new KernelInfo();
kernelInfo->heapInfo.KernelHeapSize = 64;
kernelInfo->heapInfo.pKernelHeap = data;
std::unique_ptr<WhiteBox<::L0::KernelImmutableData>> kernelImmData{new WhiteBox<::L0::KernelImmutableData>(this->device)};
kernelImmData->initialize(kernelInfo, device, 0, nullptr, nullptr, true);
kernelImmData->kernelDescriptor->kernelAttributes.flags.useStackCalls = true;
auto isaCpuPtr = reinterpret_cast<char *>(kernelImmData->isaGraphicsAllocation->getUnderlyingBuffer());
pModule->kernelImmDatas.push_back(std::move(kernelImmData));
pModule->translationUnit->programInfo.kernelInfos.push_back(kernelInfo);
auto linkerInput = std::make_unique<::WhiteBox<NEO::LinkerInput>>();
linkerInput->traits.requiresPatchingOfInstructionSegments = true;
linkerInput->textRelocations.push_back({{implicitArgsRelocationSymbolName, 0x8, LinkerInput::RelocationInfo::Type::AddressLow, SegmentType::Instructions}});
pModule->translationUnit->programInfo.linkerInput = std::move(linkerInput);
EXPECT_FALSE(kernelInfo->kernelDescriptor.kernelAttributes.flags.requiresImplicitArgs);
auto status = pModule->linkBinary();
EXPECT_TRUE(status);
EXPECT_FALSE(kernelInfo->kernelDescriptor.kernelAttributes.flags.requiresImplicitArgs);
ze_kernel_handle_t kernelHandle;
ze_kernel_desc_t kernelDesc = {};
kernelDesc.pKernelName = kernelInfo->kernelDescriptor.kernelMetadata.kernelName.c_str();
ze_result_t res = pModule->createKernel(&kernelDesc, &kernelHandle);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
EXPECT_EQ(0u, *reinterpret_cast<uint32_t *>(ptrOffset(isaCpuPtr, 0x8)));
Kernel::fromHandle(kernelHandle)->destroy();
}
TEST_F(ModuleTests, givenImplicitArgsRelocationAndStackCallsWhenLinkingModuleThenSegmentIsPatchedAndImplicitArgsAreRequired) {
auto pModule = std::make_unique<Module>(device, nullptr, ModuleType::User);