Skip to content

Commit 3dd6e3f

Browse files
Revert "Enable Symbol Table Generation by Default for L0 modules"
This reverts commit c2e3d24. Signed-off-by: Compute-Runtime-Validation <[email protected]>
1 parent 21c2f06 commit 3dd6e3f

File tree

5 files changed

+0
-65
lines changed

5 files changed

+0
-65
lines changed

level_zero/core/source/module/module_imp.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ NEO::ConstStringRef optLevel = "-ze-opt-level";
4949
NEO::ConstStringRef greaterThan4GbRequired = "-ze-opt-greater-than-4GB-buffer-required";
5050
NEO::ConstStringRef hasBufferOffsetArg = "-ze-intel-has-buffer-offset-arg";
5151
NEO::ConstStringRef debugKernelEnable = "-ze-kernel-debug-enable";
52-
NEO::ConstStringRef enableLibraryCompile = "-library-compilation";
5352
} // namespace BuildOptions
5453

5554
ModuleTranslationUnit::ModuleTranslationUnit(L0::Device *device)
@@ -666,16 +665,12 @@ void ModuleImp::createBuildOptions(const char *pBuildFlags, std::string &apiOpti
666665
moveBuildOption(apiOptions, apiOptions, NEO::CompilerOptions::optLevel, BuildOptions::optLevel);
667666
moveBuildOption(internalBuildOptions, apiOptions, NEO::CompilerOptions::greaterThan4gbBuffersRequired, BuildOptions::greaterThan4GbRequired);
668667
moveBuildOption(internalBuildOptions, apiOptions, NEO::CompilerOptions::allowZebin, NEO::CompilerOptions::allowZebin);
669-
this->libraryExportEnabled = moveBuildOption(apiOptions, apiOptions, BuildOptions::enableLibraryCompile, BuildOptions::enableLibraryCompile);
670668

671669
createBuildExtraOptions(apiOptions, internalBuildOptions);
672670
}
673671
if (NEO::ApiSpecificConfig::getBindlessConfiguration()) {
674672
NEO::CompilerOptions::concatenateAppend(internalBuildOptions, NEO::CompilerOptions::bindlessMode.str());
675673
}
676-
if (!this->libraryExportEnabled && NEO::DebugManager.flags.EnableProgramSymbolTableGeneration.get()) {
677-
NEO::CompilerOptions::concatenateAppend(apiOptions, BuildOptions::enableLibraryCompile.str());
678-
}
679674
}
680675

681676
void ModuleImp::updateBuildLog(NEO::Device *neoDevice) {

level_zero/core/source/module/module_imp.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ extern NEO::ConstStringRef optLevel;
3030
extern NEO::ConstStringRef greaterThan4GbRequired;
3131
extern NEO::ConstStringRef hasBufferOffsetArg;
3232
extern NEO::ConstStringRef debugKernelEnable;
33-
extern NEO::ConstStringRef enableLibraryCompile;
3433
} // namespace BuildOptions
3534

