From c5b477ccdcf3c54122aac9a9242822dec6700468 Mon Sep 17 00:00:00 2001 From: "Neil R. Spruit" Date: Thu, 23 Jan 2025 16:06:13 -0800 Subject: [PATCH 1/2] [UR][L0]: fix missing destroy of event given enqueue wait out event -pre-commit PR for https://github.com/oneapi-src/unified-runtime/pull/2612 Signed-off-by: Neil R. Spruit --- 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..1483823428d9c 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/nrspruit/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 85ea961d9468e..0ad0a5cc51b94 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Tue Jan 28 11:02:44 2025 +0000 # Merge pull request #2624 from RossBrunton/ross/msanfix # Assert that Device is valid for memory poisoning -set(UNIFIED_RUNTIME_TAG 78e1b33271d28d26845a4bfae7ae3b72c14e0e63) +set(UNIFIED_RUNTIME_TAG 21bf4befe863a3fe6a86c2bf43bb1c81cff2de9d) From 4f3edc98691cc092bd785148dc3cf906e0822651 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Mon, 3 Feb 2025 10:14:11 +0000 Subject: [PATCH 2/2] [UR] Bump main tag to b487b627 --- 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 1483823428d9c..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/nrspruit/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 0ad0a5cc51b94..3ca97044a6d6e 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit 78e1b33271d28d26845a4bfae7ae3b72c14e0e63 -# Merge: 902bb2e2 94b32ac2 -# Author: Ross Brunton -# Date: Tue Jan 28 11:02:44 2025 +0000 -# Merge pull request #2624 from RossBrunton/ross/msanfix -# Assert that Device is valid for memory poisoning -set(UNIFIED_RUNTIME_TAG 21bf4befe863a3fe6a86c2bf43bb1c81cff2de9d) +# commit b487b62738b24de5fbb664231b9a4934181d785e +# Merge: af4f3310 21bf4bef +# Author: Kenneth Benzie (Benie) +# Date: Mon Feb 3 10:09:15 2025 +0000 +# Merge pull request #2612 from nrspruit/destroy_wait_always +# [L0]: fix missing destroy of event given enqueue wait out event +set(UNIFIED_RUNTIME_TAG b487b62738b24de5fbb664231b9a4934181d785e)