Skip to content

Commit

Permalink
Bump UR and adjust use of urKernelSuggestMaxCooperativeGroupCountExp (#…
Browse files Browse the repository at this point in the history
…15966)

Ref: oneapi-src/unified-runtime#2277

---------

Co-authored-by: Martin Morrison-Grant <martin.morrisongrant@codeplay.com>
  • Loading branch information
igchor and martygrant authored Dec 19, 2024
1 parent 2444c91 commit 931a93b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 6 additions & 6 deletions sycl/cmake/modules/UnifiedRuntimeTag.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# commit bb64b3e9f6d30b232b204590b94250ce2da6967b
# Merge: d23739306f2c e625bfdaa99b
# commit ea0f3a1f5f15f9af7bf40bd13669afeb9ada569c
# Merge: bb64b3e9f6d3 4a89e1c69a65
# Author: Martin Grant <martin.morrisongrant@codeplay.com>
# Date: Martin Grant <martin.morrisongrant@codeplay.com>
# Merge pull request #2471 from Bensuo/ben/l0-include-fix
# [L0] Fix issue with test include path
set(UNIFIED_RUNTIME_TAG bb64b3e9f6d30b232b204590b94250ce2da6967b)
# Date: Thu Dec 19 11:26:01 2024 +0000
# Merge pull request #2277 from igchor/cooperative_fix
# [Spec] fix urKernelSuggestMaxCooperativeGroupCountExp
set(UNIFIED_RUNTIME_TAG ea0f3a1f5f15f9af7bf40bd13669afeb9ada569c)
4 changes: 3 additions & 1 deletion sycl/source/detail/kernel_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ kernel_impl::queryMaxNumWorkGroups(queue Queue,
const auto &Adapter = getAdapter();
const auto &Handle = getHandleRef();
auto Device = Queue.get_device();
auto DeviceHandleRef = sycl::detail::getSyclObjImpl(Device)->getHandleRef();

size_t WG[Dimensions];
WG[0] = WorkGroupSize[0];
Expand All @@ -331,7 +332,8 @@ kernel_impl::queryMaxNumWorkGroups(queue Queue,
uint32_t GroupCount{0};
if (auto Result = Adapter->call_nocheck<
UrApiKind::urKernelSuggestMaxCooperativeGroupCountExp>(
Handle, Dimensions, WG, DynamicLocalMemorySize, &GroupCount);
Handle, DeviceHandleRef, Dimensions, WG, DynamicLocalMemorySize,
&GroupCount);
Result != UR_RESULT_ERROR_UNSUPPORTED_FEATURE &&
Result != UR_RESULT_ERROR_INVALID_WORK_GROUP_SIZE) {
// The feature is supported and the group size is valid. Check for other
Expand Down

0 comments on commit 931a93b

Please sign in to comment.