From 69a579cc156ad1d1b8ac8a7a14100f6d1e158517 Mon Sep 17 00:00:00 2001 From: "Neil R. Spruit" Date: Mon, 16 Sep 2024 17:39:24 -0700 Subject: [PATCH] [UR][L0] Use zesInit for SysMan API usage -pre-commit PR for https://github.com/oneapi-src/unified-runtime/pull/2017 Signed-off-by: Neil R. Spruit --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 4 ++-- sycl/test-e2e/Basic/get_info_aspect.cpp | 12 +++++------- sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp | 10 ++++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 503db98e0ea09..4d2a899f6752a 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,14 +116,14 @@ 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/nrspruit/unified-runtime.git") # commit 6298474e628889d3598b9416303a52e67a2b66aa # Merge: 3cd6eaeb 4bb6a103 # Author: Piotr Balcer # Date: Wed Sep 18 09:20:05 2024 +0200 # Merge pull request #2093 from lslusarczyk/memleak-fix # fixed issue #1990, L0 leaks checker counts successful create/destroy only - set(UNIFIED_RUNTIME_TAG 6298474e628889d3598b9416303a52e67a2b66aa) + set(UNIFIED_RUNTIME_TAG 5713046b56eb85ecf2f017b352ce3e791bead190) 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 index 99aed426c3358..77d50d332cf2f 100644 --- 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 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(); } 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 index 560f427e88b13..8b8061fe034d1 100644 --- 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