Skip to content

[SYCL][UR] Pull in update that changes urDeviceCreateWithNativeHandle. #15023

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
Aug 16, 2024
Merged

[SYCL][UR] Pull in update that changes urDeviceCreateWithNativeHandle. #15023

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
# commit d8f1c98e48e98ea2f6a227af82366734fcde977e
# Merge: 6e8efa3d 9e824480
# commit 0342c95cbe1dae72e874821698b3726dbe3db284
# Merge: d7e0fad5 a4c6e912
# Author: Omar Ahmed <omar.ahmed@codeplay.com>
# Date: Wed Aug 14 11:46:59 2024 +0100
# Merge pull request #1946 from callumfare/callum/update_ur_trace_env_var
# Update expected values of SYCL_UR_TRACE environment variable
set(UNIFIED_RUNTIME_TAG d8f1c98e48e98ea2f6a227af82366734fcde977e)
# Date: Thu Aug 15 17:50:02 2024 +0100
# Merge pull request #1953 from aarongreig/aaron/changeDeviceCreateWithNativeParam
# Change urDeviceCreateWithNativeHandle to take an adapter handle.
set(UNIFIED_RUNTIME_TAG 0342c95cbe1dae72e874821698b3726dbe3db284)

set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
Expand Down
4 changes: 2 additions & 2 deletions sycl/source/backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ __SYCL_EXPORT device make_device(ur_native_handle_t NativeHandle,
const auto &Plugin = getPlugin(Backend);

ur_device_handle_t UrDevice = nullptr;
Plugin->call(urDeviceCreateWithNativeHandle, NativeHandle, nullptr, nullptr,
&UrDevice);
Plugin->call(urDeviceCreateWithNativeHandle, NativeHandle,
Plugin->getUrAdapter(), nullptr, &UrDevice);
// Construct the SYCL device from UR device.
return detail::createSyclObjFromImpl<device>(
std::make_shared<device_impl>(UrDevice, Plugin));
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/backend/level_zero.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ __SYCL_EXPORT device make_device(const platform &Platform,
// Create UR device first.
ur_device_handle_t UrDevice;
Plugin->call(urDeviceCreateWithNativeHandle, NativeHandle,
PlatformImpl->getHandleRef(), nullptr, &UrDevice);
Plugin->getUrAdapter(), nullptr, &UrDevice);

return detail::createSyclObjFromImpl<device>(
PlatformImpl->getOrMakeDeviceImpl(UrDevice, PlatformImpl));
Expand Down
4 changes: 2 additions & 2 deletions sycl/source/detail/device_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ device_impl::device_impl(ur_native_handle_t InteropDeviceHandle,
// Get UR device from the raw device handle.
// NOTE: this is for OpenCL interop only (and should go away).
// With SYCL-2020 BE generalization "make" functions are used instead.
Plugin->call(urDeviceCreateWithNativeHandle, InteropDeviceHandle, nullptr,
nullptr, &MDevice);
Plugin->call(urDeviceCreateWithNativeHandle, InteropDeviceHandle,
Plugin->getUrAdapter(), nullptr, &MDevice);
InteroperabilityConstructor = true;
}

Expand Down
2 changes: 1 addition & 1 deletion sycl/source/device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ device::device(cl_device_id DeviceId) {
ur_device_handle_t Device;
Plugin->call(urDeviceCreateWithNativeHandle,
detail::ur::cast<ur_native_handle_t>(DeviceId),
Plugin->getUrPlatforms()[0], nullptr, &Device);
Plugin->getUrAdapter(), nullptr, &Device);
auto Platform =
detail::platform_impl::getPlatformFromUrDevice(Device, Plugin);
impl = Platform->getOrMakeDeviceImpl(Device, Platform);
Expand Down