git.iko.soy/typeable/nixpkgs
on master help sign in
rocm-runtime: make ROCR_EXT_DIR handling more local
commit6d00504061923e666218335de0b0a9440aa6a03b authorDaniël de Kok <me@danieldk.eu> dateSat 18 Jul 2020, 07:55 (6 years ago) parent5ecf942
1 file changed+19−20
pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff+19−20
pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff+19−20
@@ -1,24 +1,23 @@
1−diff --git a/src/core/util/lnx/os_linux.cpp b/src/core/util/lnx/os_linux.cpp
2−index fdbe19a..42d4ef8 100644
3−--- a/src/core/util/lnx/os_linux.cpp
4−+++ b/src/core/util/lnx/os_linux.cpp
5−@@ -161,8 +161,17 @@ static_assert(sizeof(Mutex) == sizeof(pthread_mutex_t*), "OS abstraction size mi
6− static_assert(sizeof(Thread) == sizeof(os_thread*), "OS abstraction size mismatch");
1+diff --git a/src/core/runtime/runtime.cpp b/src/core/runtime/runtime.cpp
2+index dd6a15c..fb6de49 100644
3+--- a/src/core/runtime/runtime.cpp
4++++ b/src/core/runtime/runtime.cpp
5+@@ -1358,7 +1358,17 @@ void Runtime::LoadExtensions() {
6+ core::HsaApiTable::HSA_EXT_FINALIZER_API_TABLE_ID);
77
8− LibHandle LoadLib(std::string filename) {
9−- void* ret = dlopen(filename.c_str(), RTLD_LAZY);
10−- if (ret == nullptr) debug_print("LoadLib(%s) failed: %s\n", filename.c_str(), dlerror());
11−+ std::string extDirFilename = GetEnvVar("ROCR_EXT_DIR") + "/" + filename;
12−+ void* ret = dlopen(extDirFilename.c_str(), RTLD_LAZY);
13−+
14−+ // Attempt to load from the directory hardcoded by rocrExtDir.
15−+ if (ret == nullptr) {
16−+ std::string runpathFilename = std::string("@rocrExtDir@") + "/" + filename;
17−+ ret = dlopen(runpathFilename.c_str(), RTLD_LAZY);
18−+
19−+ if (ret == nullptr) debug_print("LoadLib(%s) failed: %s\n", filename.c_str(), dlerror());
8+ // Update Hsa Api Table with handle of Image extension Apis
9+- extensions_.LoadImage(kImageLib[os_index(os::current_os)]);
10++ //
11++ // Use ROCR_EXT_DIR when it is non-empty. Otherwise, try to load the
12++ // library from the OpenGL driver path.
13++ std::string extDirVar = os::GetEnvVar("ROCR_EXT_DIR");
14++ if (!extDirVar.empty()) {
15++ extensions_.LoadImage(extDirVar + "/" + kImageLib[os_index(os::current_os)]);
16++ } else {
17++ std::string globalDriverDir("@rocrExtDir@");
18++ extensions_.LoadImage(globalDriverDir + "/" + kImageLib[os_index(os::current_os)]);
2019+ }
2120+
22− return *(LibHandle*)&ret;
21+ hsa_api_table_.LinkExts(&extensions_.image_api,
22+ core::HsaApiTable::HSA_EXT_IMAGE_API_TABLE_ID);
2323 }
24−