Skip to content

Commit a8e9fe9

Browse files
banach-spacebanach-space
authored
Revert "Disable failing ARM-SME tests. (iree-org#21715)" (iree-org#21860)
This reverts commit 992860b. See iree-org#21714 for a discussion on the underlying issue. MLIR fix: llvm/llvm-project#156834 Signed-off-by: Andrzej Warzynski <[email protected]>
1 parent 65a52a9 commit a8e9fe9

File tree

2 files changed

+148
-41
lines changed

2 files changed

+148
-41
lines changed

‎tests/e2e/matmul/BUILD.bazel‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -65,47 +65,46 @@ PREPROCESSING_TRANSPOSE_LHS = "--iree-preprocessing-pass-pipeline=builtin.module
6565

6666
PREPROCESSING_PEEL = "--iree-llvmcpu-vector-pproc-strategy=peel"
6767

68-
# TODO(#21714) These tests are disabled. See issue for details.
69-
# # LLVMCPU, non-data-tiling, no microkernels, ArmSME
70-
# [iree_generated_e2e_runner_test(
71-
# name = "e2e_matmul_cpu_arm_sme_nondt_%s_%s%s" % (
72-
# dtype,
73-
# "_transpose_lhs" if transpose_lhs else "",
74-
# "_peel" if peel else "",
75-
# ),
76-
# compiler_flags = [
77-
# "--iree-opt-data-tiling=false",
78-
# "--iree-llvmcpu-enable-scalable-vectorization",
79-
# "--iree-llvmcpu-target-triple=aarch64-unknown-unknown",
80-
# ] + ([PREPROCESSING_TRANSPOSE_LHS] if transpose_lhs else []) +
81-
# ([PREPROCESSING_PEEL] if peel else []),
82-
# generator = ":generate_e2e_matmul_tests",
83-
# generator_args = [
84-
# "--lhs_rhs_type=%s" % dtype,
85-
# "--acc_type=%s" % dtype,
86-
# ],
87-
# tags = [
88-
# "requires-arm-sme",
89-
# ],
90-
# target_backends_and_drivers = [
91-
# ("llvm-cpu", "local-task"),
92-
# ],
93-
# target_cpu_features_variants = ["arm_64:sme:+sve,+sme"],
94-
# test_runner = "//tools/testing/e2e:iree-e2e-matmul-test",
95-
# test_type = "matmul",
96-
# ) for dtype in [
97-
# "f32",
98-
# # f64 disabled because it wasn't supported by the test generator at the time
99-
# # this was added. When adding it in the future, consider passing
100-
# # --iree-input-demote-f64-to-f32=false to the compiler.
101-
# # "f64"
102-
# ] for transpose_lhs in [
103-
# True,
104-
# False,
105-
# ] for peel in [
106-
# True,
107-
# False,
108-
# ]]
68+
# LLVMCPU, non-data-tiling, no microkernels, ArmSME
69+
[iree_generated_e2e_runner_test(
70+
name = "e2e_matmul_cpu_arm_sme_nondt_%s_%s%s" % (
71+
dtype,
72+
"_transpose_lhs" if transpose_lhs else "",
73+
"_peel" if peel else "",
74+
),
75+
compiler_flags = [
76+
"--iree-opt-data-tiling=false",
77+
"--iree-llvmcpu-enable-scalable-vectorization",
78+
"--iree-llvmcpu-target-triple=aarch64-unknown-unknown",
79+
] + ([PREPROCESSING_TRANSPOSE_LHS] if transpose_lhs else []) +
80+
([PREPROCESSING_PEEL] if peel else []),
81+
generator = ":generate_e2e_matmul_tests",
82+
generator_args = [
83+
"--lhs_rhs_type=%s" % dtype,
84+
"--acc_type=%s" % dtype,
85+
],
86+
tags = [
87+
"requires-arm-sme",
88+
],
89+
target_backends_and_drivers = [
90+
("llvm-cpu", "local-task"),
91+
],
92+
target_cpu_features_variants = ["arm_64:sme:+sve,+sme"],
93+
test_runner = "//tools/testing/e2e:iree-e2e-matmul-test",
94+
test_type = "matmul",
95+
) for dtype in [
96+
"f32",
97+
# f64 disabled because it wasn't supported by the test generator at the time
98+
# this was added. When adding it in the future, consider passing
99+
# --iree-input-demote-f64-to-f32=false to the compiler.
100+
# "f64"
101+
] for transpose_lhs in [
102+
True,
103+
False,
104+
] for peel in [
105+
True,
106+
False,
107+
]]
109108

110109
X86_64_AVX2 = [
111110
"+avx",

‎tests/e2e/matmul/CMakeLists.txt‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,114 @@
1010

1111
iree_add_all_subdirs()
1212

13+
iree_generated_e2e_runner_test(
14+
NAME
15+
e2e_matmul_cpu_arm_sme_nondt_f32__transpose_lhs_peel
16+
TEST_TYPE
17+
matmul
18+
GENERATOR
19+
"generate_e2e_matmul_tests.py"
20+
GENERATOR_ARGS
21+
"--lhs_rhs_type=f32"
22+
"--acc_type=f32"
23+
TEST_RUNNER
24+
iree_tools_testing_e2e_iree-e2e-matmul-test
25+
TARGET_BACKENDS
26+
"llvm-cpu"
27+
DRIVERS
28+
"local-task"
29+
COMPILER_FLAGS
30+
"--iree-opt-data-tiling=false"
31+
"--iree-llvmcpu-enable-scalable-vectorization"
32+
"--iree-llvmcpu-target-triple=aarch64-unknown-unknown"
33+
"--iree-preprocessing-pass-pipeline=builtin.module\(util.func\(iree-preprocessing-transpose-matmul-pass{input=lhs}\)\)"
34+
"--iree-llvmcpu-vector-pproc-strategy=peel"
35+
LABELS
36+
"requires-arm-sme"
37+
TARGET_CPU_FEATURES_VARIANTS
38+
"arm_64:sme:+sve,+sme"
39+
)
40+
41+
iree_generated_e2e_runner_test(
42+
NAME
43+
e2e_matmul_cpu_arm_sme_nondt_f32__transpose_lhs
44+
TEST_TYPE
45+
matmul
46+
GENERATOR
47+
"generate_e2e_matmul_tests.py"
48+
GENERATOR_ARGS
49+
"--lhs_rhs_type=f32"
50+
"--acc_type=f32"
51+
TEST_RUNNER
52+
iree_tools_testing_e2e_iree-e2e-matmul-test
53+
TARGET_BACKENDS
54+
"llvm-cpu"
55+
DRIVERS
56+
"local-task"
57+
COMPILER_FLAGS
58+
"--iree-opt-data-tiling=false"
59+
"--iree-llvmcpu-enable-scalable-vectorization"
60+
"--iree-llvmcpu-target-triple=aarch64-unknown-unknown"
61+
"--iree-preprocessing-pass-pipeline=builtin.module\(util.func\(iree-preprocessing-transpose-matmul-pass{input=lhs}\)\)"
62+
LABELS
63+
"requires-arm-sme"
64+
TARGET_CPU_FEATURES_VARIANTS
65+
"arm_64:sme:+sve,+sme"
66+
)
67+
68+
iree_generated_e2e_runner_test(
69+
NAME
70+
e2e_matmul_cpu_arm_sme_nondt_f32__peel
71+
TEST_TYPE
72+
matmul
73+
GENERATOR
74+
"generate_e2e_matmul_tests.py"
75+
GENERATOR_ARGS
76+
"--lhs_rhs_type=f32"
77+
"--acc_type=f32"
78+
TEST_RUNNER
79+
iree_tools_testing_e2e_iree-e2e-matmul-test
80+
TARGET_BACKENDS
81+
"llvm-cpu"
82+
DRIVERS
83+
"local-task"
84+
COMPILER_FLAGS
85+
"--iree-opt-data-tiling=false"
86+
"--iree-llvmcpu-enable-scalable-vectorization"
87+
"--iree-llvmcpu-target-triple=aarch64-unknown-unknown"
88+
"--iree-llvmcpu-vector-pproc-strategy=peel"
89+
LABELS
90+
"requires-arm-sme"
91+
TARGET_CPU_FEATURES_VARIANTS
92+
"arm_64:sme:+sve,+sme"
93+
)
94+
95+
iree_generated_e2e_runner_test(
96+
NAME
97+
e2e_matmul_cpu_arm_sme_nondt_f32_
98+
TEST_TYPE
99+
matmul
100+
GENERATOR
101+
"generate_e2e_matmul_tests.py"
102+
GENERATOR_ARGS
103+
"--lhs_rhs_type=f32"
104+
"--acc_type=f32"
105+
TEST_RUNNER
106+
iree_tools_testing_e2e_iree-e2e-matmul-test
107+
TARGET_BACKENDS
108+
"llvm-cpu"
109+
DRIVERS
110+
"local-task"
111+
COMPILER_FLAGS
112+
"--iree-opt-data-tiling=false"
113+
"--iree-llvmcpu-enable-scalable-vectorization"
114+
"--iree-llvmcpu-target-triple=aarch64-unknown-unknown"
115+
LABELS
116+
"requires-arm-sme"
117+
TARGET_CPU_FEATURES_VARIANTS
118+
"arm_64:sme:+sve,+sme"
119+
)
120+
13121
iree_generated_e2e_runner_test(
14122
NAME
15123
e2e_matmul_cpu_dt_i8_i32

0 commit comments

Comments
 (0)