Skip to content

Commit 2b6bcf2

Browse files
NexMingNexMing
committed
Add a test that loop with multiple results.
1 parent 17dfda2 commit 2b6bcf2

File tree

1 file changed

+49
-28
lines changed

1 file changed

+49
-28
lines changed

‎flang/test/Fir/affine-promotion.fir

Lines changed: 49 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -132,49 +132,60 @@ func.func @loop_with_if(%a: !arr_d1, %v: f32) {
132132
// CHECK: return
133133
// CHECK: }
134134

135-
func.func @loop_with_result(%arg0: !fir.ref<!fir.array<100xf32>>, %arg1: !fir.ref<!fir.array<100x100xf32>>) -> f32 {
135+
func.func @loop_with_result(%arg0: !fir.ref<!fir.array<100xf32>>, %arg1: !fir.ref<!fir.array<100x100xf32>>, %arg2: !fir.ref<!fir.array<100xf32>>) -> f32 {
136136
%c1 = arith.constant 1 : index
137137
%cst = arith.constant 0.000000e+00 : f32
138138
%c100 = arith.constant 100 : index
139139
%0 = fir.shape %c100 : (index) -> !fir.shape<1>
140140
%1 = fir.shape %c100, %c100 : (index, index) -> !fir.shape<2>
141141
%2 = fir.alloca i32
142-
%3:2 = fir.do_loop %arg2 = %c1 to %c100 step %c1 iter_args(%arg3 = %cst) -> (index, f32) {
143-
%6 = fir.array_coor %arg0(%0) %arg2 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
144-
%7 = fir.load %6 : !fir.ref<f32>
145-
%8 = arith.addf %arg3, %7 fastmath<contract> : f32
146-
%9 = arith.addi %arg2, %c1 overflow<nsw> : index
147-
fir.result %9, %8 : index, f32
142+
%3:2 = fir.do_loop %arg3 = %c1 to %c100 step %c1 iter_args(%arg4 = %cst) -> (index, f32) {
143+
%8 = fir.array_coor %arg0(%0) %arg3 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
144+
%9 = fir.load %8 : !fir.ref<f32>
145+
%10 = arith.addf %arg4, %9 fastmath<contract> : f32
146+
%11 = arith.addi %arg3, %c1 overflow<nsw> : index
147+
fir.result %11, %10 : index, f32
148148
}
149-
%4:2 = fir.do_loop %arg2 = %c1 to %c100 step %c1 iter_args(%arg3 = %3#1) -> (index, f32) {
150-
%6 = fir.array_coor %arg1(%1) %c1, %arg2 : (!fir.ref<!fir.array<100x100xf32>>, !fir.shape<2>, index, index) -> !fir.ref<f32>
151-
%7 = fir.convert %6 : (!fir.ref<f32>) -> !fir.ref<!fir.array<100xf32>>
152-
%8 = fir.do_loop %arg4 = %c1 to %c100 step %c1 iter_args(%arg5 = %arg3) -> (f32) {
153-
%10 = fir.array_coor %7(%0) %arg4 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
154-
%11 = fir.load %10 : !fir.ref<f32>
155-
%12 = arith.addf %arg5, %11 fastmath<contract> : f32
156-
fir.result %12 : f32
149+
%4:2 = fir.do_loop %arg3 = %c1 to %c100 step %c1 iter_args(%arg4 = %3#1) -> (index, f32) {
150+
%8 = fir.array_coor %arg1(%1) %c1, %arg3 : (!fir.ref<!fir.array<100x100xf32>>, !fir.shape<2>, index, index) -> !fir.ref<f32>
151+
%9 = fir.convert %8 : (!fir.ref<f32>) -> !fir.ref<!fir.array<100xf32>>
152+
%10 = fir.do_loop %arg5 = %c1 to %c100 step %c1 iter_args(%arg6 = %arg4) -> (f32) {
153+
%12 = fir.array_coor %9(%0) %arg5 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
154+
%13 = fir.load %12 : !fir.ref<f32>
155+
%14 = arith.addf %arg6, %13 fastmath<contract> : f32
156+
fir.result %14 : f32
157157
}
158-
%9 = arith.addi %arg2, %c1 overflow<nsw> : index
159-
fir.result %9, %8 : index, f32
158+
%11 = arith.addi %arg3, %c1 overflow<nsw> : index
159+
fir.result %11, %10 : index, f32
160160
}
161-
%5 = fir.convert %4#0 : (index) -> i32
162-
fir.store %5 to %2 : !fir.ref<i32>
163-
return %4#1 : f32
161+
%5:2 = fir.do_loop %arg3 = %c1 to %c100 step %c1 iter_args(%arg4 = %4#1, %arg5 = %cst) -> (f32, f32) {
162+
%8 = fir.array_coor %arg0(%0) %arg3 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
163+
%9 = fir.load %8 : !fir.ref<f32>
164+
%10 = arith.addf %arg4, %9 fastmath<contract> : f32
165+
%11 = fir.array_coor %arg2(%0) %arg3 : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, index) -> !fir.ref<f32>
166+
%12 = fir.load %11 : !fir.ref<f32>
167+
%13 = arith.addf %arg5, %12 fastmath<contract> : f32
168+
fir.result %10, %13 : f32, f32
169+
}
170+
%6 = arith.addf %5#0, %5#1 fastmath<contract> : f32
171+
%7 = fir.convert %4#0 : (index) -> i32
172+
fir.store %7 to %2 : !fir.ref<i32>
173+
return %6 : f32
164174
}
165175

166176
// CHECK-LABEL: func.func @loop_with_result(
167177
// CHECK-SAME: %[[ARG0:.*]]: !fir.ref<!fir.array<100xf32>>,
168-
// CHECK-SAME: %[[ARG1:.*]]: !fir.ref<!fir.array<100x100xf32>>) -> f32 {
178+
// CHECK-SAME: %[[ARG1:.*]]: !fir.ref<!fir.array<100x100xf32>>,
179+
// CHECK-SAME: %[[ARG2:.*]]: !fir.ref<!fir.array<100xf32>>) -> f32 {
169180
// CHECK: %[[VAL_0:.*]] = arith.constant 1 : index
170181
// CHECK: %[[VAL_1:.*]] = arith.constant 0.000000e+00 : f32
171182
// CHECK: %[[VAL_2:.*]] = arith.constant 100 : index
172183
// CHECK: %[[VAL_3:.*]] = fir.shape %[[VAL_2]] : (index) -> !fir.shape<1>
173184
// CHECK: %[[VAL_4:.*]] = fir.shape %[[VAL_2]], %[[VAL_2]] : (index, index) -> !fir.shape<2>
174185
// CHECK: %[[VAL_5:.*]] = fir.alloca i32
175186
// CHECK: %[[VAL_6:.*]] = fir.convert %[[ARG0]] : (!fir.ref<!fir.array<100xf32>>) -> memref<?xf32>
176-
// CHECK: %[[VAL_7:.*]] = affine.for %[[VAL_8:.*]] = %[[VAL_0]] to #{{.*}}(){{\[}}%[[VAL_2]]] iter_args(%[[VAL_9:.*]] = %[[VAL_1]]) -> (f32) {
177-
// CHECK: %[[VAL_10:.*]] = affine.apply #{{.*}}(%[[VAL_8]]){{\[}}%[[VAL_0]], %[[VAL_2]], %[[VAL_0]]]
187+
// CHECK: %[[VAL_7:.*]] = affine.for %[[VAL_8:.*]] = %[[VAL_0]] to #[[$ATTR_3]](){{\[}}%[[VAL_2]]] iter_args(%[[VAL_9:.*]] = %[[VAL_1]]) -> (f32) {
188+
// CHECK: %[[VAL_10:.*]] = affine.apply #[[$ATTR_4]](%[[VAL_8]]){{\[}}%[[VAL_0]], %[[VAL_2]], %[[VAL_0]]]
178189
// CHECK: %[[VAL_11:.*]] = affine.load %[[VAL_6]]{{\[}}%[[VAL_10]]] : memref<?xf32>
179190
// CHECK: %[[VAL_12:.*]] = arith.addf %[[VAL_9]], %[[VAL_11]] fastmath<contract> : f32
180191
// CHECK: affine.yield %[[VAL_12]] : f32
@@ -183,16 +194,26 @@ func.func @loop_with_result(%arg0: !fir.ref<!fir.array<100xf32>>, %arg1: !fir.re
183194
// CHECK: %[[VAL_16:.*]] = fir.array_coor %[[ARG1]](%[[VAL_4]]) %[[VAL_0]], %[[VAL_14]] : (!fir.ref<!fir.array<100x100xf32>>, !fir.shape<2>, index, index) -> !fir.ref<f32>
184195
// CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_16]] : (!fir.ref<f32>) -> !fir.ref<!fir.array<100xf32>>
185196
// CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_17]] : (!fir.ref<!fir.array<100xf32>>) -> memref<?xf32>
186-
// CHECK: %[[VAL_19:.*]] = affine.for %[[VAL_20:.*]] = %[[VAL_0]] to #{{.*}}(){{\[}}%[[VAL_2]]] iter_args(%[[VAL_21:.*]] = %[[VAL_15]]) -> (f32) {
187-
// CHECK: %[[VAL_22:.*]] = affine.apply #{{.*}}(%[[VAL_20]]){{\[}}%[[VAL_0]], %[[VAL_2]], %[[VAL_0]]]
197+
// CHECK: %[[VAL_19:.*]] = affine.for %[[VAL_20:.*]] = %[[VAL_0]] to #[[$ATTR_3]](){{\[}}%[[VAL_2]]] iter_args(%[[VAL_21:.*]] = %[[VAL_15]]) -> (f32) {
198+
// CHECK: %[[VAL_22:.*]] = affine.apply #[[$ATTR_4]](%[[VAL_20]]){{\[}}%[[VAL_0]], %[[VAL_2]], %[[VAL_0]]]
188199
// CHECK: %[[VAL_23:.*]] = affine.load %[[VAL_18]]{{\[}}%[[VAL_22]]] : memref<?xf32>
189200
// CHECK: %[[VAL_24:.*]] = arith.addf %[[VAL_21]], %[[VAL_23]] fastmath<contract> : f32
190201
// CHECK: affine.yield %[[VAL_24]] : f32
191202
// CHECK: }
192203
// CHECK: %[[VAL_25:.*]] = arith.addi %[[VAL_14]], %[[VAL_0]] overflow<nsw> : index
193204
// CHECK: fir.result %[[VAL_25]], %[[VAL_19]] : index, f32
194205
// CHECK: }
195-
// CHECK: %[[VAL_26:.*]] = fir.convert %[[VAL_27:.*]]#0 : (index) -> i32
196-
// CHECK: fir.store %[[VAL_26]] to %[[VAL_5]] : !fir.ref<i32>
197-
// CHECK: return %[[VAL_27]]#1 : f32
206+
// CHECK: %[[VAL_26:.*]] = fir.convert %[[ARG2]] : (!fir.ref<!fir.array<100xf32>>) -> memref<?xf32>
207+
// CHECK: %[[VAL_27:.*]]:2 = affine.for %[[VAL_28:.*]] = %[[VAL_0]] to #[[$ATTR_3]](){{\[}}%[[VAL_2]]] iter_args(%[[VAL_29:.*]] = %[[VAL_30:.*]]#1, %[[VAL_31:.*]] = %[[VAL_1]]) -> (f32, f32) {
208+
// CHECK: %[[VAL_32:.*]] = affine.apply #[[$ATTR_4]](%[[VAL_28]]){{\[}}%[[VAL_0]], %[[VAL_2]], %[[VAL_0]]]
209+
// CHECK: %[[VAL_33:.*]] = affine.load %[[VAL_6]]{{\[}}%[[VAL_32]]] : memref<?xf32>
210+
// CHECK: %[[VAL_34:.*]] = arith.addf %[[VAL_29]], %[[VAL_33]] fastmath<contract> : f32
211+
// CHECK: %[[VAL_35:.*]] = affine.load %[[VAL_26]]{{\[}}%[[VAL_32]]] : memref<?xf32>
212+
// CHECK: %[[VAL_36:.*]] = arith.addf %[[VAL_31]], %[[VAL_35]] fastmath<contract> : f32
213+
// CHECK: affine.yield %[[VAL_34]], %[[VAL_36]] : f32, f32
214+
// CHECK: }
215+
// CHECK: %[[VAL_37:.*]] = arith.addf %[[VAL_38:.*]]#0, %[[VAL_38]]#1 fastmath<contract> : f32
216+
// CHECK: %[[VAL_39:.*]] = fir.convert %[[VAL_40:.*]]#0 : (index) -> i32
217+
// CHECK: fir.store %[[VAL_39]] to %[[VAL_5]] : !fir.ref<i32>
218+
// CHECK: return %[[VAL_37]] : f32
198219
// CHECK: }

0 commit comments

Comments
 (0)