Allow undefined symbols in symbol table for OCL

Related-To: NEO-5081
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

level_zero/core/source/module/module_imp.cpp

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

shared/source/compiler_interface/linker.cpp

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

shared/source/compiler_interface/linker.h

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

shared/source/program/program_info.h

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

shared/source/program/program_info_from_patchtokens.cpp

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

shared/test/unit_test/compiler_interface/linker_tests.cpp

@@ -189,28 +189,14 @@ TEST(LinkerInputTests, givenFunctionsSymbolTableThenProperlyDecodesExportedFunct
     EXPECT_EQ(3, linkerInput.getExportedFunctionsSegmentId());
 }
 
-TEST(LinkerInputTests, givenFunctionsSymbolTableThenUndefIsNotAllowed) {
+TEST(LinkerInputTests, givenFunctionsSymbolTableThenUndefIsAllowed) {
     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;
 
-    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);
     EXPECT_TRUE(decodeResult);
     EXPECT_TRUE(linkerInput.isValid());