Skip to content

Commit e777ffb

Browse files
committed
[UR][CI] Update to v1.25.2 L0 with fixed L0 api symbols
- Due to symbol conflicts in the L0 gpu driver, zeCommandListAppendLaunchKernelWithArguments can only be used from the spec definition and the driver exp cannot be used as of the update to v1.14 supported symbols. Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
1 parent 066e266 commit e777ffb

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

devops/dependencies.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
2020
},
2121
"level_zero": {
22-
"github_tag": "v1.24.3",
23-
"version": "v1.24.3",
24-
"url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.24.3",
22+
"github_tag": "v1.25.2",
23+
"version": "v1.25.2",
24+
"url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.25.2",
2525
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
2626
},
2727
"tbb": {

unified-runtime/cmake/FetchLevelZero.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ find_package(PkgConfig QUIET)
1313
# so try using that to find the install and if it's not available
1414
# just try to search for the path.
1515
if(PkgConfig_FOUND)
16-
pkg_check_modules(level-zero level-zero>=1.25.0)
16+
pkg_check_modules(level-zero level-zero>=1.25.2)
1717
if(level-zero_FOUND)
1818
set(LEVEL_ZERO_INCLUDE_DIR "${level-zero_INCLUDEDIR}/level_zero")
1919
set(LEVEL_ZERO_LIBRARY_SRC "${level-zero_LIBDIR}")
@@ -50,7 +50,7 @@ if(NOT LEVEL_ZERO_LIB_NAME AND NOT LEVEL_ZERO_LIBRARY)
5050
set(UR_LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
5151
# Remember to update the pkg_check_modules minimum version above when updating the
5252
# clone tag
53-
set(UR_LEVEL_ZERO_LOADER_TAG v1.25.0)
53+
set(UR_LEVEL_ZERO_LOADER_TAG v1.25.2)
5454

5555
# Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
5656
set(CMAKE_INCLUDE_CURRENT_DIR OFF)

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -526,15 +526,14 @@ ur_result_t ur_platform_handle_t_::initialize() {
526526
ZeMemGetPitchFor2dImageExt.Supported =
527527
ZeMemGetPitchFor2dImageExt.zeMemGetPitchFor2dImage != nullptr;
528528

529-
ZE_CALL_NOCHECK(zeDriverGetExtensionFunctionAddress,
530-
(ZeDriver, "zeCommandListAppendLaunchKernelWithArguments",
531-
reinterpret_cast<void **>(
532-
&ZeCommandListAppendLaunchKernelWithArgumentsExt
533-
.zeCommandListAppendLaunchKernelWithArguments)));
534-
535-
ZeCommandListAppendLaunchKernelWithArgumentsExt.Supported =
536-
ZeCommandListAppendLaunchKernelWithArgumentsExt
537-
.zeCommandListAppendLaunchKernelWithArguments != nullptr;
529+
if (this->isDriverVersionNewerOrSimilar(1, 14, 36035)) {
530+
ZeCommandListAppendLaunchKernelWithArgumentsExt
531+
.zeCommandListAppendLaunchKernelWithArgumentsFunctionPtr =
532+
zeCommandListAppendLaunchKernelWithArguments;
533+
ZeCommandListAppendLaunchKernelWithArgumentsExt.Supported = true;
534+
} else {
535+
ZeCommandListAppendLaunchKernelWithArgumentsExt.Supported = false;
536+
}
538537

539538
// Check if the driver supports zeCommandListAppendLaunchKernelWithArguments()
540539
// with cooperative mode (version >= 1.6.35005)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ struct ur_platform_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter>,
166166
struct ZeCommandListAppendLaunchKernelWithArgumentsExtension {
167167
bool Supported = false;
168168
bool DriverSupportsCooperativeKernelLaunchWithArgs = false;
169-
ze_result_t (*zeCommandListAppendLaunchKernelWithArguments)(
169+
ze_result_t (*zeCommandListAppendLaunchKernelWithArgumentsFunctionPtr)(
170170
ze_command_list_handle_t, ze_kernel_handle_t, const ze_group_count_t,
171-
const ze_group_size_t, void **, void *, ze_event_handle_t, uint32_t,
172-
ze_event_handle_t *);
171+
const ze_group_size_t, void **, const void *, ze_event_handle_t,
172+
uint32_t, ze_event_handle_t *);
173173
} ZeCommandListAppendLaunchKernelWithArgumentsExt;
174174
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ ur_result_t ur_command_list_manager::appendKernelLaunchLocked(
178178
ze_group_size_t groupSize = {WG[0], WG[1], WG[2]};
179179
ZE2UR_CALL(hContext->getPlatform()
180180
->ZeCommandListAppendLaunchKernelWithArgumentsExt
181-
.zeCommandListAppendLaunchKernelWithArguments,
181+
.zeCommandListAppendLaunchKernelWithArgumentsFunctionPtr,
182182
(getZeCommandList(), hZeKernel, zeThreadGroupDimensions,
183183
groupSize, hKernel->kernelArgs.data(), pNext, zeSignalEvent,
184184
waitListView.num, waitListView.handles));

0 commit comments

Comments
 (0)