[rebase] add some CHECK-DAGs around constant creation in tests

Author: jeanPerier

flang/test/Lower/array-character.f90

@@ -4,12 +4,12 @@
 ! CHECK-SAME:                 %[[VAL_0:.*]]: !fir.boxchar<1>,
 ! CHECK-SAME:                 %[[VAL_1:.*]]: !fir.boxchar<1>) {
 subroutine issue(c1, c2)
-  ! CHECK: %[[VAL_2:.*]] = arith.constant false
-  ! CHECK: %[[VAL_3:.*]] = arith.constant 32 : i8
-  ! CHECK: %[[VAL_4:.*]] = arith.constant 3 : index
-  ! CHECK: %[[VAL_5:.*]] = arith.constant 4 : index
-  ! CHECK: %[[VAL_6:.*]] = arith.constant 0 : index
-  ! CHECK: %[[VAL_7:.*]] = arith.constant 1 : index
+  ! CHECK-DAG: %[[VAL_2:.*]] = arith.constant false
+  ! CHECK-DAG: %[[VAL_3:.*]] = arith.constant 32 : i8
+  ! CHECK-DAG: %[[VAL_4:.*]] = arith.constant 3 : index
+  ! CHECK-DAG: %[[VAL_5:.*]] = arith.constant 4 : index
+  ! CHECK-DAG: %[[VAL_6:.*]] = arith.constant 0 : index
+  ! CHECK-DAG: %[[VAL_7:.*]] = arith.constant 1 : index
   ! CHECK: %[[VAL_8:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
   ! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_8]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<!fir.array<3x!fir.char<1,4>>>
   ! CHECK: %[[VAL_10:.*]]:2 = fir.unboxchar %[[VAL_1]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
@@ -55,9 +55,9 @@ subroutine issue(c1, c2)
 
 ! CHECK-LABEL: func @_QQmain() {
 program p
-  ! CHECK: %[[VAL_0:.*]] = arith.constant 4 : index
-  ! CHECK: %[[VAL_1:.*]] = arith.constant 3 : index
-  ! CHECK: %[[VAL_2:.*]] = arith.constant -1 : i32
+  ! CHECK-DAG: %[[VAL_0:.*]] = arith.constant 4 : index
+  ! CHECK-DAG: %[[VAL_1:.*]] = arith.constant 3 : index
+  ! CHECK-DAG: %[[VAL_2:.*]] = arith.constant -1 : i32
   ! CHECK: %[[VAL_5:.*]] = fir.address_of(@_QEc1) : !fir.ref<!fir.array<3x!fir.char<1,4>>>
   ! CHECK: %[[VAL_6:.*]] = fir.address_of(@_QEc2) : !fir.ref<!fir.array<3x!fir.char<1,4>>>
   ! CHECK: %[[VAL_7:.*]] = fir.address_of(@_QQcl.{{.*}}) : !fir.ref<!fir.char<1,
@@ -91,12 +91,12 @@ end program p
 
 ! CHECK-LABEL: func @_QPcharlit() {
 subroutine charlit
-  ! CHECK: %[[VAL_0:.*]] = arith.constant -1 : i32
-  ! CHECK: %[[VAL_3:.*]] = arith.constant 3 : index
-  ! CHECK: %[[VAL_4:.*]] = arith.constant false
-  ! CHECK: %[[VAL_5:.*]] = arith.constant 4 : index
-  ! CHECK: %[[VAL_6:.*]] = arith.constant 0 : index
-  ! CHECK: %[[VAL_7:.*]] = arith.constant 1 : index
+  ! CHECK-DAG: %[[VAL_0:.*]] = arith.constant -1 : i32
+  ! CHECK-DAG: %[[VAL_3:.*]] = arith.constant 3 : index
+  ! CHECK-DAG: %[[VAL_4:.*]] = arith.constant false
+  ! CHECK-DAG: %[[VAL_5:.*]] = arith.constant 4 : index
+  ! CHECK-DAG: %[[VAL_6:.*]] = arith.constant 0 : index
+  ! CHECK-DAG: %[[VAL_7:.*]] = arith.constant 1 : index
   ! CHECK: %[[VAL_8:.*]] = fir.address_of(@_QQcl.{{.*}}) : !fir.ref<!fir.char<1,
   ! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_8]] : (!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
   ! CHECK: %[[VAL_10:.*]] = fir.call @_FortranAioBeginExternalListOutput(%[[VAL_0]], %[[VAL_9]], %{{.*}}) : (i32, !fir.ref<i8>, i32) -> !fir.ref<i8>

flang/test/Lower/array-constructor-2.f90

@@ -15,7 +15,7 @@ subroutine test1(a, b)
 
   !  Look at PARAMETER case
   ! CHECK: %{{.*}} = fir.address_of(@_QQro.4xi4.6a6af0eea868c84da59807d34f7e1a86) : !fir.ref<!fir.array<4xi32>>
-  b = arith.constant_array
+  b = constant_array
 end subroutine test1
 
 !  Dynamic array ctor with constant extent.

flang/test/Lower/array-elemental-calls-char.f90

@@ -215,11 +215,11 @@ elemental function elem_return_char(c)
 ! CHECK-LABEL: func @_QMchar_elemPfoo6(
 ! CHECK-SAME:                          %[[VAL_0:.*]]: !fir.boxchar<1>) {
 subroutine foo6(c)
-  ! CHECK: %[[VAL_1:.*]] = arith.constant false
-  ! CHECK: %[[VAL_2:.*]] = arith.constant 32 : i8
-  ! CHECK: %[[VAL_3:.*]] = arith.constant 10 : index
-  ! CHECK: %[[VAL_4:.*]] = arith.constant 0 : index
-  ! CHECK: %[[VAL_5:.*]] = arith.constant 1 : index
+  ! CHECK-DAG: %[[VAL_1:.*]] = arith.constant false
+  ! CHECK-DAG: %[[VAL_2:.*]] = arith.constant 32 : i8
+  ! CHECK-DAG: %[[VAL_3:.*]] = arith.constant 10 : index
+  ! CHECK-DAG: %[[VAL_4:.*]] = arith.constant 0 : index
+  ! CHECK-DAG: %[[VAL_5:.*]] = arith.constant 1 : index
   ! CHECK: %[[VAL_6:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
   ! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_6]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<!fir.array<10x!fir.char<1,?>>>
   ! CHECK: %[[VAL_8:.*]] = fir.shape %[[VAL_3]] : (index) -> !fir.shape<1>