Skip to content

Commit d6e4af1

Browse files
committed
[SYCL][Joint Matrix][E2E] Auto-detect Joint Matrix features in LIT
Remove dependency of Matrix tests on LIT's params like `gpu-intel-pvc=True`, `matrix=1`, etc. intel/llvm mostly got rid of parameters like that with auto-detection of architecture and usage of aspects. It would be more maintainable and less error-prone if all of features could be auto-detected.
1 parent 7989104 commit d6e4af1

9 files changed

+8
-31
lines changed

sycl/test-e2e/Matrix/SG32/element_wise_all_ops_tf32.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// REQUIRES: matrix-tf32
8+
// REQUIRES: aspect-ext_intel_matrix, arch-intel_gpu_pvc
99
// REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
1010

1111
// RUN: %{build} -o %t.out

sycl/test-e2e/Matrix/SG32/joint_matrix_tf32.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// REQUIRES: matrix-tf32
8+
// REQUIRES: aspect-ext_intel_matrix, arch-intel_gpu_pvc
99
// REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
1010

1111
// RUN: %{build} -o %t.out
1212
// RUN: %{run} %t.out
1313

1414
#include "../common.hpp"
1515

16-
using namespace sycl;
17-
using namespace sycl::ext::oneapi::experimental::matrix;
18-
1916
#define SG_SZ 32
2017
constexpr size_t TN = 16;
2118

sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/element_wise_all_ops_tf32.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// REQUIRES: matrix-tf32
8+
// REQUIRES: aspect-ext_intel_matrix, arch-intel_gpu_pvc
99
// REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
1010

1111
// RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out
1212
// RUN: %{run} %t.out
1313

14-
// XFAIL: cpu
15-
1614
#include "../../common.hpp"
1715

1816
#define SG_SZ 32

sycl/test-e2e/Matrix/SPVCooperativeMatrix/SG32/joint_matrix_tf32.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// REQUIRES: matrix-tf32
8+
// REQUIRES: aspect-ext_intel_matrix, arch-intel_gpu_pvc
99
// REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
1010

1111
// RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out
1212
// RUN: %{run} %t.out
1313

14-
// XFAIL: cpu
15-
1614
#include "../../common.hpp"
1715

18-
using namespace sycl;
19-
using namespace sycl::ext::oneapi::experimental::matrix;
20-
2116
#define SG_SZ 32
2217
constexpr size_t TN = 16;
2318

sycl/test-e2e/Matrix/SPVCooperativeMatrix/element_wise_all_ops_tf32.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// REQUIRES: matrix-tf32
8+
// REQUIRES: aspect-ext_intel_matrix, arch-intel_gpu_pvc
99
// REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
1010

1111
// RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out
1212
// RUN: %{run} %t.out
1313

14-
// XFAIL: cpu
15-
1614
#include "../common.hpp"
1715

1816
constexpr size_t TN = 16;

sycl/test-e2e/Matrix/SPVCooperativeMatrix/joint_matrix_tf32.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// REQUIRES: matrix-tf32
8+
// REQUIRES: aspect-ext_intel_matrix, arch-intel_gpu_pvc
99
// REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
1010

1111
// RUN: %{build} -D__SPIRV_USE_COOPERATIVE_MATRIX -o %t.out
1212
// RUN: %{run} %t.out
1313

14-
// XFAIL: cpu
15-
1614
#include "../common.hpp"
1715

1816
constexpr size_t TN = 16;

sycl/test-e2e/Matrix/element_wise_all_ops_tf32.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// REQUIRES: matrix-tf32
8+
// REQUIRES: aspect-ext_intel_matrix, arch-intel_gpu_pvc
99
// REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
1010

1111
// RUN: %{build} -o %t.out

sycl/test-e2e/Matrix/joint_matrix_tf32.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
// REQUIRES: matrix-tf32
8+
// REQUIRES: aspect-ext_intel_matrix, arch-intel_gpu_pvc
99
// REQUIRES-INTEL-DRIVER: lin: 27501, win: 101.4943
1010

1111
// RUN: %{build} -o %t.out

sycl/test-e2e/lit.cfg.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,23 +156,14 @@
156156
config.available_features.add(
157157
"matrix-fp16"
158158
) # PVC implies the support of FP16 matrix
159-
config.available_features.add(
160-
"matrix-tf32"
161-
) # PVC implies the support of TF32 matrix
162159
if lit_config.params.get("gpu-intel-pvc-vg", False):
163160
config.available_features.add("gpu-intel-pvc-vg")
164161
config.available_features.add(
165162
"matrix-fp16"
166163
) # PVC-VG implies the support of FP16 matrix
167-
config.available_features.add(
168-
"matrix-tf32"
169-
) # PVC-VG implies the support of TF32 matrix
170164
if lit_config.params.get("matrix", False):
171165
config.available_features.add("matrix")
172166

173-
if lit_config.params.get("matrix-tf32", False):
174-
config.available_features.add("matrix-tf32")
175-
176167
if lit_config.params.get("matrix-xmx8", False):
177168
config.available_features.add("matrix-xmx8")
178169
config.available_features.add(

0 commit comments

Comments
 (0)