Skip to content

Commit 8d9fe79

Browse files
giuserosgiuseros
committed
Correcting remaining tests
1 parent 4b1f9fc commit 8d9fe79

File tree

7 files changed

+68
-73
lines changed

7 files changed

+68
-73
lines changed

‎mlir/test/Dialect/Bufferization/Transforms/OwnershipBasedBufferDeallocation/dealloc-branchop-interface.mlir

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,28 +178,32 @@ func.func @condBranchDynamicTypeNested(
178178
// CHECK-NEXT: ^bb1
179179
// CHECK-NOT: bufferization.dealloc
180180
// CHECK-NOT: bufferization.clone
181-
// CHECK: cf.br ^bb5([[ARG1]], %false{{[0-9_]*}} :
181+
// CHECK: cf.br ^bb6([[ARG1]], %false{{[0-9_]*}} :
182182
// CHECK: ^bb2([[IDX:%.*]]:{{.*}})
183183
// CHECK: [[ALLOC1:%.*]] = memref.alloc([[IDX]])
184184
// CHECK-NEXT: test.buffer_based
185185
// CHECK-NEXT: [[NOT_ARG0:%.+]] = arith.xori [[ARG0]], %true
186186
// CHECK-NEXT: [[OWN:%.+]] = arith.select [[ARG0]], [[ARG0]], [[NOT_ARG0]]
187187
// CHECK-NOT: bufferization.dealloc
188188
// CHECK-NOT: bufferization.clone
189-
// CHECK: cf.cond_br{{.*}}, ^bb3, ^bb3
189+
// CHECK: cf.cond_br{{.*}}, ^bb3, ^bb4
190190
// CHECK-NEXT: ^bb3:
191191
// CHECK-NOT: bufferization.dealloc
192192
// CHECK-NOT: bufferization.clone
193-
// CHECK: cf.br ^bb4([[ALLOC1]], [[OWN]]
194-
// CHECK-NEXT: ^bb4([[ALLOC2:%.*]]:{{.*}}, [[COND1:%.+]]:{{.*}})
193+
// CHECK: cf.br ^bb5([[ALLOC1]], [[OWN]]
194+
// CHECK-NEXT: ^bb4:
195195
// CHECK-NOT: bufferization.dealloc
196196
// CHECK-NOT: bufferization.clone
197-
// CHECK: cf.br ^bb5([[ALLOC2]], [[COND1]]
198-
// CHECK-NEXT: ^bb5([[ALLOC4:%.*]]:{{.*}}, [[COND2:%.+]]:{{.*}})
197+
// CHECK: cf.br ^bb5([[ALLOC1]], [[OWN]]
198+
// CHECK-NEXT: ^bb5([[ALLOC2:%.*]]:{{.*}}, [[COND1:%.+]]:{{.*}})
199+
// CHECK-NOT: bufferization.dealloc
200+
// CHECK-NOT: bufferization.clone
201+
// CHECK: cf.br ^bb6([[ALLOC2]], [[COND1]]
202+
// CHECK-NEXT: ^bb6([[ALLOC4:%.*]]:{{.*}}, [[COND2:%.+]]:{{.*}})
199203
// CHECK-NEXT: [[BASE:%[a-zA-Z0-9_]+]]{{.*}} = memref.extract_strided_metadata [[ALLOC4]]
200204
// CHECK-NEXT: [[OWN:%.+]]:2 = bufferization.dealloc ([[BASE]] :{{.*}}) if ([[COND2]]) retain ([[ALLOC4]], [[ARG2]] :
201-
// CHECK: cf.br ^bb6([[ALLOC4]], [[OWN]]#0
202-
// CHECK-NEXT: ^bb6([[ALLOC5:%.*]]:{{.*}}, [[COND3:%.+]]:{{.*}})
205+
// CHECK: cf.br ^bb7([[ALLOC4]], [[OWN]]#0
206+
// CHECK-NEXT: ^bb7([[ALLOC5:%.*]]:{{.*}}, [[COND3:%.+]]:{{.*}})
203207
// CHECK: test.copy
204208
// CHECK: [[BASE:%[a-zA-Z0-9_]+]]{{.*}} = memref.extract_strided_metadata [[ALLOC5]]
205209
// CHECK-NEXT: bufferization.dealloc ([[BASE]] : {{.*}}) if ([[COND3]])

‎mlir/test/Dialect/Linalg/detensorize_if.mlir

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,15 @@ func.func @main() -> (tensor<i32>) attributes {} {
4242
}
4343

4444
// CHECK-LABEL: func @main()
45-
// CHECK-DAG: arith.constant 0
46-
// CHECK-DAG: arith.constant 10
47-
// CHECK: cf.br ^[[bb1:.*]](%{{.*}}: i32)
48-
// CHECK-NEXT: ^[[bb1]](%{{.*}}: i32):
49-
// CHECK-NEXT: arith.cmpi slt, %{{.*}}, %{{.*}}
50-
// CHECK-NEXT: cf.cond_br %{{.*}}, ^[[bb2:.*]](%{{.*}} : i32), ^bb3(%{{.*}} : i32)
51-
// CHECK-NEXT: ^[[bb2]](%{{.*}}: i32)
52-
// CHECK-NEXT: arith.addi %{{.*}}, %{{.*}}
53-
// CHECK-NEXT: cf.br ^[[bb3:.*]](%{{.*}} : i32)
54-
// CHECK-NEXT: ^[[bb3]](%{{.*}}: i32)
55-
// CHECK-NEXT: tensor.from_elements %{{.*}} : tensor<i32>
56-
// CHECK-NEXT: return %{{.*}}
45+
// CHECK-DAG: %[[cst:.*]] = arith.constant dense<0>
46+
// CHECK-DAG: arith.constant true
47+
// CHECK: cf.br
48+
// CHECK-NEXT: ^[[bb1:.*]]:
49+
// CHECK-NEXT: cf.cond_br %{{.*}}, ^[[bb2:.*]], ^bb3
50+
// CHECK-NEXT: ^[[bb2]]
51+
// CHECK-NEXT: cf.br ^[[bb3:.*]]
52+
// CHECK-NEXT: ^[[bb3]]
53+
// CHECK-NEXT: return %[[cst]]
5754
// CHECK-NEXT: }
5855

5956
// -----
@@ -106,20 +103,17 @@ func.func @main() -> (tensor<i32>) attributes {} {
106103
}
107104

108105
// CHECK-LABEL: func @main()
109-
// CHECK-DAG: arith.constant 0
110-
// CHECK-DAG: arith.constant 10
111-
// CHECK: cf.br ^[[bb1:.*]](%{{.*}}: i32)
112-
// CHECK-NEXT: ^[[bb1]](%{{.*}}: i32):
113-
// CHECK-NEXT: arith.cmpi slt, %{{.*}}, %{{.*}}
114-
// CHECK-NEXT: cf.cond_br %{{.*}}, ^[[bb2:.*]](%{{.*}} : i32), ^bb3(%{{.*}} : i32)
115-
// CHECK-NEXT: ^[[bb2]](%{{.*}}: i32)
116-
// CHECK-NEXT: arith.addi %{{.*}}, %{{.*}}
117-
// CHECK-NEXT: cf.br ^[[bb3:.*]](%{{.*}} : i32)
118-
// CHECK-NEXT: ^[[bb3]](%{{.*}}: i32)
119-
// CHECK-NEXT: cf.br ^[[bb4:.*]](%{{.*}} : i32)
120-
// CHECK-NEXT: ^[[bb4]](%{{.*}}: i32)
121-
// CHECK-NEXT: tensor.from_elements %{{.*}} : tensor<i32>
122-
// CHECK-NEXT: return %{{.*}}
106+
// CHECK-DAG: %[[cst:.*]] = arith.constant dense<0>
107+
// CHECK-DAG: arith.constant true
108+
// CHECK: cf.br ^[[bb1:.*]]
109+
// CHECK-NEXT: ^[[bb1:.*]]:
110+
// CHECK-NEXT: cf.cond_br %{{.*}}, ^[[bb2:.*]], ^bb3
111+
// CHECK-NEXT: ^[[bb2]]:
112+
// CHECK-NEXT: cf.br ^[[bb3:.*]]
113+
// CHECK-NEXT: ^[[bb3]]:
114+
// CHECK-NEXT: cf.br ^[[bb4:.*]]
115+
// CHECK-NEXT: ^[[bb4]]:
116+
// CHECK-NEXT: return %[[cst]]
123117
// CHECK-NEXT: }
124118

125119
// -----
@@ -171,16 +165,13 @@ func.func @main() -> (tensor<i32>) attributes {} {
171165
}
172166

173167
// CHECK-LABEL: func @main()
174-
// CHECK-DAG: arith.constant 0
175-
// CHECK-DAG: arith.constant 10
176-
// CHECK: cf.br ^[[bb1:.*]](%{{.*}}: i32)
177-
// CHECK-NEXT: ^[[bb1]](%{{.*}}: i32):
178-
// CHECK-NEXT: arith.cmpi slt, %{{.*}}, %{{.*}}
179-
// CHECK-NEXT: cf.cond_br %{{.*}}, ^[[bb2:.*]](%{{.*}} : i32), ^bb2(%{{.*}} : i32)
180-
// CHECK-NEXT: ^[[bb2]](%{{.*}}: i32)
181-
// CHECK-NEXT: arith.addi %{{.*}}, %{{.*}}
182-
// CHECK-NEXT: cf.br ^[[bb3:.*]](%{{.*}} : i32)
183-
// CHECK-NEXT: ^[[bb3]](%{{.*}}: i32)
184-
// CHECK-NEXT: tensor.from_elements %{{.*}} : tensor<i32>
185-
// CHECK-NEXT: return %{{.*}}
168+
// CHECK-DAG: %[[cst:.*]] = arith.constant dense<10>
169+
// CHECK-DAG: arith.constant true
170+
// CHECK: cf.br ^[[bb1:.*]]
171+
// CHECK-NEXT: ^[[bb1]]:
172+
// CHECK-NEXT: cf.cond_br %{{.*}}, ^[[bb2:.*]], ^bb2
173+
// CHECK-NEXT: ^[[bb2]]
174+
// CHECK-NEXT: cf.br ^[[bb3:.*]]
175+
// CHECK-NEXT: ^[[bb3]]
176+
// CHECK-NEXT: return %[[cst]]
186177
// CHECK-NEXT: }

‎mlir/test/Dialect/Linalg/detensorize_while.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ func.func @main(%farg0: tensor<i32>, %farg1: tensor<i32>) -> tensor<i32> attribu
4646
// DET-ALL: cf.br ^[[bb1:.*]](%{{.*}} : i32)
4747
// DET-ALL: ^[[bb1]](%{{.*}}: i32)
4848
// DET-ALL: arith.cmpi slt, {{.*}}
49-
// DET-ALL: cf.cond_br {{.*}}, ^[[bb2:.*]](%{{.*}} : i32), ^[[bb3:.*]](%{{.*}} : i32)
50-
// DET-ALL: ^[[bb2]](%{{.*}}: i32)
49+
// DET-ALL: cf.cond_br {{.*}}, ^[[bb2:.*]], ^[[bb3:.*]]
50+
// DET-ALL: ^[[bb2]]
5151
// DET-ALL: arith.addi {{.*}}
5252
// DET-ALL: cf.br ^[[bb1]](%{{.*}} : i32)
53-
// DET-ALL: ^[[bb3]](%{{.*}}: i32)
53+
// DET-ALL: ^[[bb3]]:
5454
// DET-ALL: tensor.from_elements {{.*}}
5555
// DET-ALL: return %{{.*}} : tensor<i32>
5656

@@ -62,10 +62,10 @@ func.func @main(%farg0: tensor<i32>, %farg1: tensor<i32>) -> tensor<i32> attribu
6262
// DET-CF: cf.br ^[[bb1:.*]](%{{.*}} : i32)
6363
// DET-CF: ^[[bb1]](%{{.*}}: i32)
6464
// DET-CF: arith.cmpi slt, {{.*}}
65-
// DET-CF: cf.cond_br {{.*}}, ^[[bb2:.*]](%{{.*}} : i32), ^[[bb3:.*]](%{{.*}} : i32)
66-
// DET-CF: ^[[bb2]](%{{.*}}: i32)
65+
// DET-CF: cf.cond_br {{.*}}, ^[[bb2:.*]], ^[[bb3:.*]]
66+
// DET-CF: ^[[bb2]]:
6767
// DET-CF: arith.addi {{.*}}
6868
// DET-CF: cf.br ^[[bb1]](%{{.*}} : i32)
69-
// DET-CF: ^[[bb3]](%{{.*}}: i32)
69+
// DET-CF: ^[[bb3]]:
7070
// DET-CF: tensor.from_elements %{{.*}} : tensor<i32>
7171
// DET-CF: return %{{.*}} : tensor<i32>

‎mlir/test/Dialect/Linalg/detensorize_while_impure_cf.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ func.func @main(%farg0: tensor<10xi32>, %farg1: tensor<i32>) -> tensor<i32> attr
7474
// DET-ALL: } -> tensor<i32>
7575
// DET-ALL: tensor.extract %{{.*}}[] : tensor<i32>
7676
// DET-ALL: cmpi slt, %{{.*}}, %{{.*}} : i32
77-
// DET-ALL: cf.cond_br %{{.*}}, ^[[bb2:.*]](%{{.*}} : i32), ^[[bb3:.*]](%{{.*}} : i32)
78-
// DET-ALL: ^[[bb2]](%{{.*}}: i32)
77+
// DET-ALL: cf.cond_br %{{.*}}, ^[[bb2:.*]], ^[[bb3:.*]]
78+
// DET-ALL: ^[[bb2]]:
7979
// DET-ALL: tensor.from_elements %{{.*}} : tensor<i32>
8080
// DET-ALL: tensor.empty() : tensor<10xi32>
8181
// DET-ALL: linalg.generic {{{.*}}} ins(%{{.*}} : tensor<i32>) outs(%{{.*}} : tensor<10xi32>) {
8282
// DET-ALL: ^bb0(%{{.*}}: i32, %{{.*}}: i32):
8383
// DET-ALL: linalg.yield %{{.*}} : i32
8484
// DET-ALL: } -> tensor<10xi32>
8585
// DET-ALL: cf.br ^[[bb1]](%{{.*}} : tensor<10xi32>)
86-
// DET-ALL: ^[[bb3]](%{{.*}}: i32)
86+
// DET-ALL: ^[[bb3]]
8787
// DET-ALL: tensor.from_elements %{{.*}} : tensor<i32>
8888
// DET-ALL: return %{{.*}} : tensor<i32>
8989
// DET-ALL: }
@@ -95,10 +95,10 @@ func.func @main(%farg0: tensor<10xi32>, %farg1: tensor<i32>) -> tensor<i32> attr
9595
// DET-CF: %{{.*}} = linalg.generic {{{.*}}} ins(%{{.*}} : tensor<10xi32>) outs(%{{.*}} : tensor<i32>) {
9696
// DET-CF: tensor.extract %{{.*}}[] : tensor<i32>
9797
// DET-CF: cmpi slt, %{{.*}}, %{{.*}} : i32
98-
// DET-CF: cf.cond_br %{{.*}}, ^bb2(%{{.*}} : tensor<i32>), ^bb3(%{{.*}} : tensor<i32>)
99-
// DET-CF: ^bb2(%{{.*}}: tensor<i32>)
98+
// DET-CF: cf.cond_br %{{.*}}, ^bb2, ^bb3
99+
// DET-CF: ^bb2:
100100
// DET-CF: %{{.*}} = linalg.generic {{{.*}}} ins(%{{.*}} : tensor<i32>) outs(%{{.*}} : tensor<10xi32>) {
101101
// DET-CF: cf.br ^bb1(%{{.*}} : tensor<10xi32>)
102-
// DET-CF: ^bb3(%{{.*}}: tensor<i32>)
102+
// DET-CF: ^bb3:
103103
// DET-CF: return %{{.*}} : tensor<i32>
104104
// DET-CF: }

‎mlir/test/Dialect/Linalg/detensorize_while_pure_cf.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func.func @main() -> () attributes {} {
4949
// CHECK-NEXT: cf.br ^[[bb1:.*]](%{{.*}} : i32)
5050
// CHECK-NEXT: ^[[bb1]](%{{.*}}: i32)
5151
// CHECK-NEXT: %{{.*}} = arith.cmpi slt, %{{.*}}, %{{.*}}
52-
// CHECK-NEXT: cf.cond_br %{{.*}}, ^[[bb2:.*]](%{{.*}} : i32), ^[[bb3:.*]]
53-
// CHECK-NEXT: ^[[bb2]](%{{.*}}: i32)
52+
// CHECK-NEXT: cf.cond_br %{{.*}}, ^[[bb2:.*]], ^[[bb3:.*]]
53+
// CHECK-NEXT: ^[[bb2]]
5454
// CHECK-NEXT: %{{.*}} = arith.addi %{{.*}}, %{{.*}}
5555
// CHECK-NEXT: cf.br ^[[bb1]](%{{.*}} : i32)
5656
// CHECK-NEXT: ^[[bb3]]:

‎mlir/test/Transforms/canonicalize-dce.mlir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ func.func @f(%arg0: f32) {
137137
// Test case: Test the mechanics of deleting multiple block arguments.
138138

139139
// CHECK: func @f(%arg0: tensor<1xf32>, %arg1: tensor<2xf32>, %arg2: tensor<3xf32>, %arg3: tensor<4xf32>, %arg4: tensor<5xf32>)
140-
// CHECK-NEXT: "test.br"(%arg1, %arg3)[^bb1] : (tensor<2xf32>, tensor<4xf32>)
141-
// CHECK-NEXT: ^bb1([[VAL0:%.+]]: tensor<2xf32>, [[VAL1:%.+]]: tensor<4xf32>):
142-
// CHECK-NEXT: "foo.print"([[VAL0]])
143-
// CHECK-NEXT: "foo.print"([[VAL1]])
140+
// CHECK-NEXT: "test.br"()[^bb1]
141+
// CHECK-NEXT: ^bb1:
142+
// CHECK-NEXT: "foo.print"(%arg1)
143+
// CHECK-NEXT: "foo.print"(%arg3)
144144
// CHECK-NEXT: return
145145

146146

‎mlir/test/Transforms/make-isolated-from-above.mlir

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ func.func @make_isolated_from_above_multiple_blocks(%arg0 : index, %arg1 : index
7878
// CHECK-DAG: %[[D1:.+]] = tensor.dim %[[EMPTY]], %[[C1]]
7979
// CHECK: test.isolated_one_region_op %[[ARG2]], %[[C0]], %[[C1]], %[[D0]], %[[D1]]
8080
// CHECK-NEXT: ^bb0(%[[B0:[a-zA-Z0-9]+]]: index, %[[B1:[a-zA-Z0-9]+]]: index, %[[B2:[a-zA-Z0-9]+]]: index, %[[B3:[a-zA-Z0-9]+]]: index, %[[B4:[a-zA-Z0-9]+]]: index)
81-
// CHECK-NEXT: cf.br ^bb1(%[[B0]] : index)
82-
// CHECK: ^bb1(%[[B5:.+]]: index)
83-
// CHECK: "foo.yield"(%[[B1]], %[[B2]], %[[B3]], %[[B4]], %[[B5]])
81+
// CHECK-NEXT: cf.br ^bb1
82+
// CHECK: ^bb1:
83+
// CHECK: "foo.yield"(%[[B1]], %[[B2]], %[[B3]], %[[B4]], %[[B0]])
8484

8585
// CLONE1-LABEL: func @make_isolated_from_above_multiple_blocks(
8686
// CLONE1-SAME: %[[ARG0:[a-zA-Z0-9]+]]: index
@@ -95,9 +95,9 @@ func.func @make_isolated_from_above_multiple_blocks(%arg0 : index, %arg1 : index
9595
// CLONE1-NEXT: ^bb0(%[[B0:[a-zA-Z0-9]+]]: index, %[[B1:[a-zA-Z0-9]+]]: index, %[[B2:[a-zA-Z0-9]+]]: index)
9696
// CLONE1-DAG: %[[C0_0:.+]] = arith.constant 0 : index
9797
// CLONE1-DAG: %[[C1_0:.+]] = arith.constant 1 : index
98-
// CLONE1-NEXT: cf.br ^bb1(%[[B0]] : index)
99-
// CLONE1: ^bb1(%[[B3:.+]]: index)
100-
// CLONE1: "foo.yield"(%[[C0_0]], %[[C1_0]], %[[B1]], %[[B2]], %[[B3]])
98+
// CLONE1-NEXT: cf.br ^bb1
99+
// CLONE1: ^bb1:
100+
// CLONE1: "foo.yield"(%[[C0_0]], %[[C1_0]], %[[B1]], %[[B2]], %[[B0]])
101101

102102
// CLONE2-LABEL: func @make_isolated_from_above_multiple_blocks(
103103
// CLONE2-SAME: %[[ARG0:[a-zA-Z0-9]+]]: index
@@ -110,6 +110,6 @@ func.func @make_isolated_from_above_multiple_blocks(%arg0 : index, %arg1 : index
110110
// CLONE2-DAG: %[[EMPTY:.+]] = tensor.empty(%[[B1]], %[[B2]])
111111
// CLONE2-DAG: %[[D0:.+]] = tensor.dim %[[EMPTY]], %[[C0]]
112112
// CLONE2-DAG: %[[D1:.+]] = tensor.dim %[[EMPTY]], %[[C1]]
113-
// CLONE2-NEXT: cf.br ^bb1(%[[B0]] : index)
114-
// CLONE2: ^bb1(%[[B3:.+]]: index)
115-
// CLONE2: "foo.yield"(%[[C0]], %[[C1]], %[[D0]], %[[D1]], %[[B3]])
113+
// CLONE2-NEXT: cf.br ^bb1
114+
// CLONE2: ^bb1:
115+
// CLONE2: "foo.yield"(%[[C0]], %[[C1]], %[[D0]], %[[D1]], %[[B0]])

0 commit comments

Comments
 (0)