Skip to content

Commit 65c58c4

Browse files
nrspruitagainull
andauthored
[UR][L0] Use zesInit for SysMan API usage (#15409)
-pre-commit PR for oneapi-src/unified-runtime#2017 --------- Signed-off-by: Neil R. Spruit <[email protected]> Co-authored-by: Artur Gainullin <[email protected]>
1 parent 8fc9aa5 commit 65c58c4

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
117117
endfunction()
118118

119119
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
120-
# commit ce0325da13048af40acd61bd43ef88bafd84c6b3
121-
# Merge: 2ad32681 668c5e5d
122-
# Author: Piotr Balcer <piotr.balcer@intel.com>
123-
# Date: Thu Sep 26 10:51:57 2024 +0200
124-
# Merge pull request #2134 from nrspruit/fix_multi_device_event_driver_in_order_syclos
125-
# [L0] Fix Multi Device Event handling and remove unhandled events from in order wait list
126-
set(UNIFIED_RUNTIME_TAG ce0325da13048af40acd61bd43ef88bafd84c6b3)
120+
# commit 22962057df1b9d538e08088a7b75d9d8e7c29f90 (HEAD, origin/main, origin/HEAD)
121+
# Merge: e824ddc2 f0a1c433
122+
# Author: aarongreig <aaron.greig@codeplay.com>
123+
# Date: Fri Sep 27 16:54:04 2024 +0100
124+
# Merge pull request #2017 from nrspruit/new_sysman_init
125+
# [L0] Use zesInit for SysMan API usage
126+
set(UNIFIED_RUNTIME_TAG 22962057df1b9d538e08088a7b75d9d8e7c29f90)
127127

128128
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
129129
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
/* This test checks that get_info checks its aspect and throws an invalid object
2-
error when ext::intel::info::device::free_memory is missing on L0*/
3-
4-
// REQUIRES: gpu, level_zero
1+
/* This test checks that get_info checks its aspect and passes without ZES_ENABLE_SYSMAN=1.*/
2+
// REQUIRES: gpu-intel-dg2, level_zero
53
// RUN: %{build} -o %t.out
64
// RUN: env ZES_ENABLE_SYSMAN=0 %{run} %t.out
75
// Explicitly set 'ZES_ENABLE_SYSMAN=0'. HWLOC initializes this environment
@@ -12,14 +10,14 @@
1210
#include <sycl/detail/core.hpp>
1311
int main() {
1412
sycl::queue q;
15-
bool failed = true;
13+
bool failed = false;
1614
try {
1715
sycl::device d(sycl::default_selector_v);
1816
size_t mem_free = d.get_info<sycl::ext::intel::info::device::free_memory>();
1917
} catch (const sycl::exception &e) {
2018
assert(e.code() == sycl::errc::feature_not_supported);
21-
std::cout << "Expected exception encountered: " << e.what() << std::endl;
22-
failed = false;
19+
std::cout << "UnExpected exception encountered: " << e.what() << std::endl;
20+
failed = true;
2321
}
2422
return failed;
2523
}

sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// https://github.com/intel/llvm/issues/14244
2-
// sycl-ls --verbose shows the "ext_intel_free_memory" aspect only if
3-
// ZES_ENABLE_SYSMAN=1 is set, so this test is missed if it requires
4-
// aspect-ext_intel_free_memory. Since gen9 and get12 don't support this query,
2+
// sycl-ls --verbose shows the "ext_intel_free_memory" aspect if
3+
// ZES_ENABLE_SYSMAN=1 is set, but also is sysman init is supported,
4+
// so this test is missed if it requires aspect-ext_intel_free_memory.
5+
6+
// Since gen9 and get12 don't support this query,
57
// so requiring DG2. There may be more devices in our CI supporting this aspect.
68
// REQUIRES: gpu-intel-dg2
79
// REQUIRES: level_zero, level_zero_dev_kit
@@ -10,9 +12,10 @@
1012
//
1113
// RUN: %{build} %level_zero_options -o %t.out
1214
// RUN: env ZES_ENABLE_SYSMAN=1 %{run} %t.out 2>&1 | FileCheck %s
15+
// RUN: env ZES_ENABLE_SYSMAN=0 %{run} %t.out 2>&1 | FileCheck %s
1316
//
1417
// The test is to check that the free device memory is reported by Level Zero
15-
// backend
18+
// backend both with and without the sysman environment variable.
1619
//
1720
// CHECK: Root-device free memory
1821

0 commit comments

Comments
 (0)