From 8f3bb467b63fada36a75a13b131c0ba43a3bf08d Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Mon, 14 Oct 2024 14:12:34 +0200 Subject: [PATCH 1/2] skip tests for pvc t1 --- .../test-e2e/Plugin/level_zero_ext_intel_cslice.cpp | 13 +++++++++---- .../Plugin/level_zero_ext_intel_queue_index.cpp | 10 ++++++++-- 2 files changed, 17 insertions(+), 6 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..5c8a546f3c0a6 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,5 @@ // REQUIRES: level_zero // REQUIRES: aspect-ext_intel_device_id -// https://github.com/intel/llvm/issues/14826 -// XFAIL: arch-intel_gpu_pvc // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out @@ -180,10 +178,17 @@ void test_non_pvc(device &d) { } } +bool IsPVC_T1(sycl::device &d) { + uint32_t device_id = d.get_info(); + return device_id == 0xbda; +} + int main() { device d; - - test_pvc(d); + // Check to skip the test for PVC T1 + if(!IsPVC_T1(d)){ + test_pvc(d); + } test_non_pvc(d); return 0; 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..a5c7e17d9c786 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,6 @@ // REQUIRES: aspect-ext_intel_device_id // REQUIRES: level_zero -// https://github.com/intel/llvm/issues/14826 -// XFAIL: arch-intel_gpu_pvc // RUN: %{build} -o %t.out // TODO: at this time PVC 1T systems are not correctly supporting CSLICE @@ -111,9 +109,17 @@ void test_pvc(device &d) { std::cout << "Test PVC End" << std::endl; // CHECK-PVC: Test PVC End } +bool IsPVC_T1(sycl::device &d) { + uint32_t device_id = d.get_info(); + return device_id == 0xbda; +} int main() { device d; + // Check to skip the test for PVC T1 + if (IsPVC_T1(d)){ + return 0; + } test_pvc(d); From 8fb976d4d8464cfd12ff3a22c975e4599763ac46 Mon Sep 17 00:00:00 2001 From: "Skrobot, Daniel" Date: Mon, 14 Oct 2024 14:16:49 +0200 Subject: [PATCH 2/2] formatting fixes --- sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp | 2 +- sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 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 5c8a546f3c0a6..22215c1cfcf2c 100644 --- a/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp +++ b/sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp @@ -186,7 +186,7 @@ bool IsPVC_T1(sycl::device &d) { int main() { device d; // Check to skip the test for PVC T1 - if(!IsPVC_T1(d)){ + if (!IsPVC_T1(d)) { test_pvc(d); } test_non_pvc(d); 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 a5c7e17d9c786..b3fe7860481cd 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 @@ -117,8 +117,8 @@ bool IsPVC_T1(sycl::device &d) { int main() { device d; // Check to skip the test for PVC T1 - if (IsPVC_T1(d)){ - return 0; + if (IsPVC_T1(d)) { + return 0; } test_pvc(d);