Skip to content

[UR][CI] Update to v1.25.2 L0 with fixed L0 api symbols #20537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: sycl
Choose a base branch
from
+17 −18
Open

[UR][CI] Update to v1.25.2 L0 with fixed L0 api symbols #20537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions devops/dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions unified-runtime/cmake/FetchLevelZero.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down Expand Up @@ -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)
Expand Down
17 changes: 8 additions & 9 deletions unified-runtime/source/adapters/level_zero/platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (this->isDriverVersionNewerOrSimilar(1, 14, 36035)) {
ZeCommandListAppendLaunchKernelWithArgumentsExt
.zeCommandListAppendLaunchKernelWithArgumentsFunctionPtr =
zeCommandListAppendLaunchKernelWithArguments;
ZeCommandListAppendLaunchKernelWithArgumentsExt.Supported = true;
} else {
ZeCommandListAppendLaunchKernelWithArgumentsExt.Supported = false;
}

// Check if the driver supports zeCommandListAppendLaunchKernelWithArguments()
// with cooperative mode (version >= 1.6.35005)
Expand Down
6 changes: 3 additions & 3 deletions unified-runtime/source/adapters/level_zero/platform.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
ze_event_handle_t *);
const ze_group_size_t, void **, const void *, ze_event_handle_t,
uint32_t, ze_event_handle_t *);
} ZeCommandListAppendLaunchKernelWithArgumentsExt;
};
2 changes: 1 addition & 1 deletion unified-runtime/source/adapters/level_zero/v2/command_list_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Loading