[UR][L0] Use zesInit for SysMan API usage

-pre-commit PR for oneapi-src/unified-runtime#2017 Signed-off-by: Neil R. Spruit <[email protected]>
nrspruit · Sep 27, 2024 · 8dc1917 · 8dc1917
1 parent c956940
commit 8dc1917
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake
@@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
   endfunction()
 
   set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-  # commit ce0325da13048af40acd61bd43ef88bafd84c6b3
-  # Merge: 2ad32681 668c5e5d
-  # Author: Piotr Balcer <piotr.balcer@intel.com>
-  # Date:   Thu Sep 26 10:51:57 2024 +0200
-  #     Merge pull request #2134 from nrspruit/fix_multi_device_event_driver_in_order_syclos
-  #     [L0] Fix Multi Device Event handling and remove unhandled events from in order wait list
-  set(UNIFIED_RUNTIME_TAG ce0325da13048af40acd61bd43ef88bafd84c6b3)
+  # commit 22962057df1b9d538e08088a7b75d9d8e7c29f90 (HEAD, origin/main, origin/HEAD)
+  # Merge: e824ddc2 f0a1c433
+  # Author: aarongreig <aaron.greig@codeplay.com>
+  # Date:   Fri Sep 27 16:54:04 2024 +0100
+  #     Merge pull request #2017 from nrspruit/new_sysman_init
+  #     [L0] Use zesInit for SysMan API usage
+  set(UNIFIED_RUNTIME_TAG 22962057df1b9d538e08088a7b75d9d8e7c29f90)
 
   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/get_info_aspect.cpp b/sycl/test-e2e/Basic/get_info_aspect.cpp
@@ -1,7 +1,5 @@
-/* This test checks that get_info checks its aspect and throws an invalid object
-   error when ext::intel::info::device::free_memory is missing on L0*/
-
-// REQUIRES: gpu, level_zero
+/* This test checks that get_info checks its aspect and passes without ZES_ENABLE_SYSMAN=1.*/
+// REQUIRES: gpu-intel-dg2, level_zero
 // RUN: %{build} -o %t.out
 // RUN: env ZES_ENABLE_SYSMAN=0 %{run} %t.out
 // Explicitly set 'ZES_ENABLE_SYSMAN=0'. HWLOC initializes this environment
@@ -12,14 +10,14 @@
 #include <sycl/detail/core.hpp>
 int main() {
   sycl::queue q;
-  bool failed = true;
+  bool failed = false;
   try {
     sycl::device d(sycl::default_selector_v);
     size_t mem_free = d.get_info<sycl::ext::intel::info::device::free_memory>();
   } catch (const sycl::exception &e) {
     assert(e.code() == sycl::errc::feature_not_supported);
-    std::cout << "Expected exception encountered: " << e.what() << std::endl;
-    failed = false;
+    std::cout << "UnExpected exception encountered: " << e.what() << std::endl;
+    failed = true;
   }
   return failed;
 }
diff --git a/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp b/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp
@@ -1,7 +1,8 @@
 // https://github.com/intel/llvm/issues/14244
-// sycl-ls --verbose shows the "ext_intel_free_memory" aspect only if
-// ZES_ENABLE_SYSMAN=1 is set, so this test is missed if it requires
-// aspect-ext_intel_free_memory. Since gen9 and get12 don't support this query,
+// sycl-ls --verbose shows the "ext_intel_free_memory" aspect if 
+// ZES_ENABLE_SYSMAN=1 is set, but also is sysman init is supported, 
+// so this test is missed if it requires spect-ext_intel_free_memory.
+// Since gen9 and get12 don't support this query,
 // so requiring DG2. There may be more devices in our CI supporting this aspect.
 // REQUIRES: gpu-intel-dg2
 // REQUIRES: level_zero, level_zero_dev_kit
@@ -10,9 +11,10 @@
 //
 // RUN: %{build} %level_zero_options -o %t.out
 // RUN: env ZES_ENABLE_SYSMAN=1 %{run} %t.out 2>&1 | FileCheck %s
+// RUN: env ZES_ENABLE_SYSMAN=0 %{run} %t.out 2>&1 | FileCheck %s
 //
 // The test is to check that the free device memory is reported by Level Zero
-// backend
+// backend both with and without the sysman environment variable.
 //
 // CHECK: Root-device free memory