From b204187322e02c0c1afe0d041bc44efac8791128 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Mon, 2 Dec 2024 16:51:09 -0800 Subject: [PATCH 1/2] [UR] Update UR tag to include the fix to set the execution flag for all kernels --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index e9d52c5b23dac..083ef02704656 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") + set(UNIFIED_RUNTIME_REPO "https://github.com/againull/unified-runtime") 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 bd50587d7a105..c4987c6c104de 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1 @@ -# commit eb076da108a49ef1426f38690547a71905f58015 -# Merge: d8d8ee90 46832dfd -# Author: Callum Fare -# Date: Fri Nov 29 15:54:31 2024 +0000 -# Merge pull request #2396 from kswiecicki/init-results-fix -# [L0] Add nullopt check before init results access -set(UNIFIED_RUNTIME_TAG eb076da108a49ef1426f38690547a71905f58015) +set(UNIFIED_RUNTIME_TAG 4ae20657c66d5ad43153107f16d04ce736434587) From 4c76c239ec53285f464a974984980e47cca42aa8 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Wed, 4 Dec 2024 18:19:23 +0000 Subject: [PATCH 2/2] [UR] Bump tag to 3ad235de --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 083ef02704656..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/againull/unified-runtime") + 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 c4987c6c104de..cb9d624eb2436 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1 +1,7 @@ -set(UNIFIED_RUNTIME_TAG 4ae20657c66d5ad43153107f16d04ce736434587) +# commit 3ad235dee9588152a58980bb73c8827a3d03a9e8 +# Merge: c7cd88de 6390f637 +# Author: Kenneth Benzie (Benie) +# Date: Wed Dec 4 18:17:07 2024 +0000 +# Merge pull request #2389 from againull/indirect_fix +# [L0] Set exec info for all L0 kernels in UR kernel +set(UNIFIED_RUNTIME_TAG 3ad235dee9588152a58980bb73c8827a3d03a9e8)