[test] Update to v1.25.2 L0

Signed-off-by: Neil R. Spruit <[email protected]>

Author: nrspruit

devops/dependencies.json

@@ -19,9 +19,9 @@
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "level_zero": {
-      "github_tag": "v1.24.3",
-      "version": "v1.24.3",
-      "url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.24.3",
+      "github_tag": "v1.25.2",
+      "version": "v1.25.2",
+      "url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.25.2",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "tbb": {

sycl/test-e2e/Adapters/level_zero/interop-image.cpp

@@ -1,6 +1,6 @@
 // REQUIRES: target-spir, level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
 // RUN: %{build} %level_zero_options -o %t.out
-// RUN: %{run} %t.out
+// RUN: env ZE_ENABLE_LOADER_DEBUG_TRACE=1 env ZE_DEBUG=1 %{run} %t.out
 
 // spir-v gen for legacy images at O0 not working
 // UNSUPPORTED: O0

sycl/test-e2e/Adapters/level_zero/interop.cpp

@@ -1,6 +1,6 @@
 // REQUIRES: level_zero, level_zero_dev_kit
 // RUN: %{build} %level_zero_options -o %t.out
-// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out
+// RUN: env ZE_ENABLE_LOADER_DEBUG_TRACE=1 env ZE_DEBUG=1 env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out
 // UNSUPPORTED: ze_debug
 
 // Test for Level Zero interop API

unified-runtime/cmake/FetchLevelZero.cmake

@@ -13,7 +13,7 @@ find_package(PkgConfig QUIET)
 # so try using that to find the install and if it's not available
 # just try to search for the path.
 if(PkgConfig_FOUND)
-  pkg_check_modules(level-zero level-zero>=1.25.0)
+  pkg_check_modules(level-zero level-zero>=1.25.2)
   if(level-zero_FOUND)
     set(LEVEL_ZERO_INCLUDE_DIR "${level-zero_INCLUDEDIR}/level_zero")
     set(LEVEL_ZERO_LIBRARY_SRC "${level-zero_LIBDIR}")
@@ -50,7 +50,7 @@ if(NOT LEVEL_ZERO_LIB_NAME AND NOT LEVEL_ZERO_LIBRARY)
   set(UR_LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
   # Remember to update the pkg_check_modules minimum version above when updating the
   # clone tag
-  set(UR_LEVEL_ZERO_LOADER_TAG v1.25.0)
+  set(UR_LEVEL_ZERO_LOADER_TAG v1.25.2)
 
   # Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
   set(CMAKE_INCLUDE_CURRENT_DIR OFF)

unified-runtime/source/adapters/level_zero/platform.cpp

@@ -526,15 +526,14 @@ ur_result_t ur_platform_handle_t_::initialize() {
   ZeMemGetPitchFor2dImageExt.Supported =
       ZeMemGetPitchFor2dImageExt.zeMemGetPitchFor2dImage != nullptr;
 
-  ZE_CALL_NOCHECK(zeDriverGetExtensionFunctionAddress,
-                  (ZeDriver, "zeCommandListAppendLaunchKernelWithArguments",
-                   reinterpret_cast<void **>(
-                       &ZeCommandListAppendLaunchKernelWithArgumentsExt
-                            .zeCommandListAppendLaunchKernelWithArguments)));
-
-  ZeCommandListAppendLaunchKernelWithArgumentsExt.Supported =
-      ZeCommandListAppendLaunchKernelWithArgumentsExt
-          .zeCommandListAppendLaunchKernelWithArguments != nullptr;
+  if (zeCommandListAppendLaunchKernelWithArguments && this->isDriverVersionNewerOrSimilar(1, 14, 35917)) {
+    ZeCommandListAppendLaunchKernelWithArgumentsExt
+        .zeCommandListAppendLaunchKernelWithArgumentsFunctionPtr =
+        zeCommandListAppendLaunchKernelWithArguments;
+    ZeCommandListAppendLaunchKernelWithArgumentsExt.Supported = true;
+  } else {
+    ZeCommandListAppendLaunchKernelWithArgumentsExt.Supported = false;
+  }
 
   // Check if the driver supports zeCommandListAppendLaunchKernelWithArguments()
   // with cooperative mode (version >= 1.6.35005)

unified-runtime/source/adapters/level_zero/platform.hpp

@@ -166,9 +166,9 @@ struct ur_platform_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter>,
   struct ZeCommandListAppendLaunchKernelWithArgumentsExtension {
     bool Supported = false;
     bool DriverSupportsCooperativeKernelLaunchWithArgs = false;
-    ze_result_t (*zeCommandListAppendLaunchKernelWithArguments)(
+    ze_result_t (*zeCommandListAppendLaunchKernelWithArgumentsFunctionPtr)(
         ze_command_list_handle_t, ze_kernel_handle_t, const ze_group_count_t,
-        const ze_group_size_t, void **, void *, ze_event_handle_t, uint32_t,
+        const ze_group_size_t, void **, const void *, ze_event_handle_t, uint32_t,
         ze_event_handle_t *);
   } ZeCommandListAppendLaunchKernelWithArgumentsExt;
 };

unified-runtime/source/adapters/level_zero/v2/command_list_manager.cpp

@@ -178,7 +178,7 @@ ur_result_t ur_command_list_manager::appendKernelLaunchLocked(
     ze_group_size_t groupSize = {WG[0], WG[1], WG[2]};
     ZE2UR_CALL(hContext->getPlatform()
                    ->ZeCommandListAppendLaunchKernelWithArgumentsExt
-                   .zeCommandListAppendLaunchKernelWithArguments,
+                   .zeCommandListAppendLaunchKernelWithArgumentsFunctionPtr,
                (getZeCommandList(), hZeKernel, zeThreadGroupDimensions,
                 groupSize, hKernel->kernelArgs.data(), pNext, zeSignalEvent,
                 waitListView.num, waitListView.handles));