Skip to content
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

Bump UR and adjust use of urKernelSuggestMaxCooperativeGroupCountExp #15966

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Bump UR and adjust use of urKernelSuggestMaxCooperativeGroupCountExp #15966

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
693e3d5
Bump UR and adjust use of urKernelSuggestMaxCooperativeGroupCountExp
igchor Nov 1, 2024
360e0e0
Merge remote-tracking branch 'origin/sycl' into cooperative_spec
martygrant Dec 19, 2024
0a78cf2
[UR] Update tag to ea0f3a1f for https://github.com/oneapi-src/unified…
martygrant Dec 19, 2024
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
2 changes: 1 addition & 1 deletion sycl/cmake/modules/FetchUnifiedRuntime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ if(SYCL_UR_USE_FETCH_CONTENT)
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
set(UNIFIED_RUNTIME_REPO "https://github.com/igchor/unified-runtime.git")
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake)

set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
Expand Down
8 changes: 1 addition & 7 deletions sycl/cmake/modules/UnifiedRuntimeTag.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
# commit 39df0317814c164f5242eda8d6f08550f6268492
# Merge: 68d93efd be27d8f0
# Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
# Date: Mon Dec 16 13:53:13 2024 +0000
# Merge pull request #2467 from nrspruit/fix_external_import_function_call
# [L0] Fix external semaphore import function calls to match the header
set(UNIFIED_RUNTIME_TAG 39df0317814c164f5242eda8d6f08550f6268492)
set(UNIFIED_RUNTIME_TAG 4a89e1c69a65acd4f2792743584dfc704086da5e)
4 changes: 3 additions & 1 deletion sycl/source/detail/kernel_impl.hpp
View file
Open in desktop
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
Loading