From ac00d2977876d901987f31e1da64e130c558a79f Mon Sep 17 00:00:00 2001 From: "Plyakhin, Yury" Date: Thu, 19 Sep 2024 13:36:37 -0700 Subject: [PATCH 1/3] [SYCL][E2E][Joint Matrix] Limit XFAIL for half tests Since tests for matrix fp16 support are using runtime query now they will report pass on cpu architectures which don't support matrix fp16 operations. Hence XFAIL should be limited to only architectures, which support matrix fp16 operations --- .../SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp | 2 +- .../Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp | 2 +- .../Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp | 2 +- sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp index a922c241e6677..435dae73d4e74 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp @@ -14,7 +14,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL: cpu +// XFAIL: arch-intel_cpu_gnr #include "../../common.hpp" diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp index 3d82602130459..b1a9d304fc6a6 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp @@ -14,7 +14,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL: cpu +// XFAIL: arch-intel_cpu_gnr #include "../../common.hpp" diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp index f907360c25f5f..55bda7fcb921f 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp @@ -11,7 +11,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL: cpu +// XFAIL: arch-intel_cpu_gnr #include "../common.hpp" #include "../element_wise_all_ops_half_impl.hpp" diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp index 6dab4c8445baa..29d4fec807c75 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp @@ -11,7 +11,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL: cpu +// XFAIL: arch-intel_cpu_gnr #include "../common.hpp" #include "../joint_matrix_half_impl.hpp" From 4c3bb1d905106eea94b10f37180ffbb9b0fabc49 Mon Sep 17 00:00:00 2001 From: "Plyakhin, Yury" Date: Fri, 20 Sep 2024 09:42:36 -0700 Subject: [PATCH 2/3] Revert "[SYCL][E2E][Joint Matrix] Limit XFAIL for half tests" This reverts commit ac00d2977876d901987f31e1da64e130c558a79f. --- .../SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp | 2 +- .../Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp | 2 +- .../Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp | 2 +- sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp index 435dae73d4e74..a922c241e6677 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp @@ -14,7 +14,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL: arch-intel_cpu_gnr +// XFAIL: cpu #include "../../common.hpp" diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp index b1a9d304fc6a6..3d82602130459 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp @@ -14,7 +14,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL: arch-intel_cpu_gnr +// XFAIL: cpu #include "../../common.hpp" diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp index 55bda7fcb921f..f907360c25f5f 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp @@ -11,7 +11,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL: arch-intel_cpu_gnr +// XFAIL: cpu #include "../common.hpp" #include "../element_wise_all_ops_half_impl.hpp" diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp index 29d4fec807c75..6dab4c8445baa 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp @@ -11,7 +11,7 @@ // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out -// XFAIL: arch-intel_cpu_gnr +// XFAIL: cpu #include "../common.hpp" #include "../joint_matrix_half_impl.hpp" From 8640f011a989b8a3e29f72dc0236c3cebc8e847a Mon Sep 17 00:00:00 2001 From: "Plyakhin, Yury" Date: Fri, 20 Sep 2024 09:54:48 -0700 Subject: [PATCH 3/3] addressed feedback --- .../SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp | 4 +++- .../Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp | 4 +++- .../Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp | 3 +++ .../Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp | 3 +++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp index a922c241e6677..4acd374a74211 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_half.cpp @@ -6,7 +6,9 @@ // //===----------------------------------------------------------------------===// // SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2 -// UNSUPPORTED: gpu-intel-dg2 +// SYCL Joint Matrix fp16 operations are not supported on SPR +// UNSUPPORTED: gpu-intel-dg2, arch-intel_cpu_spr + // REQUIRES: aspect-fp16 // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943 diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp index 3d82602130459..a0acb935699de 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_half.cpp @@ -6,7 +6,9 @@ // //===----------------------------------------------------------------------===// // SG size = 32 is not currently supported for SYCL Joint Matrix by IGC on DG2 -// UNSUPPORTED: gpu-intel-dg2 +// SYCL Joint Matrix fp16 operations are not supported on SPR +// UNSUPPORTED: gpu-intel-dg2, arch-intel_cpu_spr + // REQUIRES: aspect-fp16 // REQUIRES: aspect-ext_intel_matrix // REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943 diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp index f907360c25f5f..f1873f848ac72 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_half.cpp @@ -8,6 +8,9 @@ // REQUIRES: aspect-fp16 // REQUIRES: aspect-ext_intel_matrix +// SYCL Joint Matrix fp16 operations are not supported on SPR +// UNSUPPORTED: arch-intel_cpu_spr + // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp index 6dab4c8445baa..52a6f6165a355 100644 --- a/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp +++ b/sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_half.cpp @@ -8,6 +8,9 @@ // REQUIRES: aspect-fp16 // REQUIRES: aspect-ext_intel_matrix +// SYCL Joint Matrix fp16 operations are not supported on SPR +// UNSUPPORTED: arch-intel_cpu_spr + // RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out // RUN: %{run} %t.out