Skip to content

Commit 888fe37

Browse files
josel-amdjosel-amd
committed
Beautify tests
1 parent ff55090 commit 888fe37

File tree

2 files changed

+42
-39
lines changed

2 files changed

+42
-39
lines changed

‎mlir/test/Conversion/SCFToEmitC/for.mlir‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,22 @@ func.func @for_yield_index(%arg0 : index, %arg1 : index, %arg2 : index) -> index
107107
return %r : index
108108
}
109109

110-
// CHECK: func.func @for_yield_index(%arg0: index, %arg1: index, %arg2: index) -> index {
111-
// CHECK: %0 = builtin.unrealized_conversion_cast %arg2 : index to !emitc.size_t
112-
// CHECK: %1 = builtin.unrealized_conversion_cast %arg1 : index to !emitc.size_t
113-
// CHECK: %2 = builtin.unrealized_conversion_cast %arg0 : index to !emitc.size_t
114-
// CHECK: %c0 = arith.constant 0 : index
115-
// CHECK: %3 = builtin.unrealized_conversion_cast %c0 : index to !emitc.size_t
116-
// CHECK: %4 = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.size_t
117-
// CHECK: emitc.assign %3 : !emitc.size_t to %4 : !emitc.size_t
118-
// CHECK: emitc.for %arg3 = %2 to %1 step %0 {
119-
// CHECK: %6 = builtin.unrealized_conversion_cast %4 : !emitc.size_t to index
120-
// CHECK: %7 = builtin.unrealized_conversion_cast %6 : index to !emitc.size_t
121-
// CHECK: emitc.assign %7 : !emitc.size_t to %4 : !emitc.size_t
110+
// CHECK-LABEL: func.func @for_yield_index(
111+
// CHECK-SAME: %[[ARG_0:.*]]: index, %[[ARG_1:.*]]: index, %[[ARG_2:.*]]: index) -> index {
112+
// CHECK: %[[VAL_0:.*]] = builtin.unrealized_conversion_cast %[[ARG_2]] : index to !emitc.size_t
113+
// CHECK: %[[VAL_1:.*]] = builtin.unrealized_conversion_cast %[[ARG_1]] : index to !emitc.size_t
114+
// CHECK: %[[VAL_2:.*]] = builtin.unrealized_conversion_cast %[[ARG_0]] : index to !emitc.size_t
115+
// CHECK: %[[C0:.*]] = arith.constant 0 : index
116+
// CHECK: %[[VAL_3:.*]] = builtin.unrealized_conversion_cast %[[C0]] : index to !emitc.size_t
117+
// CHECK: %[[VAL_4:.*]] = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.size_t
118+
// CHECK: emitc.assign %[[VAL_3]] : !emitc.size_t to %[[VAL_4]] : !emitc.size_t
119+
// CHECK: emitc.for %[[VAL_5:.*]] = %[[VAL_2]] to %[[VAL_1]] step %[[VAL_0]] {
120+
// CHECK: %[[VAL_6:.*]] = builtin.unrealized_conversion_cast %[[VAL_4]] : !emitc.size_t to index
121+
// CHECK: %[[VAL_7:.*]] = builtin.unrealized_conversion_cast %[[VAL_6]] : index to !emitc.size_t
122+
// CHECK: emitc.assign %[[VAL_7]] : !emitc.size_t to %[[VAL_4]] : !emitc.size_t
122123
// CHECK: }
123-
// CHECK: %5 = builtin.unrealized_conversion_cast %4 : !emitc.size_t to index
124-
// CHECK: return %5 : index
124+
// CHECK: %[[VAL_8:.*]] = builtin.unrealized_conversion_cast %[[VAL_4]] : !emitc.size_t to index
125+
// CHECK: return %[[VAL_8]] : index
125126
// CHECK: }
126127

127128

@@ -134,20 +135,21 @@ func.func @for_yield_update_loop_carried_var(%arg0 : index, %arg1 : index, %arg2
134135
return %r : index
135136
}
136137

