From ac14f9c03cdb81f278fb301b069264ed7e6fcc1e Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Mon, 16 Dec 2024 15:31:47 +0000 Subject: [PATCH 1/3] [UR] Explicitly define which info queries are optional. Mostly this is a UR spec + CTS change, on the adapter side there are a few fixes for queries to make them work as the UR CTS now expects. --- 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 72841724fa01d..d0eff6cbe84f1 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/aarongreig/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 0c84410ab5aa9..6077d5b8f361e 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1 @@ -# commit b7047f6c36ec17b8560c2f1cd9ac9521715a9127 -# Merge: 73e5f3c6ff2d fcddf077c290 -# Author: Martin Grant -# Date: Fri Dec 13 14:20:15 2024 +0000 -# Merge pull request #2454 from Bensuo/l0_cmd-buf_multi-device -# Fix L0 command-buffer consumption of multi-device kernels -set(UNIFIED_RUNTIME_TAG b7047f6c36ec17b8560c2f1cd9ac9521715a9127) +set(UNIFIED_RUNTIME_TAG aaron/optionalInfoQueries) From 7866c2eeda5071971184fdea2450034f12cd27f4 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Tue, 17 Dec 2024 16:11:09 +0000 Subject: [PATCH 2/3] [UR] Bump main tag to 501057c6 --- 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 d0eff6cbe84f1..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/aarongreig/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 6077d5b8f361e..09ad15e60339b 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1 +1,7 @@ -set(UNIFIED_RUNTIME_TAG aaron/optionalInfoQueries) +# commit 501057c67bed70cc3eff09d203dc4b3db18408c2 +# Merge: 39df0317 c0a372bd +# Author: Kenneth Benzie (Benie) +# Date: Tue Dec 17 16:07:54 2024 +0000 +# Merge pull request #1332 from aarongreig/aaron/optionalInfoQueries +# Explicitly define which info queries are optional. +set(UNIFIED_RUNTIME_TAG 501057c67bed70cc3eff09d203dc4b3db18408c2) From 5ba99edaf9be8e9b5456cca76b1813d70ae965ab Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Wed, 18 Dec 2024 09:31:41 +0000 Subject: [PATCH 3/3] [UR] Bump main tag to 607e88d0 --- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 09ad15e60339b..24c163c028b4a 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit 501057c67bed70cc3eff09d203dc4b3db18408c2 -# Merge: 39df0317 c0a372bd +# commit 607e88d09139337e3fe508016c4238f05cb2a8b6 +# Merge: c36a0b62 3ab955f2 # Author: Kenneth Benzie (Benie) -# Date: Tue Dec 17 16:07:54 2024 +0000 -# Merge pull request #1332 from aarongreig/aaron/optionalInfoQueries -# Explicitly define which info queries are optional. -set(UNIFIED_RUNTIME_TAG 501057c67bed70cc3eff09d203dc4b3db18408c2) +# Date: Wed Dec 18 09:30:22 2024 +0000 +# Merge pull request #2376 from aarongreig/aaron/parameterizeAdapterTests +# Enable adapter tests to run on all discovered adapters. +set(UNIFIED_RUNTIME_TAG 607e88d09139337e3fe508016c4238f05cb2a8b6)