Skip to content

Commit 5713046

Browse files
committed
[L0] Load SysMan Symbols from the current processHandle
Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
1 parent c6ce113 commit 5713046

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

source/adapters/level_zero/adapter.cpp

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -219,25 +219,19 @@ ur_adapter_handle_t_::ur_adapter_handle_t_()
219219
// separately. This must be done to avoid attempting to use symbols that do
220220
// not exist in older loader runtimes.
221221
#ifdef _WIN32
222-
std::string l0LoaderName = "ze_loader.dll";
222+
HMODULE processHandle = GetModuleHandle(NULL);
223223
#else
224-
std::string l0LoaderName = "libze_loader.so.1";
224+
HMODULE processHandle = nullptr;
225225
#endif
226-
GlobalAdapter->loaderHandle =
227-
ur_loader::LibLoader::loadAdapterLibrary(l0LoaderName.c_str());
228-
if (GlobalAdapter->loaderHandle.get() != nullptr) {
229-
GlobalAdapter->getDeviceByUUIdFunctionPtr =
230-
(zes_pfnDriverGetDeviceByUuidExp_t)
231-
ur_loader::LibLoader::getFunctionPtr(
232-
GlobalAdapter->loaderHandle.get(),
233-
"zesDriverGetDeviceByUuidExp");
234-
GlobalAdapter->getSysManDriversFunctionPtr =
235-
(zes_pfnDriverGet_t)ur_loader::LibLoader::getFunctionPtr(
236-
GlobalAdapter->loaderHandle.get(), "zesDriverGet");
237-
GlobalAdapter->sysManInitFunctionPtr =
238-
(zes_pfnInit_t)ur_loader::LibLoader::getFunctionPtr(
239-
GlobalAdapter->loaderHandle.get(), "zesInit");
240-
}
226+
GlobalAdapter->getDeviceByUUIdFunctionPtr =
227+
(zes_pfnDriverGetDeviceByUuidExp_t)ur_loader::LibLoader::getFunctionPtr(
228+
processHandle, "zesDriverGetDeviceByUuidExp");
229+
GlobalAdapter->getSysManDriversFunctionPtr =
230+
(zes_pfnDriverGet_t)ur_loader::LibLoader::getFunctionPtr(
231+
processHandle, "zesDriverGet");
232+
GlobalAdapter->sysManInitFunctionPtr =
233+
(zes_pfnInit_t)ur_loader::LibLoader::getFunctionPtr(processHandle,
234+
"zesInit");
241235
if (GlobalAdapter->getDeviceByUUIdFunctionPtr &&
242236
GlobalAdapter->getSysManDriversFunctionPtr &&
243237
GlobalAdapter->sysManInitFunctionPtr) {

source/adapters/level_zero/adapter.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ struct ur_adapter_handle_t_ {
3131
zes_pfnDriverGetDeviceByUuidExp_t getDeviceByUUIdFunctionPtr = nullptr;
3232
zes_pfnDriverGet_t getSysManDriversFunctionPtr = nullptr;
3333
zes_pfnInit_t sysManInitFunctionPtr = nullptr;
34-
std::unique_ptr<HMODULE, ur_loader::LibLoader::lib_dtor> loaderHandle;
3534

3635
std::optional<ze_result_t> ZeResult;
3736
std::optional<ze_result_t> ZesResult;

0 commit comments

Comments
 (0)