Flang lit test fixes

Author: ronlieb

flang/test/Transforms/DoConcurrent/basic_device.f90

@@ -61,7 +61,7 @@ program do_concurrent_basic
 
     ! CHECK-NEXT: omp.loop_nest (%[[ARG0:.*]]) : index = (%[[LB]]) to (%[[UB]]) inclusive step (%[[STEP]]) {
     ! CHECK-NEXT: %[[IV_IDX:.*]] = fir.convert %[[ARG0]] : (index) -> i32
-    ! CHECK-NEXT: fir.store %[[IV_IDX]] to %[[BINDING]]#1 : !fir.ref<i32>
+    ! CHECK-NEXT: fir.store %[[IV_IDX]] to %[[BINDING]]#0 : !fir.ref<i32>
     ! CHECK-NEXT: %[[IV_VAL1:.*]] = fir.load %[[BINDING]]#0 : !fir.ref<i32>
     ! CHECK-NEXT: %[[IV_VAL2:.*]] = fir.load %[[BINDING]]#0 : !fir.ref<i32>
     ! CHECK-NEXT: %[[IV_VAL_I64:.*]] = fir.convert %[[IV_VAL2]] : (i32) -> i64

flang/test/Transforms/DoConcurrent/basic_host.f90

@@ -29,7 +29,7 @@ program do_concurrent_basic
     ! CHECK: omp.wsloop {
     ! CHECK-NEXT: omp.loop_nest (%[[ARG0:.*]]) : index = (%[[LB]]) to (%[[UB]]) inclusive step (%[[STEP]]) {
     ! CHECK-NEXT: %[[IV_IDX:.*]] = fir.convert %[[ARG0]] : (index) -> i32
-    ! CHECK-NEXT: fir.store %[[IV_IDX]] to %[[BINDING]]#1 : !fir.ref<i32>
+    ! CHECK-NEXT: fir.store %[[IV_IDX]] to %[[BINDING]]#0 : !fir.ref<i32>
     ! CHECK-NEXT: %[[IV_VAL1:.*]] = fir.load %[[BINDING]]#0 : !fir.ref<i32>
     ! CHECK-NEXT: %[[IV_VAL2:.*]] = fir.load %[[BINDING]]#0 : !fir.ref<i32>
     ! CHECK-NEXT: %[[IV_VAL_I64:.*]] = fir.convert %[[IV_VAL2]] : (i32) -> i64

flang/test/Transforms/DoConcurrent/multiple_iteration_ranges.f90

@@ -102,13 +102,13 @@ program main
 ! COMMON-SAME:     step (%[[STEP_I]], %[[STEP_J]], %[[STEP_K]]) {
 
 ! COMMON-NEXT: %[[IV_IDX_I:.*]] = fir.convert %[[ARG0]]
-! COMMON-NEXT: fir.store %[[IV_IDX_I]] to %[[BINDING_I]]#1
+! COMMON-NEXT: fir.store %[[IV_IDX_I]] to %[[BINDING_I]]#0
 
 ! COMMON-NEXT: %[[IV_IDX_J:.*]] = fir.convert %[[ARG1]]
-! COMMON-NEXT: fir.store %[[IV_IDX_J]] to %[[BINDING_J]]#1
+! COMMON-NEXT: fir.store %[[IV_IDX_J]] to %[[BINDING_J]]#0
 
 ! COMMON-NEXT: %[[IV_IDX_K:.*]] = fir.convert %[[ARG2]]
-! COMMON-NEXT: fir.store %[[IV_IDX_K]] to %[[BINDING_K]]#1
+! COMMON-NEXT: fir.store %[[IV_IDX_K]] to %[[BINDING_K]]#0
 
 ! COMMON:      omp.yield
 ! COMMON-NEXT: }

flang/test/Transforms/DoConcurrent/not_perfectly_nested.f90

@@ -52,13 +52,13 @@ program main
 ! COMMON: omp.loop_nest ({{[^[:space:]]+}}) {{.*}} {
 ! COMMON:   fir.do_loop %[[J_IV:.*]] = {{.*}} {
 ! COMMON:     %[[J_IV_CONV:.*]] = fir.convert %[[J_IV]] : (index) -> i32
-! HOST:       fir.store %[[J_IV_CONV]] to %[[ORIG_J_DECL]]#1
-! DEVICE:     fir.store %[[J_IV_CONV]] to %[[TARGET_J_DECL]]#1
+! HOST:       fir.store %[[J_IV_CONV]] to %[[ORIG_J_DECL]]#0
+! DEVICE:     fir.store %[[J_IV_CONV]] to %[[TARGET_J_DECL]]#0
 
 ! COMMON:     fir.do_loop %[[K_IV:.*]] = {{.*}} {
 ! COMMON:       %[[K_IV_CONV:.*]] = fir.convert %[[K_IV]] : (index) -> i32
-! HOST:         fir.store %[[K_IV_CONV]] to %[[ORIG_K_DECL]]#1
-! DEVICE:       fir.store %[[K_IV_CONV]] to %[[TARGET_K_DECL]]#1
+! HOST:         fir.store %[[K_IV_CONV]] to %[[ORIG_K_DECL]]#0
+! DEVICE:       fir.store %[[K_IV_CONV]] to %[[TARGET_K_DECL]]#0
 ! COMMON:     }
 ! COMMON:   }
 ! COMMON: omp.yield

flang/test/Transforms/DoConcurrent/skip_all_nested_loops.f90

@@ -50,13 +50,13 @@ program main
 ! COMMON: omp.wsloop {
 ! COMMON: omp.loop_nest ({{[^[:space:]]+}}) {{.*}} {
 ! COMMON:   fir.do_loop {{.*}} iter_args(%[[J_IV:.*]] = {{.*}}) -> {{.*}} {
-! HOST:       fir.store %[[J_IV]] to %[[ORIG_J_DECL]]#1
-! DEVICE:     fir.store %[[J_IV]] to %[[TARGET_J_DECL]]#1
+! HOST:       fir.store %[[J_IV]] to %[[ORIG_J_DECL]]#0
+! DEVICE:     fir.store %[[J_IV]] to %[[TARGET_J_DECL]]#0
 
 ! COMMON:     fir.do_loop %[[K_IV:.*]] = {{.*}} {
 ! COMMON:       %[[K_IV_CONV:.*]] = fir.convert %[[K_IV]] : (index) -> i32
-! HOST:         fir.store %[[K_IV_CONV]] to %[[ORIG_K_DECL]]#1
-! DEVICE:       fir.store %[[K_IV_CONV]] to %[[TARGET_K_DECL]]#1
+! HOST:         fir.store %[[K_IV_CONV]] to %[[ORIG_K_DECL]]#0
+! DEVICE:       fir.store %[[K_IV_CONV]] to %[[TARGET_K_DECL]]#0
 ! COMMON:     }
 ! COMMON:   }
 ! COMMON: omp.yield