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

Allow undefined symbols in symbol table for OCL 

Related-To: NEO-5081
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2022-03-08 16:21:40 +00:00 committed by Compute-Runtime-Automation
parent 038d1d54fa
commit 3e8a6680e2
6 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,6 @@ bool ModuleTranslationUnit::processUnpackedBinary() {
NEO::DecodeError decodeError; NEO::DecodeError decodeError;
NEO::DeviceBinaryFormat singleDeviceBinaryFormat; NEO::DeviceBinaryFormat singleDeviceBinaryFormat;
programInfo.levelZeroDynamicLinkProgram = true;
std::tie(decodeError, singleDeviceBinaryFormat) = NEO::decodeSingleDeviceBinary(programInfo, binary, decodeErrors, decodeWarnings); std::tie(decodeError, singleDeviceBinaryFormat) = NEO::decodeSingleDeviceBinary(programInfo, binary, decodeErrors, decodeWarnings);
if (decodeWarnings.empty() == false) { if (decodeWarnings.empty() == false) {
PRINT_DEBUG_STRING(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr, "%s\n", decodeWarnings.c_str()); PRINT_DEBUG_STRING(NEO::DebugManager.flags.PrintDebugMessages.get(), stderr, "%s\n", decodeWarnings.c_str());
@ -320,7 +319,6 @@ bool ModuleTranslationUnit::processUnpackedBinary() {
id++; id++;
} }
programInfo.prepareLinkerInputStorage(); programInfo.prepareLinkerInputStorage();
programInfo.linkerInput->undefinedSymbolsAllowed = programInfo.levelZeroDynamicLinkProgram;
programInfo.linkerInput->decodeElfSymbolTableAndRelocations(programInfo.decodedElf, nameToKernelId); programInfo.linkerInput->decodeElfSymbolTableAndRelocations(programInfo.decodedElf, nameToKernelId);
} }

9
shared/source/compiler_interface/linker.cpp
View File

@ -82,14 +82,8 @@ bool LinkerInput::decodeExportedFunctionsSymbolTable(const void *data, uint32_t
this->valid = false; this->valid = false;
return false; return false;
case vISA::S_UNDEF: case vISA::S_UNDEF:
if (this->undefinedSymbolsAllowed) {
symbols.erase(symbolEntryIt->s_name); symbols.erase(symbolEntryIt->s_name);
break; break;
} else {
DEBUG_BREAK_IF(true);
this->valid = false;
return false;
}
case vISA::S_GLOBAL_VAR: case vISA::S_GLOBAL_VAR:
symbolInfo.segment = SegmentType::GlobalVariables; symbolInfo.segment = SegmentType::GlobalVariables;
traits.exportsGlobalVariables = true; traits.exportsGlobalVariables = true;
@ -195,8 +189,7 @@ void LinkerInput::decodeElfSymbolTableAndRelocations(Elf::Elf<Elf::EI_CLASS_64>
switch (type) { switch (type) {
default: default:
this->valid &= this->undefinedSymbolsAllowed; DEBUG_BREAK_IF(type != Elf::SYMBOL_TABLE_TYPE::STT_NOTYPE);
DEBUG_BREAK_IF(false == this->undefinedSymbolsAllowed);
continue; continue;
case Elf::SYMBOL_TABLE_TYPE::STT_OBJECT: case Elf::SYMBOL_TABLE_TYPE::STT_OBJECT:
symbolInfo.segment = symbolSegment; symbolInfo.segment = symbolSegment;

2
shared/source/compiler_interface/linker.h
View File

@ -147,8 +147,6 @@ struct LinkerInput {
return valid; return valid;
} }
bool undefinedSymbolsAllowed = false;
const std::vector<ExternalFunctionUsageKernel> &getKernelDependencies() const { const std::vector<ExternalFunctionUsageKernel> &getKernelDependencies() const {
return kernelDependencies; return kernelDependencies;
} }

1
shared/source/program/program_info.h
View File

@ -47,7 +47,6 @@ struct ProgramInfo {
std::vector<KernelInfo *> kernelInfos; std::vector<KernelInfo *> kernelInfos;
Elf::Elf<Elf::EI_CLASS_64> decodedElf; Elf::Elf<Elf::EI_CLASS_64> decodedElf;
uint32_t grfSize = 32U; uint32_t grfSize = 32U;
bool levelZeroDynamicLinkProgram = false;
}; };
size_t getMaxInlineSlmNeeded(const ProgramInfo &programInfo); size_t getMaxInlineSlmNeeded(const ProgramInfo &programInfo);

1
shared/source/program/program_info_from_patchtokens.cpp
View File

@ -35,7 +35,6 @@ void populateSingleKernelInfo(ProgramInfo &dst, const PatchTokenBinary::ProgramF
if (decodedKernel.tokens.programSymbolTable) { if (decodedKernel.tokens.programSymbolTable) {
dst.prepareLinkerInputStorage(); dst.prepareLinkerInputStorage();
dst.linkerInput->undefinedSymbolsAllowed = dst.levelZeroDynamicLinkProgram;
dst.linkerInput->decodeExportedFunctionsSymbolTable(decodedKernel.tokens.programSymbolTable + 1, decodedKernel.tokens.programSymbolTable->NumEntries, kernelNum); dst.linkerInput->decodeExportedFunctionsSymbolTable(decodedKernel.tokens.programSymbolTable + 1, decodedKernel.tokens.programSymbolTable->NumEntries, kernelNum);
} }

16
shared/test/unit_test/compiler_interface/linker_tests.cpp
View File

@ -189,7 +189,7 @@ TEST(LinkerInputTests, givenFunctionsSymbolTableThenProperlyDecodesExportedFunct
EXPECT_EQ(3, linkerInput.getExportedFunctionsSegmentId()); EXPECT_EQ(3, linkerInput.getExportedFunctionsSegmentId());
} }
TEST(LinkerInputTests, givenFunctionsSymbolTableThenUndefIsNotAllowed) { TEST(LinkerInputTests, givenFunctionsSymbolTableThenUndefIsAllowed) {
NEO::LinkerInput linkerInput; NEO::LinkerInput linkerInput;
vISA::GenSymEntry entry = {}; vISA::GenSymEntry entry = {};
entry.s_name[0] = 'A'; entry.s_name[0] = 'A';
@ -197,20 +197,6 @@ TEST(LinkerInputTests, givenFunctionsSymbolTableThenUndefIsNotAllowed) {
entry.s_size = 16; entry.s_size = 16;
entry.s_type = vISA::GenSymType::S_UNDEF; entry.s_type = vISA::GenSymType::S_UNDEF;
auto decodeResult = linkerInput.decodeExportedFunctionsSymbolTable(&entry, 1, 3);
EXPECT_FALSE(decodeResult);
EXPECT_FALSE(linkerInput.isValid());
}
TEST(LinkerInputTests, givenFunctionsSymbolTableWithAllowUndefinedSymbolsThenUndefIsAllowed) {
NEO::LinkerInput linkerInput;
vISA::GenSymEntry entry = {};
entry.s_name[0] = 'A';
entry.s_offset = 8;
entry.s_size = 16;
entry.s_type = vISA::GenSymType::S_UNDEF;
linkerInput.undefinedSymbolsAllowed = true;
auto decodeResult = linkerInput.decodeExportedFunctionsSymbolTable(&entry, 1, 3); auto decodeResult = linkerInput.decodeExportedFunctionsSymbolTable(&entry, 1, 3);
EXPECT_TRUE(decodeResult); EXPECT_TRUE(decodeResult);
EXPECT_TRUE(linkerInput.isValid()); EXPECT_TRUE(linkerInput.isValid());