Skip to content

Commit 9505cf4

Browse files
authored
[mlir][ArmSME][test] Use only-if-required-by-ops rather than enable_arm_streaming_ignore (NFC) (#75209)
This moves the fix out of the IR and into the pass description, which seems nicer. It also works as an integration test for the `only-if-required-by-ops` flag :)
1 parent 9243328 commit 9505cf4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

mlir/test/Integration/Dialect/Linalg/CPU/ArmSME/matmul-transpose-a.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: mlir-opt %s \
22
// RUN: -transform-interpreter -test-transform-dialect-erase-schedule \
33
// RUN: -one-shot-bufferize="bufferize-function-boundaries" -canonicalize \
4-
// RUN: -enable-arm-streaming="streaming-mode=streaming-locally za-mode=new-za" \
54
// RUN: -convert-vector-to-arm-sme -allocate-arm-sme-tiles -convert-arm-sme-to-scf \
5+
// RUN: -enable-arm-streaming="streaming-mode=streaming-locally za-mode=new-za only-if-required-by-ops" \
66
// RUN: -convert-vector-to-scf -cse -arm-sve-legalize-vector-storage \
77
// RUN: -convert-arm-sme-to-llvm \
88
// RUN: -convert-vector-to-llvm=enable-arm-sve \
@@ -21,7 +21,7 @@ func.func @matmul_transpose_a(%A : tensor<?x?xf32>, %B : tensor<?x?xf32>, %C : t
2121
return
2222
}
2323

24-
func.func @main() attributes { enable_arm_streaming_ignore } {
24+
func.func @main() {
2525
%c0 = arith.constant 0 : i32
2626
%c7 = arith.constant 7 : index
2727

mlir/test/Integration/Dialect/Linalg/CPU/ArmSME/matmul.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: mlir-opt %s \
22
// RUN: -transform-interpreter -test-transform-dialect-erase-schedule \
33
// RUN: -canonicalize \
4-
// RUN: -enable-arm-streaming="streaming-mode=streaming-locally za-mode=new-za" \
54
// RUN: -convert-vector-to-arm-sme -allocate-arm-sme-tiles -convert-arm-sme-to-scf \
5+
// RUN: -enable-arm-streaming="streaming-mode=streaming-locally za-mode=new-za only-if-required-by-ops" \
66
// RUN: -convert-vector-to-scf -cse -arm-sve-legalize-vector-storage \
77
// RUN: -convert-arm-sme-to-llvm \
88
// RUN: -convert-vector-to-llvm=enable-arm-sve \
@@ -21,7 +21,7 @@ func.func @matmul(%A : tensor<?x?xf32>, %B : tensor<?x?xf32>, %C : tensor<?x?xf3
2121
return
2222
}
2323

24-
func.func @main() attributes { enable_arm_streaming_ignore } {
24+
func.func @main() {
2525
%c0 = arith.constant 0 : i32
2626
%c7 = arith.constant 7 : index
2727

mlir/test/Integration/Dialect/Vector/CPU/ArmSME/test-transfer-read-2d.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// DEFINE: %{entry_point} = entry
22
// DEFINE: %{compile} = mlir-opt %s \
3-
// DEFINE: -enable-arm-streaming="streaming-mode=streaming-locally za-mode=new-za" \
43
// DEFINE: -convert-vector-to-arm-sme -convert-arm-sme-to-scf -allocate-arm-sme-tiles \
4+
// DEFINE: -enable-arm-streaming="streaming-mode=streaming-locally za-mode=new-za only-if-required-by-ops" \
55
// DEFINE: -convert-arm-sme-to-llvm -cse -canonicalize \
66
// DEFINE: -test-lower-to-llvm
77
// DEFINE: %{run} = %mcr_aarch64_cmd \
@@ -140,7 +140,7 @@ func.func @get_svl() -> index {
140140
return %vscale : index
141141
}
142142

143-
func.func @entry() attributes { enable_arm_streaming_ignore } {
143+
func.func @entry() {
144144
%c0 = arith.constant 0 : index
145145
%c1 = arith.constant 1 : index
146146
%c2 = arith.constant 2 : index

mlir/test/Integration/Dialect/Vector/CPU/ArmSME/test-transfer-write-2d.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// DEFINE: %{entry_point} = entry
22
// DEFINE: %{compile} = mlir-opt %s \
3-
// DEFINE: -enable-arm-streaming="streaming-mode=streaming-locally za-mode=new-za" \
43
// DEFINE: -convert-vector-to-arm-sme -convert-arm-sme-to-scf -allocate-arm-sme-tiles \
4+
// DEFINE: -enable-arm-streaming="streaming-mode=streaming-locally za-mode=new-za only-if-required-by-ops" \
55
// DEFINE: -convert-arm-sme-to-llvm -cse -canonicalize \
66
// DEFINE: -test-lower-to-llvm
77
// DEFINE: %{run} = %mcr_aarch64_cmd \
@@ -102,7 +102,7 @@ func.func @get_svl() -> index {
102102
return %vscale : index
103103
}
104104

105-
func.func @entry() attributes { enable_arm_streaming_ignore } {
105+
func.func @entry() {
106106
%c0 = arith.constant 0 : index
107107
%c2 = arith.constant 2 : index
108108
%c4 = arith.constant 4 : index

0 commit comments

Comments
 (0)