From 3de24a85ae0bc4057f15ec1d87abf7c6b4fd44a4 Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Mon, 3 Jun 2024 10:07:28 +0100 Subject: [PATCH 1/2] [UR] Pull in change to make urPlatformCreateWithNativeHandle take an adapter. --- sycl/plugins/unified_runtime/CMakeLists.txt | 14 +++++++------- sycl/plugins/unified_runtime/pi2ur.hpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 813cd12a2084a..991ee36ff87d2 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -99,14 +99,14 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 4f105262c30ac231b8db1e250f36e88ef9f0a36d - # Merge: 0f118d75 92fce2ee + set(UNIFIED_RUNTIME_REPO "https://github.com/aarongreig/unified-runtime.git") + # commit 9f783837089c970a22cda08f768aa3dbed38f0d3 + # Merge: c015f892 b9442104 # Author: Kenneth Benzie (Benie) - # Date: Mon Jun 10 13:23:16 2024 +0100 - # Merge pull request #1409 from omarahmed1111/Add-CTS-tests-for-image-format - # [CTS] Add CTS tests for urMemImageCreate entry-point - set(UNIFIED_RUNTIME_TAG 4f105262c30ac231b8db1e250f36e88ef9f0a36d) + # Date: Fri May 31 10:20:23 2024 +0100 + # Merge pull request #1533 from AllanZyne/sanitizer-buffer + # [DeviceSanitizer] Support detecting out-of-bounds errors on sycl::buffer + set(UNIFIED_RUNTIME_TAG aaron/platformCreateWithNativeAdapter) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} diff --git a/sycl/plugins/unified_runtime/pi2ur.hpp b/sycl/plugins/unified_runtime/pi2ur.hpp index e049e1c2862b8..ab696d7cc3b8e 100644 --- a/sycl/plugins/unified_runtime/pi2ur.hpp +++ b/sycl/plugins/unified_runtime/pi2ur.hpp @@ -860,13 +860,13 @@ piextPlatformCreateWithNativeHandle(pi_native_handle NativeHandle, if (auto res = PiGetAdapter(adapter); res != PI_SUCCESS) { return res; } - (void)adapter; ur_platform_handle_t UrPlatform{}; ur_native_handle_t UrNativeHandle = reinterpret_cast(NativeHandle); ur_platform_native_properties_t UrProperties{}; - urPlatformCreateWithNativeHandle(UrNativeHandle, &UrProperties, &UrPlatform); + urPlatformCreateWithNativeHandle(UrNativeHandle, adapter, &UrProperties, + &UrPlatform); *Platform = reinterpret_cast(UrPlatform); From c38d838b14218e25768e78e3b9b912d4b373c6ee Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Fri, 14 Jun 2024 16:46:25 +0100 Subject: [PATCH 2/2] [UR] Bump main tag to a53f89db --- sycl/plugins/unified_runtime/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 991ee36ff87d2..3fb5906aaf67d 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -99,14 +99,14 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/aarongreig/unified-runtime.git") - # commit 9f783837089c970a22cda08f768aa3dbed38f0d3 - # Merge: c015f892 b9442104 + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + # commit a53f89db295510b8f5b558052c217dd8eb316f27 + # Merge: 6d053bc7 fcecc002 # Author: Kenneth Benzie (Benie) - # Date: Fri May 31 10:20:23 2024 +0100 - # Merge pull request #1533 from AllanZyne/sanitizer-buffer - # [DeviceSanitizer] Support detecting out-of-bounds errors on sycl::buffer - set(UNIFIED_RUNTIME_TAG aaron/platformCreateWithNativeAdapter) + # Date: Fri Jun 14 16:44:07 2024 +0100 + # Merge pull request #1692 from aarongreig/aaron/platformCreateWithNativeAdapter + # Add hAdapter parameter to urPlatformCreateWithNativeHandle + set(UNIFIED_RUNTIME_TAG a53f89db295510b8f5b558052c217dd8eb316f27) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO}