From f02b9a5f8c1d0ec2e237ef1a2386c796ba38339d Mon Sep 17 00:00:00 2001 From: Dounia Date: Thu, 27 Mar 2025 08:56:54 -0700 Subject: [PATCH 1/3] [SYCL][E2E][Matrix] Cleanup of xfail and unsupported --- sycl/test-e2e/Matrix/SG32/get_coordinate_ops.cpp | 3 --- sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp | 6 +++--- sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp | 6 +++--- .../Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp | 7 +++++-- .../Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sycl/test-e2e/Matrix/SG32/get_coordinate_ops.cpp b/sycl/test-e2e/Matrix/SG32/get_coordinate_ops.cpp index 9553a95fa99ca..445e7ecd8d5e1 100644 --- a/sycl/test-e2e/Matrix/SG32/get_coordinate_ops.cpp +++ b/sycl/test-e2e/Matrix/SG32/get_coordinate_ops.cpp @@ -15,9 +15,6 @@ // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 30049, win: 101.4943 -// XFAIL: arch-intel_gpu_pvc -// XFAIL-TRACKER: GSD-10524 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp index 430a5ca2af6b7..6b3f88f695a70 100644 --- a/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp +++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp @@ -9,12 +9,12 @@ // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for // other triples +// SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2 +// UNSUPPORTED: gpu-intel-dg2 + // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943 -// XFAIL: run-mode && gpu-intel-dg2 -// XFAIL-TRACKER: GSD-4181 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp index 73c8af15f6487..313c3ac4ff477 100644 --- a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp +++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp @@ -9,12 +9,12 @@ // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for // other triples +// SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2 +// UNSUPPORTED: gpu-intel-dg2 + // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943 -// XFAIL: run-mode && gpu-intel-dg2 -// XFAIL-TRACKER: GSD-5768 - // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp index f07176df80fee..1e97f868c967f 100644 --- a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp +++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp @@ -9,6 +9,9 @@ // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for // other triples +// SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2 +// UNSUPPORTED: gpu-intel-dg2 + // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943 @@ -16,9 +19,9 @@ // RUN: %{run} %t.out // This tests support of col major layout for matrix B which does transpose and -// then VNNI transform. This is currently only available on AMX +// then VNNI transform. This is currently only available on AMX and PVC -// XFAIL: gpu +// XFAIL: arch-intel_gpu_bmg_g21 // XFAIL-TRACKER: GSD-5768 #include "common.hpp" diff --git a/sycl/test-e2e/Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp b/sycl/test-e2e/Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp index 0950798a45233..a29db6dee9fd9 100644 --- a/sycl/test-e2e/Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp +++ b/sycl/test-e2e/Matrix/joint_matrix_int8_colmajorA_colmajorB.cpp @@ -15,9 +15,9 @@ // RUN: %{run} %t.out // This tests support of col major layout for matrix B which does transpose and -// then VNNI transform. This is currently only available on AMX +// then VNNI transform. This is currently only available on AMX and PVC -// XFAIL: gpu +// XFAIL: gpu-intel-dg2 || arch-intel_gpu_bmg_g21 // XFAIL-TRACKER: GSD-5768 #include "common.hpp" From 2ebe2a8e4a9bbbb592c3b7df8eabb2b065d6cb38 Mon Sep 17 00:00:00 2001 From: Dounia Date: Fri, 28 Mar 2025 07:46:38 -0700 Subject: [PATCH 2/3] Add unsupported intended --- sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp | 3 ++- sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp | 3 ++- .../Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp index 6b3f88f695a70..7f3a7ce27ee91 100644 --- a/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp +++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_annotated_ptr.cpp @@ -9,8 +9,9 @@ // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for // other triples -// SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2 // UNSUPPORTED: gpu-intel-dg2 +// UNSUPPORTED-INTENDED: SG size = 32 is not currently supported for SYCL Joint +// Matrix by IGC on DG2 // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943 diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp index 313c3ac4ff477..523ecd910f096 100644 --- a/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp +++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_colA_rowB_colC.cpp @@ -9,8 +9,9 @@ // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for // other triples -// SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2 // UNSUPPORTED: gpu-intel-dg2 +// UNSUPPORTED-INTENDED: SG size = 32 is not currently supported for SYCL Joint +// Matrix by IGC on DG2 // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943 diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp index 1e97f868c967f..3daf7ed59c7cc 100644 --- a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp +++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp @@ -9,8 +9,9 @@ // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for // other triples -// SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2 // UNSUPPORTED: gpu-intel-dg2 +// UNSUPPORTED-INTENDED: SG size = 32 is not currently supported for SYCL Joint +// Matrix by IGC on DG2 // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943 From fb19e7366d7fda85915a1fd7b7204047cd660fc2 Mon Sep 17 00:00:00 2001 From: Dounia Date: Mon, 31 Mar 2025 16:18:48 -0700 Subject: [PATCH 3/3] Unsupported was already added --- .../Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp index 266aba990293b..893d7e1ae74ec 100644 --- a/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp +++ b/sycl/test-e2e/Matrix/SG32/joint_matrix_int8_colmajorA_colmajorB.cpp @@ -9,10 +9,6 @@ // UNSUPPORTED-INTENDED: aspect-ext_intel_matrix isn't currently supported for // other triples -// UNSUPPORTED: gpu-intel-dg2 -// UNSUPPORTED-INTENDED: SG size = 32 is not currently supported for SYCL Joint -// Matrix by IGC on DG2 - // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943