From 5efa4593889cb617d5033af7d2a063f34180c56b Mon Sep 17 00:00:00 2001 From: Ross Brunton Date: Thu, 12 Jun 2025 16:02:04 +0100 Subject: [PATCH] [UR][Offload] Bump kernel launching after launchargs change Update UR adapter due to changes in https://github.com/llvm/llvm-project/pull/143901 --- .../source/adapters/offload/enqueue.cpp | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/unified-runtime/source/adapters/offload/enqueue.cpp b/unified-runtime/source/adapters/offload/enqueue.cpp index 0124b4f28e34a..c72cc1b34658b 100644 --- a/unified-runtime/source/adapters/offload/enqueue.cpp +++ b/unified-runtime/source/adapters/offload/enqueue.cpp @@ -45,18 +45,24 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch( } if (GroupSize[0] > GlobalSize[0] || GroupSize[1] > GlobalSize[1] || - GroupSize[2] > GlobalSize[2]) { + GroupSize[2] > GlobalSize[2] || + GroupSize[0] > std::numeric_limits::max() || + GroupSize[1] > std::numeric_limits::max() || + GroupSize[2] > std::numeric_limits::max() || + GlobalSize[0] / GroupSize[0] > std::numeric_limits::max() || + GlobalSize[1] / GroupSize[1] > std::numeric_limits::max() || + GlobalSize[2] / GroupSize[2] > std::numeric_limits::max()) { return UR_RESULT_ERROR_INVALID_WORK_GROUP_SIZE; } ol_kernel_launch_size_args_t LaunchArgs; LaunchArgs.Dimensions = workDim; - LaunchArgs.NumGroupsX = GlobalSize[0] / GroupSize[0]; - LaunchArgs.NumGroupsY = GlobalSize[1] / GroupSize[1]; - LaunchArgs.NumGroupsZ = GlobalSize[2] / GroupSize[2]; - LaunchArgs.GroupSizeX = GroupSize[0]; - LaunchArgs.GroupSizeY = GroupSize[1]; - LaunchArgs.GroupSizeZ = GroupSize[2]; + LaunchArgs.NumGroups.x = GlobalSize[0] / GroupSize[0]; + LaunchArgs.NumGroups.y = GlobalSize[1] / GroupSize[1]; + LaunchArgs.NumGroups.z = GlobalSize[2] / GroupSize[2]; + LaunchArgs.GroupSize.x = GroupSize[0]; + LaunchArgs.GroupSize.y = GroupSize[1]; + LaunchArgs.GroupSize.z = GroupSize[2]; LaunchArgs.DynSharedMemory = 0; ol_event_handle_t EventOut;