From 7551b7fe242115bbf46a41cf2137e6cd0015e91c Mon Sep 17 00:00:00 2001 From: "Sarnie, Nick" Date: Tue, 15 Jul 2025 11:52:33 -0700 Subject: [PATCH 1/4] [SYCL][E2E][Matrix] Remove XFAIL from tests passing on PVC dev-igc Signed-off-by: Sarnie, Nick --- sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp | 2 +- sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp | 2 +- sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp | 2 +- .../Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp index badc2027a76bb..644dde0481bbd 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: target-spir -// XFAIL: run-mode && igc-dev +// XFAIL: run-mode && igc-dev && gpu-intel-dg2 // XFAIL-TRACKER: CMPLRLLVM-66371 // REQUIRES: aspect-ext_intel_matrix diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp index 80c15b4b3cb11..8d60674ec8628 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: target-spir -// XFAIL: run-mode && igc-dev +// XFAIL: run-mode && igc-dev && gpu-intel-dg2 // XFAIL-TRACKER: CMPLRLLVM-66371 // REQUIRES: aspect-ext_intel_matrix, gpu diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp index f350d83f36af8..3107b2aca7fa4 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // REQUIRES: target-spir -// XFAIL: run-mode && igc-dev +// XFAIL: run-mode && igc-dev && gpu-intel-dg2 // XFAIL-TRACKER: CMPLRLLVM-66371 // REQUIRES: aspect-ext_intel_matrix, gpu diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp index 82109e6cbca4d..d2a4f03ed9221 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp @@ -9,9 +9,7 @@ // REQUIRES: aspect-ext_intel_matrix // UNSUPPORTED: gpu-intel-dg2 - -// XFAIL: run-mode && igc-dev -// XFAIL-TRACKER: CMPLRLLVM-66371 +// UNSUPPORTED-TRACKER: CMPLRLLVM-66371 // RUN: %{build} -o %t_vnni.out -DPREFETCH -DVNNI %fp-model-precise // RUN: %{run} %t_vnni.out From 7e2ce9e761fe42dba8a3d7a05bfe9efdbedd249c Mon Sep 17 00:00:00 2001 From: "Sarnie, Nick" Date: Tue, 15 Jul 2025 12:03:40 -0700 Subject: [PATCH 2/4] more Signed-off-by: Sarnie, Nick --- sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp | 2 -- sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp | 2 -- .../Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp | 5 ----- sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp | 2 -- .../Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp | 5 ----- .../Matrix/joint_matrix_bf16_fill_k_cache_unroll.cpp | 2 -- .../Matrix/joint_matrix_bf16_fill_k_cache_unroll_init.cpp | 2 -- 7 files changed, 20 deletions(-) diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp index 644dde0481bbd..99b53ead3d7c7 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache.cpp @@ -6,8 +6,6 @@ // //===----------------------------------------------------------------------===// // REQUIRES: target-spir -// XFAIL: run-mode && igc-dev && gpu-intel-dg2 -// XFAIL-TRACKER: CMPLRLLVM-66371 // REQUIRES: aspect-ext_intel_matrix // RUN: %{build} -o %t_vnni.out -DVNNI %fp-model-precise diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp index 8d60674ec8628..e11e9d9615e19 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_SLM.cpp @@ -6,8 +6,6 @@ // //===----------------------------------------------------------------------===// // REQUIRES: target-spir -// XFAIL: run-mode && igc-dev && gpu-intel-dg2 -// XFAIL-TRACKER: CMPLRLLVM-66371 // REQUIRES: aspect-ext_intel_matrix, gpu diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp index 86ba54288b907..5f01d834ae582 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp @@ -13,10 +13,5 @@ // -ffp-model=precise is added to not depend on compiler defaults. -// Waiting for the commit in IGC to be pulled into the driver to resolve the -// test. -// XFAIL: run-mode && igc-dev -// XFAIL-TRACKER: GSD-10510 - #include "common.hpp" #include "joint_matrix_bf16_fill_k_cache_impl.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp index 3107b2aca7fa4..0b368ffb3f159 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_init.cpp @@ -6,8 +6,6 @@ // //===----------------------------------------------------------------------===// // REQUIRES: target-spir -// XFAIL: run-mode && igc-dev && gpu-intel-dg2 -// XFAIL-TRACKER: CMPLRLLVM-66371 // REQUIRES: aspect-ext_intel_matrix, gpu // RUN: %{build} -o %t.out -DINIT_LIST -DVNNI %fp-model-precise diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp index 04cabd630612f..16407d1c83002 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp @@ -14,10 +14,5 @@ // -ffp-model=precise is added to not depend on compiler defaults. -// Waiting for the commit in IGC to be pulled into the driver to resolve the -// test. -// XFAIL: run-mode && igc-dev -// XFAIL-TRACKER: GSD-10510 - #include "common.hpp" #include "joint_matrix_bf16_fill_k_cache_impl.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll.cpp index ff152827bb054..68092f76a0a31 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll.cpp @@ -6,8 +6,6 @@ // //===----------------------------------------------------------------------===// // REQUIRES: target-spir -// XFAIL: run-mode && igc-dev && gpu-intel-dg2 -// XFAIL-TRACKER: CMPLRLLVM-66371 // REQUIRES: aspect-ext_intel_matrix // RUN: %{build} -mllvm -inline-threshold=2000 %fp-model-precise -o %t.out -DMANUAL_UNROLL -DVNNI diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll_init.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll_init.cpp index c66cb95086ac6..552017714ff42 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll_init.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_unroll_init.cpp @@ -6,8 +6,6 @@ // //===----------------------------------------------------------------------===// // REQUIRES: target-spir -// XFAIL: run-mode && igc-dev && gpu-intel-dg2 -// XFAIL-TRACKER: CMPLRLLVM-66371 // REQUIRES: aspect-ext_intel_matrix, gpu From 8d78e6a752ba70758da6d81028a71bc9ea601986 Mon Sep 17 00:00:00 2001 From: "Sarnie, Nick" Date: Tue, 15 Jul 2025 12:39:47 -0700 Subject: [PATCH 3/4] fix unit tests Signed-off-by: Sarnie, Nick --- .../Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp | 2 +- .../test/e2e_test_requirements/no-unsupported-without-info.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp index d2a4f03ed9221..b28e94a713a35 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp @@ -9,7 +9,7 @@ // REQUIRES: aspect-ext_intel_matrix // UNSUPPORTED: gpu-intel-dg2 -// UNSUPPORTED-TRACKER: CMPLRLLVM-66371 +// UNSUPPORTED-INTENDED: prefetch is not supported on DG2 // RUN: %{build} -o %t_vnni.out -DPREFETCH -DVNNI %fp-model-precise // RUN: %{run} %t_vnni.out diff --git a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp index f93e9c2c2f970..9907e23d418e1 100644 --- a/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp +++ b/sycl/test/e2e_test_requirements/no-unsupported-without-info.cpp @@ -54,7 +54,7 @@ // tests to match the required format and in that case you should just update // (i.e. reduce) the number and the list below. // -// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 229 +// NUMBER-OF-UNSUPPORTED-WITHOUT-INFO: 228 // // List of improperly UNSUPPORTED tests. // Remove the CHECK once the test has been properly UNSUPPORTED. @@ -200,7 +200,6 @@ // CHECK-NEXT: Matrix/SG32/joint_matrix_uu_int8.cpp // CHECK-NEXT: Matrix/joint_matrix_annotated_ptr.cpp // CHECK-NEXT: Matrix/joint_matrix_bf16_fill_k_cache_OOB.cpp -// CHECK-NEXT: Matrix/joint_matrix_bf16_fill_k_cache_prefetch.cpp // CHECK-NEXT: Matrix/joint_matrix_down_convert.cpp // CHECK-NEXT: Matrix/joint_matrix_rowmajorA_rowmajorB.cpp // CHECK-NEXT: NonUniformGroups/ballot_group.cpp From 1882703f626337ceeda1174c92998c2b4c7aac8a Mon Sep 17 00:00:00 2001 From: "Sarnie, Nick" Date: Tue, 15 Jul 2025 13:31:10 -0700 Subject: [PATCH 4/4] some still failing on pvc Signed-off-by: Sarnie, Nick --- .../Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp | 5 +++++ .../Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp index 5f01d834ae582..9d291aaf56c22 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_arg_dim.cpp @@ -13,5 +13,10 @@ // -ffp-model=precise is added to not depend on compiler defaults. +// Waiting for the commit in IGC to be pulled into the driver to resolve the +// test. +// XFAIL: run-mode && igc-dev && arch-intel_gpu_pvc +// XFAIL-TRACKER: GSD-10510 + #include "common.hpp" #include "joint_matrix_bf16_fill_k_cache_impl.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp index 16407d1c83002..5f6fdca01206b 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_bf16_fill_k_cache_runtime_dim.cpp @@ -14,5 +14,10 @@ // -ffp-model=precise is added to not depend on compiler defaults. +// Waiting for the commit in IGC to be pulled into the driver to resolve the +// test. +// XFAIL: run-mode && igc-dev && arch-intel_gpu_pvc +// XFAIL-TRACKER: GSD-10510 + #include "common.hpp" #include "joint_matrix_bf16_fill_k_cache_impl.hpp"