Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion unified-runtime/scripts/templates/ldrddi.cpp.mako
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,13 @@ namespace ur_loader
if (platform.initStatus != ${X}_RESULT_SUCCESS)
continue;

auto *${th.make_pfn_name(n, tags, obj)} = platform.dditable.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)};
if (*${th.make_pfn_name(n, tags, obj)} == nullptr)
return ${X}_RESULT_ERROR_UNINITIALIZED;

uint32_t adapter;
ur_adapter_handle_t *adapterHandle = numAdapters < NumEntries ? &${obj['params'][1]['name']}[numAdapters] : nullptr;
platform.dditable.${th.get_table_name(n, tags, obj)}.${th.make_pfn_name(n, tags, obj)}( 1, adapterHandle, &adapter );
${th.make_pfn_name(n, tags, obj)}( 1, adapterHandle, &adapter );

numAdapters += adapter;
}
Expand Down Expand Up @@ -129,6 +133,7 @@ ${tbl['export']['name']}(

if(platform.initStatus != ${X}_RESULT_SUCCESS)
continue;

auto getTable = reinterpret_cast<${tbl['pfn']}>(
ur_loader::LibLoader::getFunctionPtr(platform.handle.get(), "${tbl['export']['name']}"));
if(!getTable)
Expand Down
11 changes: 10 additions & 1 deletion unified-runtime/source/common/linux/ur_lib_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,16 @@ LibLoader::loadAdapterLibrary(const char *name) {
}

void *LibLoader::getFunctionPtr(HMODULE handle, const char *func_name) {
return dlsym(handle, func_name);
// Clear any existing error
dlerror();

void *ptr = dlsym(handle, func_name);
const char *err = dlerror();
if (err) {
UR_LOG(ERR, "dlsym failed to load function '{}': {}", func_name, err);
}

return ptr;
}

} // namespace ur_loader
31 changes: 30 additions & 1 deletion unified-runtime/source/loader/ur_ldrddi.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.