Skip to content

Commit cd16b80

Browse files
tpoppcopybara-github
tpopp
authored and
copybara-github
committed
[mlir] Test using CHECK-DAG for all constant ops
PiperOrigin-RevId: 395658334
1 parent bd7e4a0 commit cd16b80

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎test/inline_trivial_sair_ops.mlir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// CHECK-LABEL: @one_map
44
func @one_map() -> f32 {
5-
// CHECK: %[[v0:.*]] = constant 1.0
5+
// CHECK-DAG: %[[v0:.*]] = constant 1.0
66
%0 = constant 1.0 : f32
77
// CHECK-NOT: sair.program
88
%1 = sair.program {
@@ -25,7 +25,7 @@ func @one_map() -> f32 {
2525

2626
// CHECK-LABEL: @sequence
2727
func @sequence() -> f32 {
28-
// CHECK: %[[v0:.*]] = constant 1.0
28+
// CHECK-DAG: %[[v0:.*]] = constant 1.0
2929
%0 = constant 1.0 : f32
3030
// CHECK-NOT: sair.program
3131
%6 = sair.program {

‎test/introduce_loops.mlir‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,13 @@ func @dependent_dims() {
235235
}]
236236
} {
237237
^bb0(%arg0: index):
238-
// CHECK: %[[V4:.*]] = constant 8
238+
// CHECK-DAG: %[[V4:.*]] = constant 8
239239
%4 = constant 8 : index
240240
// CHECK: %[[V5:.*]] = addi %[[V3]], %[[V4]]
241241
%5 = addi %arg0, %4 : index
242242
sair.return %arg0, %5 : index, index
243243
} : #sair.shape<d0:static_range<64, 8>>, () -> (index, index)
244-
// CHECK: %[[V6:.*]] = constant 1
244+
// CHECK-DAG: %[[V6:.*]] = constant 1
245245
%3 = sair.dyn_range[d0:%0] %1(d0), %2(d0) : !sair.dyn_range<d0:static_range<64, 8>>
246246
// CHECK: scf.for %[[V7:.*]] = %[[V3]] to %[[V5]] step %[[V6]] {
247247
sair.map[d0:%0, d1:%3] attributes {
@@ -299,7 +299,7 @@ func @partial_unroll() {
299299
%0 = sair.static_range : !sair.static_range<5>
300300
// CHECK: sair.map
301301
// CHECK-SAME: loop_nest = []
302-
// CHECK: %[[STEP:.*]] = constant 2 : index
302+
// CHECK-DAG: %[[STEP:.*]] = constant 2 : index
303303
// CHECK: scf.for %{{.*}} = %{{.*}} to %{{.*}} step %[[STEP]] {
304304
// CHECK-COUNT-2: call @baz()
305305
// CHECK: }

‎test/lower_to_map.mlir‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func @load_from_memref(%arg0 : memref<?x?xf32>) {
105105
// CHECK: = sair.map[d0:%{{.*}}, d1:%{{.*}}, d2:%{{.*}}] %{{.*}}, %{{.*}}#0(d0), %{{.*}}#1(d0)
106106
// CHECK: ^{{.*}}(%[[ARG1:.*]]: index, %[[ARG2:.*]]: index, %[[ARG3:.*]]: index, %[[MEMREF:.*]]: memref<?x?xf32>, %[[ARG4:.*]]: index, %[[ARG5:.*]]: index):
107107
// CHECK: %[[I0:.*]] = affine.apply affine_map<(d0, d1, d2)[s0] -> (d2 - s0)>(%[[ARG1]], %[[ARG2]], %[[ARG3]])[%[[ARG4]]]
108-
// CHECK: %[[C0:.*]] = constant 0
108+
// CHECK-DAG: %[[C0:.*]] = constant 0
109109
// CHECK: %[[I1:.*]] = affine.apply affine_map<(d0, d1, d2)[s0] -> ((d1 - s0) floordiv 2)>(%[[ARG1]], %[[ARG2]], %[[ARG3]])[%[[C0]]]
110110
// CHECK: %[[VALUE:.*]] = memref.load %[[MEMREF]][%[[I0]], %[[I1]]] : memref<?x?xf32>
111111
// CHECK: sair.return %[[VALUE]] : f32
@@ -132,9 +132,9 @@ func @store_to_memref(%arg0 : f32, %arg1 : memref<?x?xf32>) {
132132

133133
// CHECK: sair.map[d0:%{{.*}}, d1:%{{.*}}, d2:%{{.*}}] %{{.*}}, %{{.*}}(d0, d1, d2)
134134
// CHECK: ^{{.*}}(%[[ARG1:.*]]: index, %[[ARG2:.*]]: index, %[[ARG3:.*]]: index, %[[MEMREF:.*]]: memref<?x?xf32>, %[[VALUE:.*]]: f32):
135-
// CHECK: %[[C0_0:.*]] = constant 0
135+
// CHECK-DAG: %[[C0_0:.*]] = constant 0
136136
// CHECK: %[[I0:.*]] = affine.apply affine_map<(d0, d1, d2)[s0] -> (d2 - s0)>(%[[ARG1]], %[[ARG2]], %[[ARG3]])[%[[C0_0]]]
137-
// CHECK: %[[C0_1:.*]] = constant 0
137+
// CHECK-DAG: %[[C0_1:.*]] = constant 0
138138
// CHECK: %[[I1:.*]] = affine.apply affine_map<(d0, d1, d2)[s0] -> (d1 - s0)>(%[[ARG1]], %[[ARG2]], %[[ARG3]])[%[[C0_1]]]
139139
// CHECK: memref.store %[[VALUE]], %[[MEMREF]][%[[I0]], %[[I1]]]
140140
// CHECK: sair.return

‎test/materialize_buffers.mlir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ func @loop_nest(%arg0: f32) {
126126
// CHECK: } {
127127
// CHECK: ^{{.*}}(%[[ARG0:.*]]: index):
128128
// CHECK: %[[V1:.*]] = affine.apply affine_map<(d0) -> (d0)>(%[[ARG0]])
129-
// CHECK: %[[C4:.*]] = constant 4
129+
// CHECK-DAG: %[[C4:.*]] = constant 4
130130
// CHECK: %[[V2:.*]] = addi %[[V1]], %[[C4]]
131-
// CHECK: %[[C16:.*]] = constant 16
131+
// CHECK-DAG: %[[C16:.*]] = constant 16
132132
// CHECK: %[[V3:.*]] = cmpi ult, %[[C16]], %[[V2]]
133133
// CHECK: %[[V4:.*]] = select %[[V3]], %[[C16]], %[[V2]]
134134
// CHECK: %[[V5:.*]] = affine.apply affine_map<(d0, d1) -> (d1 - d0)>

‎test/normalize_loops.mlir‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ func @stripe() {
4747
// CHECK: loop_nest = [{iter = #sair.mapping_expr<d0>, name = "loopA"}]
4848
// CHECK: ^bb0(%[[ARG0:.*]]: index):
4949
// CHECK: %[[V1:.*]] = affine.apply affine_map<(d0) -> (d0)>(%arg0)
50-
// CHECK: %[[V2:.*]] = constant 4 : index
50+
// CHECK-DAG: %[[V2:.*]] = constant 4 : index
5151
// CHECK: %[[V3:.*]] = addi %[[V1]], %[[V2]] : index
52-
// CHECK: %[[V4:.*]] = constant 62 : index
52+
// CHECK-DAG: %[[V4:.*]] = constant 62 : index
5353
// CHECK: %[[V5:.*]] = cmpi ult, %[[V4]], %[[V3]] : index
5454
// CHECK: %[[V6:.*]] = select %[[V5]], %[[V4]], %[[V3]] : index
5555
// CHECK: sair.return %[[V1]], %[[V6]] : index, index
@@ -243,9 +243,9 @@ func @sequence_attr(%arg0: f32) {
243243
// CHECK-SAME: sequence = 0
244244
// CHECK: ^{{.*}}(%[[ARG:.*]]: index):
245245
// CHECK: %[[V1:.*]] = affine.apply affine_map<(d0) -> (d0)>(%[[ARG]])
246-
// CHECK: %[[C4:.*]] = constant 4
246+
// CHECK-DAG: %[[C4:.*]] = constant 4
247247
// CHECK: %[[V2:.*]] = addi %[[V1]], %[[C4]]
248-
// CHECK: %[[C16:.*]] = constant 16
248+
// CHECK-DAG: %[[C16:.*]] = constant 16
249249
// CHECK: %[[V3:.*]] = cmpi ult, %[[C16]], %[[V2]]
250250
// CHECK: %[[V4:.*]] = select %[[V3]], %[[C16]], %[[V2]]
251251
// CHECK: sair.return %[[V1]], %[[V4]]
@@ -345,9 +345,9 @@ func @sequence_attr_inversion(%arg0: f32) {
345345
// CHECK-SAME: sequence = 0
346346
// CHECK: ^{{.*}}(%[[ARG:.*]]: index):
347347
// CHECK: %[[V1:.*]] = affine.apply affine_map<(d0) -> (d0)>(%[[ARG]])
348-
// CHECK: %[[C4:.*]] = constant 4
348+
// CHECK-DAG: %[[C4:.*]] = constant 4
349349
// CHECK: %[[V2:.*]] = addi %[[V1]], %[[C4]]
350-
// CHECK: %[[C16:.*]] = constant 16
350+
// CHECK-DAG: %[[C16:.*]] = constant 16
351351
// CHECK: %[[V3:.*]] = cmpi ult, %[[C16]], %[[V2]]
352352
// CHECK: %[[V4:.*]] = select %[[V3]], %[[C16]], %[[V2]]
353353
// CHECK: sair.return %[[V1]], %[[V4]]

‎test/roundtrip.mlir‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ func @map_reduce(%arg0 : f32, %arg1 : i32, %arg2 : f64) {
369369

370370
// CHECK-LABEL: @from_scalar
371371
func @from_scalar() {
372-
// CHECK: %[[V0:.*]] = constant 1 : index
372+
// CHECK-DAG: %[[V0:.*]] = constant 1 : index
373373
%0 = constant 1 : index
374374
sair.program {
375375
// CHECK: %{{.*}} sair.from_scalar %[[V0]] : !sair.value<(), index>

0 commit comments

Comments
 (0)