137-
// CHECK: func.func @for_yield_update_loop_carried_var(%arg0: index, %arg1: index, %arg2: index) -> index {
138-
// CHECK: %0 = builtin.unrealized_conversion_cast %arg2 : index to !emitc.size_t
139-
// CHECK: %1 = builtin.unrealized_conversion_cast %arg1 : index to !emitc.size_t
140-
// CHECK: %2 = builtin.unrealized_conversion_cast %arg0 : index to !emitc.size_t
141-
// CHECK: %c0 = arith.constant 0 : index
142-
// CHECK: %3 = builtin.unrealized_conversion_cast %c0 : index to !emitc.size_t
143-
// CHECK: %4 = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.size_t
144-
// CHECK: emitc.assign %3 : !emitc.size_t to %4 : !emitc.size_t
145-
// CHECK: emitc.for %arg3 = %2 to %1 step %0 {
146-
// CHECK: %6 = builtin.unrealized_conversion_cast %4 : !emitc.size_t to index
147-
// CHECK: %7 = arith.addi %6, %6 : index
148-
// CHECK: %8 = builtin.unrealized_conversion_cast %7 : index to !emitc.size_t
149-
// CHECK: emitc.assign %8 : !emitc.size_t to %4 : !emitc.size_t
138+
// CHECK-LABEL: func.func @for_yield_update_loop_carried_var(
139+
// CHECK-SAME: %[[ARG_0:.*]]: index, %[[ARG_1:.*]]: index, %[[ARG_2:.*]]: index) -> index {
140+
// CHECK: %[[VAL_0:.*]] = builtin.unrealized_conversion_cast %[[ARG_2]] : index to !emitc.size_t
141+
// CHECK: %[[VAL_1:.*]] = builtin.unrealized_conversion_cast %[[ARG_1]] : index to !emitc.size_t
142+
// CHECK: %[[VAL_2:.*]] = builtin.unrealized_conversion_cast %[[ARG_0]] : index to !emitc.size_t
143+
// CHECK: %[[C0:.*]] = arith.constant 0 : index
144+
// CHECK: %[[VAL_3:.*]] = builtin.unrealized_conversion_cast %[[C0]] : index to !emitc.size_t
145+
// CHECK: %[[VAL_4:.*]] = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.size_t
146+
// CHECK: emitc.assign %[[VAL_3]] : !emitc.size_t to %[[VAL_4]] : !emitc.size_t
147+
// CHECK: emitc.for %[[ARG_3:.*]] = %[[VAL_2]] to %[[VAL_1]] step %[[VAL_0]] {
148+
// CHECK: %[[VAL_5:.*]] = builtin.unrealized_conversion_cast %[[VAL_4]] : !emitc.size_t to index
149+
// CHECK: %[[VAL_6:.*]] = arith.addi %[[VAL_5]], %[[VAL_5]] : index
150+
// CHECK: %[[VAL_8:.*]] = builtin.unrealized_conversion_cast %[[VAL_6]] : index to !emitc.size_t
151+
// CHECK: emitc.assign %[[VAL_8]] : !emitc.size_t to %[[VAL_4]] : !emitc.size_t
150152
// CHECK: }
151-
// CHECK: %5 = builtin.unrealized_conversion_cast %4 : !emitc.size_t to index
152-
// CHECK: return %5 : index
153+
// CHECK: %[[VAL_9:.*]] = builtin.unrealized_conversion_cast %[[VAL_4]] : !emitc.size_t to index
154+
// CHECK: return %[[VAL_9]] : index
153155
// CHECK: }

‎mlir/test/Conversion/SCFToEmitC/if.mlir‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func.func @test_if_yield(%arg0: i1, %arg1: f32) {
7272

7373
func.func @test_if_yield_index(%arg0: i1, %arg1: f32) {
7474
%0 = arith.constant 0 : index
75-
%1 = arith.constant 0 : index
75+
%1 = arith.constant 1 : index
7676
%x = scf.if %arg0 -> (index) {
7777
scf.yield %0 : index
7878
} else {
@@ -81,16 +81,17 @@ func.func @test_if_yield_index(%arg0: i1, %arg1: f32) {
8181
return
8282
}
8383

84-
// CHECK:func.func @test_if_yield_index(%arg0: i1, %arg1: f32) {
85-
// CHECK: %c0 = arith.constant 0 : index
86-
// CHECK: %c0_0 = arith.constant 0 : index
87-
// CHECK: %0 = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.size_t
88-
// CHECK: emitc.if %arg0 {
89-
// CHECK: %1 = builtin.unrealized_conversion_cast %c0 : index to !emitc.size_t
90-
// CHECK: emitc.assign %1 : !emitc.size_t to %0 : !emitc.size_t
84+
// CHECK: func.func @test_if_yield_index(
85+
// CHECK-SAME: %[[ARG_0:.*]]: i1, %[[ARG_1:.*]]: f32) {
86+
// CHECK: %[[C0:.*]] = arith.constant 0 : index
87+
// CHECK: %[[C1:.*]] = arith.constant 1 : index
88+
// CHECK: %[[VAL_0:.*]] = "emitc.variable"() <{value = #emitc.opaque<"">}> : () -> !emitc.size_t
89+
// CHECK: emitc.if %[[ARG_0]] {
90+
// CHECK: %[[VAL_1:.*]] = builtin.unrealized_conversion_cast %[[C0]] : index to !emitc.size_t
91+
// CHECK: emitc.assign %[[VAL_1]] : !emitc.size_t to %[[VAL_0]] : !emitc.size_t
9192
// CHECK: } else {
92-
// CHECK: %1 = builtin.unrealized_conversion_cast %c0_0 : index to !emitc.size_t
93-
// CHECK: emitc.assign %1 : !emitc.size_t to %0 : !emitc.size_t
93+
// CHECK: %[[VAL_2:.*]] = builtin.unrealized_conversion_cast %[[C1]] : index to !emitc.size_t
94+
// CHECK: emitc.assign %[[VAL_2]] : !emitc.size_t to %[[VAL_0]] : !emitc.size_t
9495
// CHECK: }
9596
// CHECK: return
9697
// CHECK: }

0 commit comments

Comments
 (0)