Skip to content

Commit 69a579c

Browse files
committed
[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]>
1 parent 22fbb79 commit 69a579c

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ if(SYCL_UR_USE_FETCH_CONTENT)
116116
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
117117
endfunction()
118118

119-
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
119+
set(UNIFIED_RUNTIME_REPO "https://github.com/nrspruit/unified-runtime.git")
120120
# commit 6298474e628889d3598b9416303a52e67a2b66aa
121121
# Merge: 3cd6eaeb 4bb6a103
122122
# Author: Piotr Balcer <[email protected]>
123123
# Date: Wed Sep 18 09:20:05 2024 +0200
124124
# Merge pull request #2093 from lslusarczyk/memleak-fix
125125
# fixed issue #1990, L0 leaks checker counts successful create/destroy only
126-
set(UNIFIED_RUNTIME_TAG 6298474e628889d3598b9416303a52e67a2b66aa)
126+
set(UNIFIED_RUNTIME_TAG 5713046b56eb85ecf2f017b352ce3e791bead190)
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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
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 spect-ext_intel_free_memory.
5+
// Since gen9 and get12 don't support this query,
56
// so requiring DG2. There may be more devices in our CI supporting this aspect.
67
// REQUIRES: gpu-intel-dg2
78
// REQUIRES: level_zero, level_zero_dev_kit
@@ -10,9 +11,10 @@
1011
//
1112
// RUN: %{build} %level_zero_options -o %t.out
1213
// RUN: env ZES_ENABLE_SYSMAN=1 %{run} %t.out 2>&1 | FileCheck %s
14+
// RUN: env ZES_ENABLE_SYSMAN=0 %{run} %t.out 2>&1 | FileCheck %s
1315
//
1416
// The test is to check that the free device memory is reported by Level Zero
15-
// backend
17+
// backend both with and without the sysman environment variable.
1618
//
1719
// CHECK: Root-device free memory
1820

0 commit comments

Comments
 (0)