From 29c7e05f32c0fb269451e3da9730dafdb46fd0ab Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Thu, 21 Nov 2024 14:47:56 +0100 Subject: [PATCH 1/7] test --- sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp | 2 +- sycl/test-e2e/lit.cfg.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 62b32c90544b6..1135677a83e30 100644 --- a/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp +++ b/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp @@ -25,7 +25,7 @@ using namespace sycl; int main() { - + return 1; queue Queue; auto dev = Queue.get_device(); std::cout << "Device: " << dev.get_info() << std::endl; diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index c0e68f2a051ca..494eefea32abd 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -646,6 +646,7 @@ def open_check_file(file_name): for sycl_device in config.sycl_devices: env = copy.copy(llvm_config.config.environment) env["ONEAPI_DEVICE_SELECTOR"] = sycl_device + env["ZES_ENABLE_SYSMAN"] = "1" if sycl_device.startswith("cuda:"): env["SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT"] = "1" # When using the ONEAPI_DEVICE_SELECTOR environment variable, sycl-ls From 3f59a5907ceb9ac441d70cf2cb407171158d025e Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Thu, 21 Nov 2024 16:13:39 +0100 Subject: [PATCH 2/7] fix --- .../Plugin/level_zero_device_free_mem.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) 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 1135677a83e30..8d7cc16c49725 100644 --- a/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp +++ b/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp @@ -1,15 +1,4 @@ -// https://github.com/intel/llvm/issues/14244 -// 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 aspect-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 -// UNSUPPORTED: gpu-intel-gen12 -// UNSUPPORTED-INTENDED: The query of free memory is not supported on integrated -// devices +// REQUIRES: aspect-ext_intel_free_memory // // RUN: %{build} %level_zero_options -o %t.out // RUN: env ZES_ENABLE_SYSMAN=1 %{run} %t.out 2>&1 | FileCheck %s @@ -25,7 +14,8 @@ using namespace sycl; int main() { - return 1; + assert(false && "Check for failure"); + queue Queue; auto dev = Queue.get_device(); std::cout << "Device: " << dev.get_info() << std::endl; From 06ed6061f5c00d8d76550e1b9fbb8c6fd0d5e3f6 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Thu, 21 Nov 2024 16:16:44 +0100 Subject: [PATCH 3/7] fix --- sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp | 2 -- 1 file changed, 2 deletions(-) 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 8d7cc16c49725..9e48bb91c6b94 100644 --- a/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp +++ b/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp @@ -14,8 +14,6 @@ using namespace sycl; int main() { - assert(false && "Check for failure"); - queue Queue; auto dev = Queue.get_device(); std::cout << "Device: " << dev.get_info() << std::endl; From 8856ca4d07632f96d3c84d40085d98300505f5a4 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Thu, 21 Nov 2024 17:09:32 +0100 Subject: [PATCH 4/7] fix --- sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp | 2 ++ sycl/test-e2e/lit.cfg.py | 3 +++ 2 files changed, 5 insertions(+) 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 9e48bb91c6b94..f970e6c202a87 100644 --- a/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp +++ b/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp @@ -1,4 +1,5 @@ // REQUIRES: aspect-ext_intel_free_memory +// REQUIRES: level_zero, level_zero_dev_kit // // RUN: %{build} %level_zero_options -o %t.out // RUN: env ZES_ENABLE_SYSMAN=1 %{run} %t.out 2>&1 | FileCheck %s @@ -14,6 +15,7 @@ using namespace sycl; int main() { + queue Queue; auto dev = Queue.get_device(); std::cout << "Device: " << dev.get_info() << std::endl; diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 494eefea32abd..d98e9f89b57d6 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -647,6 +647,9 @@ def open_check_file(file_name): env = copy.copy(llvm_config.config.environment) env["ONEAPI_DEVICE_SELECTOR"] = sycl_device env["ZES_ENABLE_SYSMAN"] = "1" + # The reason for setting ZES_ENABLE_SYSMAN=1 is to ensure + # that the "ext_intel_free_memory" aspect is displayed by sycl-ls --verbose + # Without this aspect, tests requiring it are skipped. if sycl_device.startswith("cuda:"): env["SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT"] = "1" # When using the ONEAPI_DEVICE_SELECTOR environment variable, sycl-ls From 73a3557eb8c6cbcb063fd0bb6b34c89f6332b170 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Thu, 21 Nov 2024 17:10:49 +0100 Subject: [PATCH 5/7] fixed formatting --- sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f970e6c202a87..ad8e4f816ec39 100644 --- a/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp +++ b/sycl/test-e2e/Plugin/level_zero_device_free_mem.cpp @@ -15,7 +15,7 @@ using namespace sycl; int main() { - + queue Queue; auto dev = Queue.get_device(); std::cout << "Device: " << dev.get_info() << std::endl; From db1f97274a1deeaad48f995c28e6e68995000d63 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Mon, 25 Nov 2024 12:52:34 +0100 Subject: [PATCH 6/7] formatting fixed --- sycl/test-e2e/lit.cfg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index d98e9f89b57d6..f84e241733314 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -647,8 +647,8 @@ def open_check_file(file_name): env = copy.copy(llvm_config.config.environment) env["ONEAPI_DEVICE_SELECTOR"] = sycl_device env["ZES_ENABLE_SYSMAN"] = "1" - # The reason for setting ZES_ENABLE_SYSMAN=1 is to ensure - # that the "ext_intel_free_memory" aspect is displayed by sycl-ls --verbose + # The reason for setting ZES_ENABLE_SYSMAN=1 is to ensure + # that the "ext_intel_free_memory" aspect is displayed by sycl-ls --verbose. # Without this aspect, tests requiring it are skipped. if sycl_device.startswith("cuda:"): env["SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT"] = "1" From bc422e06e8b041e75b1ad92a2ecac62203470980 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Tue, 26 Nov 2024 11:43:49 +0100 Subject: [PATCH 7/7] fix --- sycl/test-e2e/lit.cfg.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 142653b0eada3..2ef9ac91ce299 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -662,10 +662,6 @@ def open_check_file(file_name): for sycl_device in config.sycl_devices: env = copy.copy(llvm_config.config.environment) env["ONEAPI_DEVICE_SELECTOR"] = sycl_device - env["ZES_ENABLE_SYSMAN"] = "1" - # The reason for setting ZES_ENABLE_SYSMAN=1 is to ensure - # that the "ext_intel_free_memory" aspect is displayed by sycl-ls --verbose. - # Without this aspect, tests requiring it are skipped. if sycl_device.startswith("cuda:"): env["SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT"] = "1" # When using the ONEAPI_DEVICE_SELECTOR environment variable, sycl-ls