From 0b3ea0cb93fe33c3a73deef03c2a6bfcc705f3fe Mon Sep 17 00:00:00 2001 From: "Zhao, Maosu" Date: Wed, 4 Dec 2024 01:43:02 -0800 Subject: [PATCH 1/2] [DeviceASAN] Re-use shadow if required size is not larger than last one --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..d6a0251d63c86 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,7 +116,7 @@ if(SYCL_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") + set(UNIFIED_RUNTIME_REPO "https://github.com/zhaomaosu/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 81e0ae3c1fc3a..3c077cb283db7 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Tue Dec 3 12:41:16 2024 +0000 # Merge pull request #2298 from Bensuo/ewan/cuda_update_local_size # Improve CUDA/HIP local argument handling -set(UNIFIED_RUNTIME_TAG 2bea25d7d5404ce82f36caf91c359f65b25187d7) +set(UNIFIED_RUNTIME_TAG reuse-shadow-memory) From 6169cfad5b373a4b0d5e41dc4c25fdbf20448fdc Mon Sep 17 00:00:00 2001 From: Martin Morrison-Grant Date: Fri, 6 Dec 2024 12:07:47 +0000 Subject: [PATCH 2/2] [UR] Update tag to d8fde1b for https://github.com/oneapi-src/unified-runtime/pull/2266. --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index d6a0251d63c86..72841724fa01d 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,7 +116,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/zhaomaosu/unified-runtime.git") + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 3c077cb283db7..4afdc977f2d36 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit 2bea25d7d5404ce82f36caf91c359f65b25187d7 -# Merge: 0b5d8f9e e578228a -# Author: Kenneth Benzie (Benie) -# Date: Tue Dec 3 12:41:16 2024 +0000 -# Merge pull request #2298 from Bensuo/ewan/cuda_update_local_size -# Improve CUDA/HIP local argument handling -set(UNIFIED_RUNTIME_TAG reuse-shadow-memory) +# commit d8fde1bdb3c60af0ee13cc44fab567a508644f77 +# Merge: d88481bf20a0 bc5105f1cf30 +# Author: Martin Grant +# Date: Fri Dec 6 12:05:32 2024 +0000 +# Merge pull request #2266 from zhaomaosu/reuse-shadow-memory +# [DeviceASAN] Re-use shadow if required size is not larger than last one +set(UNIFIED_RUNTIME_TAG d8fde1bdb3c60af0ee13cc44fab567a508644f77)