[SYCL] Enable checking the result of max_num_work_groups query with e…

…xceeded launch limits on more backends (hip and opencl)
intel · Sep 13, 2024 · 15a5ccf · 15a5ccf
1 parent 5b9f0f6
commit 15a5ccf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake
@@ -116,14 +116,15 @@ 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")
-  # commit f31160dea6d142014f441bc4ca5e58e48827490e
-  # Merge: 2bbe9526 64068799
-  # Author: Piotr Balcer <piotr.balcer@intel.com>
-  # Date:   Thu Sep 12 14:19:48 2024 +0200
-  #     Merge pull request #2083 from kswiecicki/xpti-init-fix
-  #     Fix XPTI initialization bug
-  set(UNIFIED_RUNTIME_TAG f31160dea6d142014f441bc4ca5e58e48827490e)
+  # Temporary changed for testing, update once the UR part is merged.
+  set(UNIFIED_RUNTIME_REPO "https://github.com/GeorgeWeb/unified-runtime.git")
+  # commit 24a8299efc59c715a1c2dd180692a5e12a12283a
+  # Merge: eb63d1a2 2fea679d
+  # Author: Omar Ahmed <omar.ahmed@codeplay.com>
+  # Date:   Wed Sep 11 10:40:59 2024 +0100
+  #     Merge pull request #2078 from callumfare/callum/fix_device_extensions_fpga
+  #     Add workaround for silently supported OpenCL extensions on Intel FPGA
+  set(UNIFIED_RUNTIME_TAG 6eb27d527791012b575ba443586223e4038058af)
 
   set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
   # Due to the use of dependentloadflag and no installer for UMF and hwloc we need

diff --git a/sycl/test-e2e/Basic/launch_queries/max_num_work_groups.cpp b/sycl/test-e2e/Basic/launch_queries/max_num_work_groups.cpp
@@ -161,9 +161,9 @@ 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) {
+  // 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) {
     assert(maxWGs == 0 && "max_num_work_groups query failed");
   }