Update UR tag

intel · Jan 16, 2025 · dd18cba · dd18cba
1 parent 4cde5d8
commit dd18cba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/buildbot/configure.py b/buildbot/configure.py
@@ -66,8 +66,9 @@ def do_configure(args):
     xpti_enable_werror = "OFF"
     llvm_enable_zstd = "ON"
 
-    if sys.platform != "darwin" and not args.level_zero_v2:
+    if sys.platform != "darwin":
         sycl_enabled_backends.append("level_zero")
+        sycl_enabled_backends.append("level_zero_v2")
 
     # lld is needed on Windows or for the HIP adapter on AMD
     if platform.system() == "Windows" or (args.hip and args.hip_platform == "AMD"):
@@ -96,9 +97,6 @@ def do_configure(args):
         sycl_build_pi_hip_platform = args.hip_platform
         sycl_enabled_backends.append("hip")
 
-    if args.level_zero_v2:
-        sycl_enabled_backends.append("level_zero_v2")
-
     if args.native_cpu:
         if args.native_cpu_libclc_targets:
             libclc_targets_to_build += ";" + args.native_cpu_libclc_targets
@@ -322,12 +320,6 @@ def main():
     parser.add_argument(
         "--native_cpu", action="store_true", help="Enable SYCL Native CPU"
     )
-    parser.add_argument(
-        "--level_zero", action="store_true", help="switch from OpenCL to LEVEL_ZERO"
-    )
-    parser.add_argument(
-        "--level_zero_v2", action="store_true", help="switch from OpenCL to LEVEL_ZERO_V2"
-    )
     parser.add_argument("--hip", action="store_true", help="switch from OpenCL to HIP")
     parser.add_argument(
         "--hip-platform",

diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 # If SYCL_ENABLE_BACKENDS is undefined, we default to enabling OpenCL and Level
 # Zero backends.
 if (NOT DEFINED SYCL_ENABLE_BACKENDS)
-  set(SYCL_ENABLE_BACKENDS "opencl;level_zero")
+  set(SYCL_ENABLE_BACKENDS "opencl;level_zero;level_zero_v2")
 endif()
 
 # Option to enable JIT, this in turn makes kernel fusion and spec constant

diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake
@@ -119,7 +119,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/omarahmed1111/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
@@ -1,7 +1,7 @@
-# commit 9e48f543b8dd39d45563169433bb529583625dfe
-# Merge: 6a3fece6 1a1108b3
-# Author: Martin Grant <martin.morrisongrant@codeplay.com>
-# Date:   Wed Jan 15 14:33:29 2025 +0000
-#     Merge pull request #2540 from martygrant/martin/program-info-unswitch
-#     Move urProgramGetInfo success test from a switch to individual tests.
-set(UNIFIED_RUNTIME_TAG 9e48f543b8dd39d45563169433bb529583625dfe)
+# commit c5bf8fd5c92ab7a24b439cd89cefc9cd425ec787
+# Merge: e6d4355f 778085f7
+# Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
+# Date:   Mon Jan 13 10:41:50 2025 +0000
+#     Merge pull request #2479 from aarongreig/aaron/parameterizeDeviceTests
+#     Parameterize CTS tests across all available adapters and devices.
+set(UNIFIED_RUNTIME_TAG bbf7e01bd74ac51b518fc044d0ca71a920443e5b)