From 440548a8f3478f105475af7ad7c4b5fd035e4024 Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Mon, 18 Nov 2024 11:43:58 +0000 Subject: [PATCH 1/2] [UR][CL] Fix typo in CL symbol loading macro for windows. --- 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 9b405334a6816..a77b777321880 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1 @@ -# commit 30391c65d2d2ccc7ee3688a14815804bfb7fdf05 -# Merge: 5e6d79b3 58dabfe8 -# Author: Callum Fare -# Date: Fri Nov 15 15:13:20 2024 +0000 -# Merge pull request #2222 from RossBrunton/ross/cfi -# Enable -flto and -fsanitize=cfi in clang -set(UNIFIED_RUNTIME_TAG 30391c65d2d2ccc7ee3688a14815804bfb7fdf05) +set(UNIFIED_RUNTIME_TAG aaron/fixCoreFuncMacroWindows) From 5fdc75fd2ca4c50e199f592a1fac2b050085c2f2 Mon Sep 17 00:00:00 2001 From: Callum Fare Date: Tue, 19 Nov 2024 14:54:55 +0000 Subject: [PATCH 2/2] Bump UR tag --- 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 a77b777321880..b7c21f96e389d 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1 +1,7 @@ -set(UNIFIED_RUNTIME_TAG aaron/fixCoreFuncMacroWindows) +# commit 1675f053176f0860388aa67fd009750a7e03b2c2 +# Merge: 0ea47d7c 22ca5ee2 +# Author: Callum Fare +# Date: Tue Nov 19 14:41:15 2024 +0000 +# Merge pull request #2337 from aarongreig/aaron/fixCoreFuncMacroWindows +# Fix the CL_CORE_FUNCTION macro on windows. +set(UNIFIED_RUNTIME_TAG 1675f053176f0860388aa67fd009750a7e03b2c2)