Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,14 @@ if(SYCL_UR_USE_FETCH_CONTENT)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
# commit b79ebe4e98789144bcdf3832088eb6e6b5ae6967
# Merge: 7b4bc761 fbb6e862
# Author: Kenneth Benzie (Benie) <[email protected]>
# Date: Fri Oct 4 16:39:59 2024 +0100
# Merge pull request #2018 from wenju-he/L0-bindless-image-device-query
# [L0] Fix device query of bindless image support
set(UNIFIED_RUNTIME_TAG b79ebe4e98789144bcdf3832088eb6e6b5ae6967)
# commit df6da35d6e67f2383db28dd49ab08c5c0ef541d2
# Merge: 67590533 55bd5636
# Author: aarongreig <[email protected]>
# Date: Mon Oct 7 12:28:07 2024 +0100
# Merge pull request #2038 from GeorgeWeb/georgi/unsupported-max-coop-wgsize
# [UR][hip][opencl] Mark urKernelSuggestMaxCooperativeGroupCountExp as unsupported
# instead of returning misleading default value
set(UNIFIED_RUNTIME_TAG df6da35d6e67f2383db28dd49ab08c5c0ef541d2)

set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
Expand Down
11 changes: 7 additions & 4 deletions sycl/test-e2e/Basic/launch_queries/max_num_work_groups.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,13 @@ int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
// It cannot be possible to launch a kernel successfully with a configuration
// that exceeds the available resources as in the above defined workGroupSize.
// workGroupSize is larger than maxWorkGroupSize, hence maxWGs must equal 0.
// Note: Level-Zero currently always returns a non-zero value. While other
// backends (i.e., OpenCL, HIP) always return 1 in their implementations.
if (dev.get_backend() == sycl::backend::ext_oneapi_cuda) {
assert(maxWGs == 0 && "max_num_work_groups query failed");
// Note: Level-Zero currently always returns a non-zero value.
// TODO: Remove the backend condition once the Level-Zero API issue is fixed.
if (dev.get_backend() != sycl::backend::ext_oneapi_level_zero) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a small thing, but can we improve the assert message? It seems that the message we want some other developer in the future to understand is that the query SHOULD have failed (but didn't).

assert(maxWGs == 0 &&
"max_num_work_groups query failed.\n"
"It should return 0 possible groups when the requested resources "
"by the lanuch config exceed those available in the hardware.");
}

// As we ensured that the 'max_num_work_groups' query correctly
Expand Down
Loading