Skip to content

[UR] call urGetAdapter before creating a platform from native handle #12432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 18, 2024
Merged

[UR] call urGetAdapter before creating a platform from native handle #12432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 22 additions & 6 deletions sycl/plugins/unified_runtime/pi2ur.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,11 +794,7 @@ inline pi_result piTearDown(void *PluginParameter) {
return PI_SUCCESS;
}

///////////////////////////////////////////////////////////////////////////////
// Platform
inline pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
pi_uint32 *NumPlatforms) {

inline pi_result PiGetAdapter(ur_adapter_handle_t &adapter) {
// We're not going through the UR loader so we're guaranteed to have exactly
// one adapter (whichever is statically linked). The PI plugin for UR has its
// own implementation of piPlatformsGet.
Expand All @@ -809,9 +805,23 @@ inline pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
[&Ret]() { Ret = urAdapterGet(1, &Adapter, nullptr); });
HANDLE_ERRORS(Ret);

adapter = Adapter;

return PI_SUCCESS;
}

///////////////////////////////////////////////////////////////////////////////
// Platform
inline pi_result piPlatformsGet(pi_uint32 NumEntries, pi_platform *Platforms,
pi_uint32 *NumPlatforms) {
ur_adapter_handle_t adapter = nullptr;
if (auto res = PiGetAdapter(adapter); res != PI_SUCCESS) {
return res;
}

auto phPlatforms = reinterpret_cast<ur_platform_handle_t *>(Platforms);
HANDLE_ERRORS(
urPlatformGet(&Adapter, 1, NumEntries, phPlatforms, NumPlatforms));
urPlatformGet(&adapter, 1, NumEntries, phPlatforms, NumPlatforms));
return PI_SUCCESS;
}

Expand All @@ -838,6 +848,12 @@ piextPlatformCreateWithNativeHandle(pi_native_handle NativeHandle,
PI_ASSERT(Platform, PI_ERROR_INVALID_PLATFORM);
PI_ASSERT(NativeHandle, PI_ERROR_INVALID_VALUE);

ur_adapter_handle_t adapter = nullptr;
if (auto res = PiGetAdapter(adapter); res != PI_SUCCESS) {
return res;
}
(void)adapter;

ur_platform_handle_t UrPlatform{};
ur_native_handle_t UrNativeHandle =
reinterpret_cast<ur_native_handle_t>(NativeHandle);
Expand Down