From b22a8474221453d2fe7d90c098a03c6db55adf53 Mon Sep 17 00:00:00 2001 From: Ross Brunton Date: Fri, 29 Mar 2024 13:34:05 +0000 Subject: [PATCH 1/2] [UR][Spec Constants] Improved handling of invalid/unsupported spec. constants Pre-commit MR for https://github.com/oneapi-src/unified-runtime/pull/1469 --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 26 ++++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 64ffe1dee7228..4c03918c03deb 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,14 +116,24 @@ 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") - # commit b79ebe4e98789144bcdf3832088eb6e6b5ae6967 - # Merge: 7b4bc761 fbb6e862 - # Author: Kenneth Benzie (Benie) - # Date: Fri Oct 4 16:39:59 2024 +0100 - # Merge pull request #2018 from wenju-he/L0-bindless-image-device-query - # [L0] Fix device query of bindless image support - set(UNIFIED_RUNTIME_TAG b79ebe4e98789144bcdf3832088eb6e6b5ae6967) + set(UNIFIED_RUNTIME_REPO "https://github.com/RossBrunton/unified-runtime.git") + # commit f5979a687d7b431338d59dec76bc7fdb9102c806 + # Author: Ross Brunton + # Date: Fri Mar 22 17:18:22 2024 +0000 + # [Spec Constants] Improved handling of invalid/unsupported spec. constants + # + # Two main changes to how `Kernel/ProgramSetSpecializationConstants` + # are handled: + # * They may now output either `INVALID_VALUE` or the new + # `INVALID_SPEC_ID` when the provided list is invalid. + # * The OpenCL and level 0 adapters now respond to + # `UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS` with `false` + # rather than erroring out. This fixes some tests that were + # incorrectly not being skipped. + # * `urKernelSetSpecializationConstants` now "implemented" (as a + # function that returns `UNSUPPORTED_FEATURE` for a number of + # adapters. + set(UNIFIED_RUNTIME_TAG f5979a687d7b431338d59dec76bc7fdb9102c806) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need From 72d248dc5efe6c6f4e37192993efaa2a4d93d3d6 Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Mon, 14 Oct 2024 10:06:11 +0100 Subject: [PATCH 2/2] Update UR tag. --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 8469fc560cd11..18eb1b6cc1bcd 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 4814e505335bfb968ea905d76e5b978f6f4d0002 - # Merge: d977bd76 aa53a35d + # commit 22ef899035a85b70b5472416ad6db8021effb5c1 + # Merge: 4814e505 f5979a68 # Author: aarongreig - # Date: Fri Oct 11 16:05:19 2024 +0100 - # Merge pull request #2090 from RossBrunton/ross/harden - # Hardening flags - set(UNIFIED_RUNTIME_TAG 4814e505335bfb968ea905d76e5b978f6f4d0002) + # Date: Mon Oct 14 10:03:13 2024 +0100 + # Merge pull request #1469 from RossBrunton/ross/specconst + # [Spec Constants] Improved handling of invalid spec. constants + set(UNIFIED_RUNTIME_TAG 22ef899035a85b70b5472416ad6db8021effb5c1) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need