3635
struct ModuleTranslationUnit {
@@ -159,7 +158,6 @@ struct ModuleImp : public Module {
159158
bool debugEnabled = false;
160159
bool isFullyLinked = false;
161160
bool allocatePrivateMemoryPerDispatch = true;
162-
bool libraryExportEnabled = false;
163161
ModuleType type;
164162
NEO::Linker::UnresolvedExternals unresolvedExternalsInfo{};
165163
std::set<NEO::GraphicsAllocation *> importedSymbolAllocations{};

level_zero/core/test/unit_tests/sources/module/test_module.cpp

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,62 +2421,6 @@ TEST(BuildOptions, givenSrcOptLevelWithoutLevelIntegerInSrcNamesWhenMovingBuildO
24212421
EXPECT_FALSE(result);
24222422
}
24232423

2424-
TEST_F(ModuleTest, givenBuildOptionsWhenEnableProgramSymbolTableGenerationIsEnabledThenEnableLibraryCompileIsSet) {
2425-
DebugManagerStateRestore restorer;
2426-
DebugManager.flags.EnableProgramSymbolTableGeneration.set(1);
2427-
auto module = std::make_unique<ModuleImp>(device, nullptr, ModuleType::User);
2428-
ASSERT_NE(nullptr, module);
2429-
2430-
std::string buildOptions;
2431-
std::string internalBuildOptions;
2432-
2433-
module->createBuildOptions("", buildOptions, internalBuildOptions);
2434-
2435-
EXPECT_TRUE(NEO::CompilerOptions::contains(buildOptions, BuildOptions::enableLibraryCompile));
2436-
}
2437-
2438-
TEST_F(ModuleTest, givenBuildOptionsWhenEnableProgramSymbolTableGenerationIsDisabledThenEnableLibraryCompileIsNotSet) {
2439-
DebugManagerStateRestore restorer;
2440-
DebugManager.flags.EnableProgramSymbolTableGeneration.set(0);
2441-
auto module = std::make_unique<ModuleImp>(device, nullptr, ModuleType::User);
2442-
ASSERT_NE(nullptr, module);
2443-
2444-
std::string buildOptions;
2445-
std::string internalBuildOptions;
2446-
2447-
module->createBuildOptions("", buildOptions, internalBuildOptions);
2448-
2449-
EXPECT_FALSE(NEO::CompilerOptions::contains(buildOptions, BuildOptions::enableLibraryCompile));
2450-
}
2451-
2452-
TEST_F(ModuleTest, givenBuildOptionsWithEnableLibraryCompileWhenEnableProgramSymbolTableGenerationIsDisabledThenEnableLibraryCompileIsSet) {
2453-
DebugManagerStateRestore restorer;
2454-
DebugManager.flags.EnableProgramSymbolTableGeneration.set(0);
2455-
auto module = std::make_unique<ModuleImp>(device, nullptr, ModuleType::User);
2456-
ASSERT_NE(nullptr, module);
2457-
2458-
std::string buildOptions;
2459-
std::string internalBuildOptions;
2460-
2461-
module->createBuildOptions(BuildOptions::enableLibraryCompile.str().c_str(), buildOptions, internalBuildOptions);
2462-
2463-
EXPECT_TRUE(NEO::CompilerOptions::contains(buildOptions, BuildOptions::enableLibraryCompile));
2464-
}
2465-
2466-
TEST_F(ModuleTest, givenBuildOptionsWithEnableLibraryCompileWhenEnableProgramSymbolTableGenerationIsEnabledThenEnableLibraryCompileIsSet) {
2467-
DebugManagerStateRestore restorer;
2468-
DebugManager.flags.EnableProgramSymbolTableGeneration.set(1);
2469-
auto module = std::make_unique<ModuleImp>(device, nullptr, ModuleType::User);
2470-
ASSERT_NE(nullptr, module);
2471-
2472-
std::string buildOptions;
2473-
std::string internalBuildOptions;
2474-
2475-
module->createBuildOptions(BuildOptions::enableLibraryCompile.str().c_str(), buildOptions, internalBuildOptions);
2476-
2477-
EXPECT_TRUE(NEO::CompilerOptions::contains(buildOptions, BuildOptions::enableLibraryCompile));
2478-
}
2479-
24802424
TEST_F(ModuleTest, givenInternalOptionsWhenBindlessEnabledThenBindlesOptionsPassed) {
24812425
DebugManagerStateRestore restorer;
24822426
DebugManager.flags.UseBindlessMode.set(1);

shared/source/debug_settings/debug_variables_base.inl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ DECLARE_DEBUG_VARIABLE(bool, ForceSamplerLowFilteringPrecision, false, "Force Lo
334334
DECLARE_DEBUG_VARIABLE(bool, EngineInstancedSubDevices, false, "Create subdevices assigned to specific engine")
335335
DECLARE_DEBUG_VARIABLE(bool, AllowSingleTileEngineInstancedSubDevices, false, "Create subdevices assigned to specific engine on single tile config")
336336
DECLARE_DEBUG_VARIABLE(bool, EnablePrivateBO, false, "Enable PRELIM_I915_GEM_CREATE_EXT_VM_PRIVATE extension creating VM_PRIVATE BOs")
337-
DECLARE_DEBUG_VARIABLE(bool, EnableProgramSymbolTableGeneration, true, "Enforce IGC to always generate the Program Symbol Table for Exported Functions for all Modules used by Level Zero.")
338337
DECLARE_DEBUG_VARIABLE(int32_t, ReturnSubDevicesAsApiDevices, -1, "Expose each subdevice as a separate device during clGetDeviceIDs or zeDeviceGet API call")
339338
DECLARE_DEBUG_VARIABLE(int32_t, ForceRunAloneContext, -1, "Control creation of run-alone HW context, -1:default, 0:disable, 1:enable")
340339
DECLARE_DEBUG_VARIABLE(int32_t, AddClGlSharing, -1, "Add cl-gl extension")

shared/test/common/test_files/igdrcl.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ AllowPatchingVfeStateInCommandLists = 0
349349
PrintMemoryRegionSizes = 0
350350
OverrideDrmRegion = -1
351351
AllowSingleTileEngineInstancedSubDevices = 0
352-
EnableProgramSymbolTableGeneration = 1
353352
BinaryCacheTrace = false
354353
OverrideL1CacheControlInSurfaceState = -1
355354
OverrideL1CacheControlInSurfaceStateForScratchSpace = -1

0 commit comments

Comments
 (0)