From fcf7d02f366f74c3f300e094d15a58ccdd98400e Mon Sep 17 00:00:00 2001 From: Michael Aziz Date: Thu, 28 Sep 2023 13:13:41 -0700 Subject: [PATCH 1/3] [UR][L0] Propagate errors from `USMAllocationMakeResident` This change ensures that USM allocation APIs don't return `UR_RESULT_SUCCESS` when an error occurs within `USMAllocationMakeResident`. Signed-off-by: Michael Aziz --- sycl/plugins/unified_runtime/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index c5bbb404c56f9..3fbc19a8a220e 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -4,8 +4,8 @@ if (NOT DEFINED UNIFIED_RUNTIME_LIBRARY OR NOT DEFINED UNIFIED_RUNTIME_INCLUDE_D include(FetchContent) # The UR tag should be from the 'adapters' branch - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - set(UNIFIED_RUNTIME_TAG c791b8bba63af1c1880ae278e9d6df90021636dd) + set(UNIFIED_RUNTIME_REPO "https://github.com/0x12CC/unified-runtime.git") + set(UNIFIED_RUNTIME_TAG e5d6a91af7849e912d32548ce0a51ee360339410) set(UR_BUILD_ADAPTER_L0 ON) set(UMF_ENABLE_POOL_TRACKING ON) From 95e77c1414a9ce07005663702bdf18a7b3f8b374 Mon Sep 17 00:00:00 2001 From: Michael Aziz Date: Tue, 10 Oct 2023 07:44:25 -0700 Subject: [PATCH 2/3] Update commit tag Signed-off-by: Michael Aziz --- sycl/plugins/unified_runtime/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 3fbc19a8a220e..a0aba0af58fb2 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -4,8 +4,8 @@ if (NOT DEFINED UNIFIED_RUNTIME_LIBRARY OR NOT DEFINED UNIFIED_RUNTIME_INCLUDE_D include(FetchContent) # The UR tag should be from the 'adapters' branch - set(UNIFIED_RUNTIME_REPO "https://github.com/0x12CC/unified-runtime.git") - set(UNIFIED_RUNTIME_TAG e5d6a91af7849e912d32548ce0a51ee360339410) + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + set(UNIFIED_RUNTIME_TAG 4954850f338241d72d506ebcb7162d61afef2924) set(UR_BUILD_ADAPTER_L0 ON) set(UMF_ENABLE_POOL_TRACKING ON) From 27c8d98da556b2a4236698aebf720758e3abb010 Mon Sep 17 00:00:00 2001 From: Michael Aziz Date: Mon, 16 Oct 2023 13:34:44 -0700 Subject: [PATCH 3/3] Update UR version Signed-off-by: Michael Aziz --- 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 e04e77dd6b4bb..f8f430a7cdcff 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -4,13 +4,13 @@ if (NOT DEFINED UNIFIED_RUNTIME_LIBRARY OR NOT DEFINED UNIFIED_RUNTIME_INCLUDE_D include(FetchContent) set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - #commit b38855ed815ffd076bfde5e5e06170ca4f723dc1 - #Merge: e6343f4 6a2c548 - #Author: Piotr Balcer - #Date: Thu Oct 5 12:15:42 2023 +0200 - # Merge pull request #920 from jsji/localcopy - # [UR][L0] Copy prebuilt L0 to avoid leaking shared folder path - set(UNIFIED_RUNTIME_TAG b38855ed815ffd076bfde5e5e06170ca4f723dc1) + # commit 4954850f338241d72d506ebcb7162d61afef2924 + # Merge: 0677296 e5d6a91 + # Author: Kenneth Benzie (Benie) + # Date: Tue Oct 10 11:46:13 2023 +0100 + # Merge pull request #906 from 0x12CC/l0_usm_error_checking + # [UR][L0] Propagate errors from `USMAllocationMakeResident` + set(UNIFIED_RUNTIME_TAG 4954850f338241d72d506ebcb7162d61afef2924) if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS) set(UR_BUILD_ADAPTER_L0 ON)