Bump UR and adjust use of urKernelSuggestMaxCooperativeGroupCountExp

intel · Nov 1, 2024 · d05505c · d05505c
1 parent 5dae72c
commit d05505c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake
@@ -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")

diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake
@@ -1,7 +1 @@
-# commit fa8cc8ec16c1a2cf0926cc64026edc6a254ff0c2
-# Merge: 3d58884b 1984ceb1
-# Author: aarongreig <aaron.greig@codeplay.com>
-# Date:   Fri Nov 1 10:03:37 2024 +0000
-#     Merge pull request #1833 from ayylol/old-opencl-check
-#     [OpenCL] Add OpenCL version check for independent forward progress query
-set(UNIFIED_RUNTIME_TAG fa8cc8ec16c1a2cf0926cc64026edc6a254ff0c2)
+set(UNIFIED_RUNTIME_TAG 1c91bbd685b3d0257b5a305ddea9f113fa867172)
diff --git a/sycl/source/detail/kernel_impl.hpp b/sycl/source/detail/kernel_impl.hpp
@@ -257,11 +257,13 @@ inline typename syclex::info::kernel_queue_specific::max_num_work_groups::
   const auto &Adapter = getAdapter();
   const auto &Handle = getHandleRef();
   auto Device = Queue.get_device();
+  auto DeviceHandleRef = sycl::detail::getSyclObjImpl(Device)->getHandleRef();
 
   uint32_t GroupCount{0};
   if (auto Result = Adapter->call_nocheck<
                     UrApiKind::urKernelSuggestMaxCooperativeGroupCountExp>(
-          Handle, WorkGroupSize.size(), DynamicLocalMemorySize, &GroupCount);
+          Handle, DeviceHandleRef, WorkGroupSize.size(), DynamicLocalMemorySize,
+          &GroupCount);
       Result != UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
     // The feature is supported. Check for other errors and throw if any.
     Adapter->checkUrResult(Result);