Skip to content

Commit be31cff

Browse files
eugeneepshteyneugeneepshteyn
authored
[flang][NFC] Converted five tests from old lowering to new lowering (part 37) (llvm#188009)
Tests converted from test/Lower/Intrinsics: minval.f90, modulo.f90, move_alloc.f90, mvbits.f90, not.f90
1 parent 7152266 commit be31cff

5 files changed

Lines changed: 133 additions & 148 deletions

File tree

‎flang/test/Lower/Intrinsics/minval.f90‎

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,49 @@
1-
! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
1+
! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
22

33
! CHECK-LABEL: func @_QPminval_test(
44
! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32
55
integer function minval_test(a)
66
integer :: a(:)
7-
! CHECK-DAG: %[[c0:.*]] = arith.constant 0 : index
8-
! CHECK-DAG: %[[a2:.*]] = fir.absent !fir.box<i1>
9-
! CHECK-DAG: %[[a4:.*]] = fir.convert %[[arg0]] : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
10-
! CHECK: %[[a6:.*]] = fir.convert %[[c0]] : (index) -> i32
11-
! CHECK: %[[a7:.*]] = fir.convert %[[a2]] : (!fir.box<i1>) -> !fir.box<none>
7+
! CHECK: %[[a:.*]]:2 = hlfir.declare %[[arg0]] {{.*}} {uniq_name = "_QFminval_testEa"} : (!fir.box<!fir.array<?xi32>>, !fir.dscope) -> (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>)
8+
! CHECK: %[[res:.*]] = hlfir.minval %[[a]]#0 {{.*}} : (!fir.box<!fir.array<?xi32>>) -> i32
129
minval_test = minval(a)
13-
! CHECK: %{{.*}} = fir.call @_FortranAMinvalInteger4(%[[a4]], %{{.*}}, %{{.*}}, %[[a6]], %[[a7]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
1410
end function
1511

1612
! CHECK-LABEL: func @_QPminval_test2(
1713
! CHECK-SAME: %[[arg0:.*]]: !fir.ref<!fir.char<1>>{{.*}}, %[[arg1:.*]]: index{{.*}}, %[[arg2:.*]]: !fir.box<!fir.array<?x!fir.char<1>>>{{.*}}) -> !fir.boxchar<1>
1814
character function minval_test2(a)
1915
character :: a(:)
20-
! CHECK-DAG: %[[a0:.*]] = fir.alloca !fir.box<!fir.heap<!fir.char<1,?>>>
21-
! CHECK: %[[a1:.*]] = fir.absent !fir.box<i1>
22-
! CHECK-DAG: %[[a5:.*]] = fir.convert %[[a0]] : (!fir.ref<!fir.box<!fir.heap<!fir.char<1,?>>>>) -> !fir.ref<!fir.box<none>>
23-
! CHECK: %[[a6:.*]] = fir.convert %[[arg2]] : (!fir.box<!fir.array<?x!fir.char<1>>>) -> !fir.box<none>
24-
! CHECK-DAG: %[[a8:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
16+
! CHECK: %[[a:.*]]:2 = hlfir.declare %[[arg2]] typeparams {{.*}} {uniq_name = "_QFminval_test2Ea"} : (!fir.box<!fir.array<?x!fir.char<1>>>, index, !fir.dscope) -> (!fir.box<!fir.array<?x!fir.char<1>>>, !fir.box<!fir.array<?x!fir.char<1>>>)
17+
! CHECK: %[[res:.*]] = hlfir.minval %[[a]]#0 {{.*}} : (!fir.box<!fir.array<?x!fir.char<1>>>) -> !hlfir.expr<!fir.char<1>>
2518
minval_test2 = minval(a)
26-
! CHECK: fir.call @_FortranAMinvalCharacter(%[[a5]], %[[a6]], %{{.*}}, %{{.*}}, %[[a8]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.ref<i8>, i32, !fir.box<none>) -> ()
2719
end function
2820

2921
! CHECK-LABEL: func @_QPminval_test3(
3022
! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?x?xi32>>{{.*}}, %[[arg1:.*]]: !fir.box<!fir.array<?xi32>>{{.*}})
3123
subroutine minval_test3(a,r)
3224
integer :: a(:,:)
3325
integer :: r(:)
34-
! CHECK-DAG: %[[c2_i32:.*]] = arith.constant 2 : i32
35-
! CHECK-DAG: %[[a0:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?xi32>>>
36-
! CHECK: %[[a1:.*]] = fir.absent !fir.box<i1>
37-
! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a0]] : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
38-
! CHECK: %[[a7:.*]] = fir.convert %[[arg0]] : (!fir.box<!fir.array<?x?xi32>>) -> !fir.box<none>
39-
! CHECK-DAG: %[[a9:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
26+
! CHECK: %[[a:.*]]:2 = hlfir.declare %[[arg0]] {{.*}} {uniq_name = "_QFminval_test3Ea"} : (!fir.box<!fir.array<?x?xi32>>, !fir.dscope) -> (!fir.box<!fir.array<?x?xi32>>, !fir.box<!fir.array<?x?xi32>>)
27+
! CHECK: %[[r:.*]]:2 = hlfir.declare %[[arg1]] {{.*}} {uniq_name = "_QFminval_test3Er"} : (!fir.box<!fir.array<?xi32>>, !fir.dscope) -> (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>)
28+
! CHECK: %[[c2:.*]] = arith.constant 2 : i32
29+
! CHECK: %[[res:.*]] = hlfir.minval %[[a]]#0 dim %[[c2]] {{.*}} : (!fir.box<!fir.array<?x?xi32>>, i32) -> !hlfir.expr<?xi32>
30+
! CHECK: hlfir.assign %[[res]] to %[[r]]#0 : !hlfir.expr<?xi32>, !fir.box<!fir.array<?xi32>>
31+
! CHECK: hlfir.destroy %[[res]] : !hlfir.expr<?xi32>
4032
r = minval(a,dim=2)
41-
! CHECK: fir.call @_FortranAMinvalDim(%[[a6]], %[[a7]], %[[c2_i32]], %{{.*}}, %{{.*}}, %[[a9]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, !fir.ref<i8>, i32, !fir.box<none>) -> ()
42-
! CHECK: %[[a11:.*]] = fir.load %[[a0]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
43-
! CHECK-DAG: %[[a13:.*]] = fir.box_addr %[[a11]] : (!fir.box<!fir.heap<!fir.array<?xi32>>>) -> !fir.heap<!fir.array<?xi32>>
44-
! CHECK-DAG: fir.freemem %[[a13]]
4533
end subroutine
4634

4735
! CHECK-LABEL: func @_QPtest_minval_optional_scalar_mask(
48-
! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.logical<4>>
36+
! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.logical<4>>
4937
subroutine test_minval_optional_scalar_mask(mask, array)
5038
integer :: array(:)
5139
logical, optional :: mask
5240
print *, minval(array, mask)
53-
! CHECK: %[[VAL_7:.*]] = fir.is_present %[[VAL_1]] : (!fir.ref<!fir.logical<4>>) -> i1
54-
! CHECK: %[[VAL_8:.*]] = fir.embox %[[VAL_1]] : (!fir.ref<!fir.logical<4>>) -> !fir.box<!fir.logical<4>>
55-
! CHECK: %[[VAL_9:.*]] = fir.absent !fir.box<!fir.logical<4>>
56-
! CHECK: %[[VAL_10:.*]] = arith.select %[[VAL_7]], %[[VAL_8]], %[[VAL_9]] : !fir.box<!fir.logical<4>>
57-
! CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_10]] : (!fir.box<!fir.logical<4>>) -> !fir.box<none>
58-
! CHECK: fir.call @_FortranAMinvalInteger4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_17]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
41+
! CHECK: %[[mask_decl:.*]]:2 = hlfir.declare %[[VAL_0]] {{.*}} {fortran_attrs = #fir.var_attrs<optional>, uniq_name = "_QFtest_minval_optional_scalar_maskEmask"} : (!fir.ref<!fir.logical<4>>, !fir.dscope) -> (!fir.ref<!fir.logical<4>>, !fir.ref<!fir.logical<4>>)
42+
! CHECK: %[[present:.*]] = fir.is_present %[[mask_decl]]#0 : (!fir.ref<!fir.logical<4>>) -> i1
43+
! CHECK: %[[box:.*]] = fir.embox %[[mask_decl]]#0 : (!fir.ref<!fir.logical<4>>) -> !fir.box<!fir.logical<4>>
44+
! CHECK: %[[absent:.*]] = fir.absent !fir.box<!fir.logical<4>>
45+
! CHECK: %[[mask:.*]] = arith.select %[[present]], %[[box]], %[[absent]] : !fir.box<!fir.logical<4>>
46+
! CHECK: hlfir.minval {{.*}} mask %[[mask]] {{.*}} : (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.logical<4>>) -> i32
5947
end subroutine
6048

6149
! CHECK-LABEL: func @_QPtest_minval_optional_array_mask(
@@ -64,6 +52,9 @@ subroutine test_minval_optional_array_mask(mask, array)
6452
integer :: array(:)
6553
logical, optional :: mask(:)
6654
print *, minval(array, mask)
67-
! CHECK: %[[VAL_13:.*]] = fir.convert %[[VAL_0]] : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
68-
! CHECK: fir.call @_FortranAMinvalInteger4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_13]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
55+
! CHECK: %[[mask_decl:.*]]:2 = hlfir.declare %[[VAL_0]] {{.*}} {fortran_attrs = #fir.var_attrs<optional>, uniq_name = "_QFtest_minval_optional_array_maskEmask"} : (!fir.box<!fir.array<?x!fir.logical<4>>>, !fir.dscope) -> (!fir.box<!fir.array<?x!fir.logical<4>>>, !fir.box<!fir.array<?x!fir.logical<4>>>)
56+
! CHECK: %[[present:.*]] = fir.is_present %[[mask_decl]]#0 : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> i1
57+
! CHECK: %[[absent:.*]] = fir.absent !fir.box<!fir.array<?x!fir.logical<4>>>
58+
! CHECK: %[[mask:.*]] = arith.select %[[present]], %[[mask_decl]]#1, %[[absent]] : !fir.box<!fir.array<?x!fir.logical<4>>>
59+
! CHECK: hlfir.minval {{.*}} mask %[[mask]] {{.*}} : (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?x!fir.logical<4>>>) -> i32
6960
end subroutine

‎flang/test/Lower/Intrinsics/modulo.f90‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s -check-prefixes=HONORINF,ALL
2-
! RUN: %flang_fc1 -menable-no-infs -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s -check-prefixes=CHECK,ALL,%if flang-supports-f128-math %{F128%} %else %{F64%}
1+
! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s -check-prefixes=HONORINF,ALL
2+
! RUN: %flang_fc1 -menable-no-infs -emit-hlfir %s -o - | FileCheck %s -check-prefixes=CHECK,ALL,%if flang-supports-f128-math %{F128%} %else %{F64%}
33

44
! ALL-LABEL: func @_QPmodulo_testr(
55
! ALL-SAME: %[[arg0:.*]]: !fir.ref<f64>{{.*}}, %[[arg1:.*]]: !fir.ref<f64>{{.*}}, %[[arg2:.*]]: !fir.ref<f64>{{.*}}) {
66
subroutine modulo_testr(r, a, p)
77
real(8) :: r, a, p
8-
! ALL-DAG: %[[a:.*]] = fir.load %[[arg1]] : !fir.ref<f64>
9-
! ALL-DAG: %[[p:.*]] = fir.load %[[arg2]] : !fir.ref<f64>
8+
! ALL: %[[a_decl:.*]]:2 = hlfir.declare %[[arg1]] {{.*}} {uniq_name = "_QFmodulo_testrEa"} : (!fir.ref<f64>, !fir.dscope) -> (!fir.ref<f64>, !fir.ref<f64>)
9+
! ALL: %[[p_decl:.*]]:2 = hlfir.declare %[[arg2]] {{.*}} {uniq_name = "_QFmodulo_testrEp"} : (!fir.ref<f64>, !fir.dscope) -> (!fir.ref<f64>, !fir.ref<f64>)
10+
! ALL: %[[r_decl:.*]]:2 = hlfir.declare %[[arg0]] {{.*}} {uniq_name = "_QFmodulo_testrEr"} : (!fir.ref<f64>, !fir.dscope) -> (!fir.ref<f64>, !fir.ref<f64>)
11+
! ALL-DAG: %[[a:.*]] = fir.load %[[a_decl]]#0 : !fir.ref<f64>
12+
! ALL-DAG: %[[p:.*]] = fir.load %[[p_decl]]#0 : !fir.ref<f64>
1013
! HONORINF: %[[res:.*]] = fir.call @_FortranAModuloReal8(%[[a]], %[[p]]
1114
! CHECK-DAG: %[[rem:.*]] = arith.remf %[[a]], %[[p]] {{.*}}: f64
1215
! CHECK-DAG: %[[zero:.*]] = arith.constant 0.000000e+00 : f64
@@ -17,24 +20,27 @@ subroutine modulo_testr(r, a, p)
1720
! CHECK-DAG: %[[mustAddP:.*]] = arith.andi %[[remNotZero]], %[[signDifferent]] : i1
1821
! CHECK-DAG: %[[remPlusP:.*]] = arith.addf %[[rem]], %[[p]] {{.*}}: f64
1922
! CHECK: %[[res:.*]] = arith.select %[[mustAddP]], %[[remPlusP]], %[[rem]] : f64
20-
! ALL: fir.store %[[res]] to %[[arg0]] : !fir.ref<f64>
23+
! ALL: hlfir.assign %[[res]] to %[[r_decl]]#0 : f64, !fir.ref<f64>
2124
r = modulo(a, p)
2225
end subroutine
2326

2427
! ALL-LABEL: func @_QPmodulo_testi(
2528
! ALL-SAME: %[[arg0:.*]]: !fir.ref<i64>{{.*}}, %[[arg1:.*]]: !fir.ref<i64>{{.*}}, %[[arg2:.*]]: !fir.ref<i64>{{.*}}) {
2629
subroutine modulo_testi(r, a, p)
2730
integer(8) :: r, a, p
28-
! CHECK-DAG: %[[a:.*]] = fir.load %[[arg1]] : !fir.ref<i64>
29-
! CHECK-DAG: %[[p:.*]] = fir.load %[[arg2]] : !fir.ref<i64>
30-
! CHECK-DAG: %[[rem:.*]] = arith.remsi %[[a]], %[[p]] : i64
31-
! CHECK-DAG: %[[argXor:.*]] = arith.xori %[[a]], %[[p]] : i64
32-
! CHECK-DAG: %[[signDifferent:.*]] = arith.cmpi slt, %[[argXor]], %c0{{.*}} : i64
33-
! CHECK-DAG: %[[remNotZero:.*]] = arith.cmpi ne, %[[rem]], %c0{{.*}} : i64
34-
! CHECK-DAG: %[[mustAddP:.*]] = arith.andi %[[remNotZero]], %[[signDifferent]] : i1
35-
! CHECK-DAG: %[[remPlusP:.*]] = arith.addi %[[rem]], %[[p]] : i64
36-
! CHECK: %[[res:.*]] = arith.select %[[mustAddP]], %[[remPlusP]], %[[rem]] : i64
37-
! CHECK: fir.store %[[res]] to %[[arg0]] : !fir.ref<i64>
31+
! ALL: %[[a_decl:.*]]:2 = hlfir.declare %[[arg1]] {{.*}} {uniq_name = "_QFmodulo_testiEa"} : (!fir.ref<i64>, !fir.dscope) -> (!fir.ref<i64>, !fir.ref<i64>)
32+
! ALL: %[[p_decl:.*]]:2 = hlfir.declare %[[arg2]] {{.*}} {uniq_name = "_QFmodulo_testiEp"} : (!fir.ref<i64>, !fir.dscope) -> (!fir.ref<i64>, !fir.ref<i64>)
33+
! ALL: %[[r_decl:.*]]:2 = hlfir.declare %[[arg0]] {{.*}} {uniq_name = "_QFmodulo_testiEr"} : (!fir.ref<i64>, !fir.dscope) -> (!fir.ref<i64>, !fir.ref<i64>)
34+
! ALL-DAG: %[[a:.*]] = fir.load %[[a_decl]]#0 : !fir.ref<i64>
35+
! ALL-DAG: %[[p:.*]] = fir.load %[[p_decl]]#0 : !fir.ref<i64>
36+
! ALL-DAG: %[[rem:.*]] = arith.remsi %[[a]], %[[p]] : i64
37+
! ALL-DAG: %[[argXor:.*]] = arith.xori %[[a]], %[[p]] : i64
38+
! ALL-DAG: %[[signDifferent:.*]] = arith.cmpi slt, %[[argXor]], %c0{{.*}} : i64
39+
! ALL-DAG: %[[remNotZero:.*]] = arith.cmpi ne, %[[rem]], %c0{{.*}} : i64
40+
! ALL-DAG: %[[mustAddP:.*]] = arith.andi %[[remNotZero]], %[[signDifferent]] : i1
41+
! ALL-DAG: %[[remPlusP:.*]] = arith.addi %[[rem]], %[[p]] : i64
42+
! ALL: %[[res:.*]] = arith.select %[[mustAddP]], %[[remPlusP]], %[[rem]] : i64
43+
! ALL: hlfir.assign %[[res]] to %[[r_decl]]#0 : i64, !fir.ref<i64>
3844
r = modulo(a, p)
3945
end subroutine
4046

@@ -45,6 +51,6 @@ subroutine modulo_testr16(r, a, p)
4551
integer, parameter :: rk = merge(16, 8, selected_real_kind(33, 4931)==16)
4652
real(rk) :: r, a, p
4753
!F128: fir.call @_FortranAModuloReal16({{.*}}){{.*}}: (f128, f128, !fir.ref<i8>, i32) -> f128
48-
!F64: arith.remf %0, %1 fastmath<ninf,contract> : f64
54+
!F64: arith.remf %{{.*}}, %{{.*}} fastmath<ninf,contract> : f64
4955
r = modulo(a, p)
5056
end subroutine

0 commit comments

Comments
 (0)