From 0714d8cd94c6b02bfcf8a744fa1d0d0bc0fe157c Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Mon, 14 Oct 2024 18:04:34 +0200 Subject: [PATCH 1/9] turn off tests for pvc t1 --- sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp | 2 +- sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp | 2 +- sycl/test-e2e/lit.cfg.py | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp index 33ec04b7f226c..d0c5619f28c47 100644 --- a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp +++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp @@ -1,7 +1,7 @@ // REQUIRES: level_zero // REQUIRES: aspect-ext_intel_device_id // https://github.com/intel/llvm/issues/14826 -// XFAIL: arch-intel_gpu_pvc +// XFAIL: gpu-intel-pvc-1T // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out diff --git a/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp b/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp index 498bb47155fad..190312e77ec4c 100644 --- a/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp +++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp @@ -2,7 +2,7 @@ // REQUIRES: level_zero // https://github.com/intel/llvm/issues/14826 -// XFAIL: arch-intel_gpu_pvc +// XFAIL: gpu-intel-pvc-1T // RUN: %{build} -o %t.out // TODO: at this time PVC 1T systems are not correctly supporting CSLICE diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 1e99468e51685..132a58b7f81cd 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -430,8 +430,6 @@ def open_check_file(file_name): ) sp = subprocess.check_output(cmd, text=True, shell=True) for line in sp.splitlines(): - if "Intel(R) Data Center GPU Max 1100" in line: - config.available_features.add("gpu-intel-pvc-1T") if "gfx90a" in line: config.available_features.add("gpu-amd-gfx90a") if not line.startswith("["): @@ -720,6 +718,10 @@ def open_check_file(file_name): # str.removeprefix isn't universally available... sg_sizes_str = line.strip().replace("info::device::sub_group_sizes: ", "") dev_sg_sizes.append(sg_sizes_str.strip().split(" ")) + if re.match(r" *UUID*", line): + _, uuid = line.strip().split(":", 1) + if uuid.strip() == "1341282181147000410000000": + config.available_features.add("gpu-intel-pvc-1T") if re.match(r" *Architecture:", line): _, architecture = line.strip().split(":", 1) architectures.add(architecture.strip()) From 46f5e2d94a9a0bfdae1f4d3132695c61643bdd1f Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Mon, 14 Oct 2024 19:23:37 +0200 Subject: [PATCH 2/9] sycl-ls change to use device_id --- sycl/test-e2e/lit.cfg.py | 4 ++-- sycl/tools/sycl-ls/sycl-ls.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 132a58b7f81cd..ac8869fca9d4b 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -718,9 +718,9 @@ def open_check_file(file_name): # str.removeprefix isn't universally available... sg_sizes_str = line.strip().replace("info::device::sub_group_sizes: ", "") dev_sg_sizes.append(sg_sizes_str.strip().split(" ")) - if re.match(r" *UUID*", line): + if re.match(r" *DeviceID*", line): _, uuid = line.strip().split(":", 1) - if uuid.strip() == "1341282181147000410000000": + if uuid.strip() == "3034": config.available_features.add("gpu-intel-pvc-1T") if re.match(r" *Architecture:", line): _, architecture = line.strip().split(":", 1) diff --git a/sycl/tools/sycl-ls/sycl-ls.cpp b/sycl/tools/sycl-ls/sycl-ls.cpp index 0c6281bc0dc47..c66bada7ed3b6 100644 --- a/sycl/tools/sycl-ls/sycl-ls.cpp +++ b/sycl/tools/sycl-ls/sycl-ls.cpp @@ -148,6 +148,16 @@ static void printDeviceInfo(const device &Device, bool Verbose, std::cout << std::endl; } + // Get and print device ID, if it is available. + if (Device.has(aspect::ext_intel_device_id)) { + auto DeviceID = Device.get_info(); + std::cout << Prepend << "DeviceID : " << DeviceID + << std::endl; + }else{ + std::cout << Prepend << "DeviceID : " << "UNKNOWN" + << std::endl; + } + // Print sub and sub-sub devices. { auto DevCount = GetNumberOfSubAndSubSubDevices(Device); From 41f4aa21143def101569886f8cc3cc18bfbbb76a Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Mon, 14 Oct 2024 19:26:23 +0200 Subject: [PATCH 3/9] fixed formatting --- sycl/tools/sycl-ls/sycl-ls.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sycl/tools/sycl-ls/sycl-ls.cpp b/sycl/tools/sycl-ls/sycl-ls.cpp index c66bada7ed3b6..0803092e536ab 100644 --- a/sycl/tools/sycl-ls/sycl-ls.cpp +++ b/sycl/tools/sycl-ls/sycl-ls.cpp @@ -148,14 +148,13 @@ static void printDeviceInfo(const device &Device, bool Verbose, std::cout << std::endl; } - // Get and print device ID, if it is available. + // Get and print device ID, if it is available. if (Device.has(aspect::ext_intel_device_id)) { - auto DeviceID = Device.get_info(); - std::cout << Prepend << "DeviceID : " << DeviceID - << std::endl; - }else{ - std::cout << Prepend << "DeviceID : " << "UNKNOWN" - << std::endl; + auto DeviceID = + Device.get_info(); + std::cout << Prepend << "DeviceID : " << DeviceID << std::endl; + } else { + std::cout << Prepend << "DeviceID : " << "UNKNOWN" << std::endl; } // Print sub and sub-sub devices. From b8a19ba9ddd326b861b5cf5f0dce1098eb5f2a24 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Tue, 15 Oct 2024 10:47:17 +0200 Subject: [PATCH 4/9] fix --- 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 ac8869fca9d4b..a159e12f1b72a 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -719,8 +719,8 @@ def open_check_file(file_name): sg_sizes_str = line.strip().replace("info::device::sub_group_sizes: ", "") dev_sg_sizes.append(sg_sizes_str.strip().split(" ")) if re.match(r" *DeviceID*", line): - _, uuid = line.strip().split(":", 1) - if uuid.strip() == "3034": + _, device_id = line.strip().split(":", 1) + if device_id.strip() == "3034": config.available_features.add("gpu-intel-pvc-1T") if re.match(r" *Architecture:", line): _, architecture = line.strip().split(":", 1) From 9e088c122cfd71dd2d88b43c212511e680b83045 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Tue, 15 Oct 2024 11:34:22 +0200 Subject: [PATCH 5/9] added variables for pvc device ids --- sycl/test-e2e/lit.cfg.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index a159e12f1b72a..77bad958a4a3b 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -719,9 +719,15 @@ def open_check_file(file_name): sg_sizes_str = line.strip().replace("info::device::sub_group_sizes: ", "") dev_sg_sizes.append(sg_sizes_str.strip().split(" ")) if re.match(r" *DeviceID*", line): + gpu_intel_pvc_1T_device_id = "3034" + gpu_intel_pvc_2T_device_id = "3029" + _, device_id = line.strip().split(":", 1) - if device_id.strip() == "3034": + if device_id.strip() == gpu_intel_pvc_1T_device_id: config.available_features.add("gpu-intel-pvc-1T") + if device_id.strip() == gpu_intel_pvc_2T_device_id: + config.available_features.add("gpu-intel-pvc-2T") + if re.match(r" *Architecture:", line): _, architecture = line.strip().split(":", 1) architectures.add(architecture.strip()) From 822e24392a02a58234aa1dfdd31793e0ab7b4123 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Tue, 15 Oct 2024 11:36:56 +0200 Subject: [PATCH 6/9] fix --- sycl/test-e2e/lit.cfg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index 77bad958a4a3b..fe1bd7e42f810 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -721,11 +721,11 @@ def open_check_file(file_name): if re.match(r" *DeviceID*", line): gpu_intel_pvc_1T_device_id = "3034" gpu_intel_pvc_2T_device_id = "3029" - _, device_id = line.strip().split(":", 1) - if device_id.strip() == gpu_intel_pvc_1T_device_id: + device_id = device_id.strip() + if device_id == gpu_intel_pvc_1T_device_id: config.available_features.add("gpu-intel-pvc-1T") - if device_id.strip() == gpu_intel_pvc_2T_device_id: + if device_id == gpu_intel_pvc_2T_device_id: config.available_features.add("gpu-intel-pvc-2T") if re.match(r" *Architecture:", line): From d83a5134e036f4c22342b3d4c2e8b0b211fb91a7 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Tue, 15 Oct 2024 11:38:00 +0200 Subject: [PATCH 7/9] formatting fix --- sycl/test-e2e/lit.cfg.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index fe1bd7e42f810..17cb702120d42 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/sycl/test-e2e/lit.cfg.py @@ -727,7 +727,6 @@ def open_check_file(file_name): config.available_features.add("gpu-intel-pvc-1T") if device_id == gpu_intel_pvc_2T_device_id: config.available_features.add("gpu-intel-pvc-2T") - if re.match(r" *Architecture:", line): _, architecture = line.strip().split(":", 1) architectures.add(architecture.strip()) From 3773c94db031c8112a6a054f4ddc260bc2065a91 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Tue, 15 Oct 2024 12:48:40 +0200 Subject: [PATCH 8/9] added xfail-tracker --- sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp | 3 ++- sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp index d0c5619f28c47..8a556e332b64d 100644 --- a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp +++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp @@ -1,7 +1,8 @@ // REQUIRES: level_zero // REQUIRES: aspect-ext_intel_device_id -// https://github.com/intel/llvm/issues/14826 + // XFAIL: gpu-intel-pvc-1T +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15699 // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out diff --git a/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp b/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp index 190312e77ec4c..fa82cf841a2c3 100644 --- a/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp +++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp @@ -1,8 +1,9 @@ // REQUIRES: aspect-ext_intel_device_id // REQUIRES: level_zero -// https://github.com/intel/llvm/issues/14826 // XFAIL: gpu-intel-pvc-1T +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15699 + // RUN: %{build} -o %t.out // TODO: at this time PVC 1T systems are not correctly supporting CSLICE From 6cbec4dd1b94be1aa9345d395ebeca27114b39a5 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Tue, 15 Oct 2024 15:43:55 +0200 Subject: [PATCH 9/9] changed count and added xfail-tracker to test --- sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp | 2 +- sycl/test-e2e/no-xfail-without-tracker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp b/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp index 6cb5471f48509..fd05d1071870b 100644 --- a/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp +++ b/sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp @@ -1,7 +1,7 @@ // REQUIRES: arch-intel_gpu_pvc, level_zero -// https://github.com/intel/llvm/issues/14826 // XFAIL: arch-intel_gpu_pvc +// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15602 // RUN: %{build} %level_zero_options -o %t.out diff --git a/sycl/test-e2e/no-xfail-without-tracker.cpp b/sycl/test-e2e/no-xfail-without-tracker.cpp index b9d59ce35aa61..ceabccc94ae1c 100644 --- a/sycl/test-e2e/no-xfail-without-tracker.cpp +++ b/sycl/test-e2e/no-xfail-without-tracker.cpp @@ -47,4 +47,4 @@ // tests to match the required format and in that case you should just update // (i.e. reduce) the number below. // -// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 179 +// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 176