intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-29 09:03:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: correct loading L0 loader functions"

Browse Source 
This reverts commit 9c7b3c5e19.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2024-10-17 02:39:48 +02:00
committed by Compute-Runtime-Automation
parent e11ceb4a20
commit f117b5fb68
37 changed files with 84 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
shared/source/os_interface/linux/os_library_linux.cpp
View File

@@ -15,8 +15,8 @@
namespace NEO {
OsLibrary *OsLibrary::load(const OsLibraryCreateProperties &properties) {
auto ptr = new (std::nothrow) Linux::OsLibrary(properties);
OsLibrary *OsLibrary::loadAndCaptureError(const std::string &name, std::string *errorValue) {
auto ptr = new (std::nothrow) Linux::OsLibrary(name, errorValue);
if (ptr == nullptr)
return nullptr;
@@ -33,8 +33,8 @@ const std::string OsLibrary::createFullSystemPath(const std::string &name) {
namespace Linux {
OsLibrary::OsLibrary(const OsLibraryCreateProperties &properties) {
if (properties.libraryName.empty() || properties.performSelfLoad) {
OsLibrary::OsLibrary(const std::string &name, std::string *errorValue) {
if (name.empty()) {
this->handle = SysCalls::dlopen(0, RTLD_LAZY);
} else {
#ifdef SANITIZER_BUILD
@@ -43,11 +43,12 @@ OsLibrary::OsLibrary(const OsLibraryCreateProperties &properties) {
auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND;
/* Background: https://github.com/intel/compute-runtime/issues/122 */
#endif
dlopenFlag = properties.customLoadFlags ? *properties.customLoadFlags : dlopenFlag;
dlopenFlag = OsLibrary::loadFlagsOverwrite ? *OsLibrary::loadFlagsOverwrite : dlopenFlag;
OsLibrary::loadFlagsOverwrite = nullptr;
adjustLibraryFlags(dlopenFlag);
this->handle = SysCalls::dlopen(properties.libraryName.c_str(), dlopenFlag);
if (!this->handle && (properties.errorValue != nullptr)) {
properties.errorValue->assign(dlerror());
this->handle = SysCalls::dlopen(name.c_str(), dlopenFlag);
if (!this->handle && (errorValue != nullptr)) {
errorValue->assign(dlerror());
}
}
}