[flang-commits] [flang] [flang][NFC] Converted five tests from old lowering to new lowering (part 18) (PR #182439)
Eugene Epshteyn via flang-commits
flang-commits at lists.llvm.org
Thu Feb 19 21:37:51 PST 2026
https://github.com/eugeneepshteyn created https://github.com/llvm/llvm-project/pull/182439
Tests converted from test/Lower/forall: forall-allocatable.f90, forall-allocatable-2.f90, forall-array.f90, forall-construct-2.f90, forall-construct-3.f90
>From 9f2c95d61a23a5e133ccef9f85a46b7241f1663f Mon Sep 17 00:00:00 2001
From: Eugene Epshteyn <eepshteyn at nvidia.com>
Date: Fri, 20 Feb 2026 00:34:43 -0500
Subject: [PATCH] [flang][NFC] Converted five tests from old lowering to new
lowering (part 18)
Tests converted from test/Lower/forall: forall-allocatable.f90,
forall-allocatable-2.f90, forall-array.f90, forall-construct-2.f90,
forall-construct-3.f90
---
.../Lower/forall/forall-allocatable-2.f90 | 68 +++---
.../test/Lower/forall/forall-allocatable.f90 | 69 +++---
flang/test/Lower/forall/forall-array.f90 | 83 ++++---
.../test/Lower/forall/forall-construct-2.f90 | 184 ++++++--------
.../test/Lower/forall/forall-construct-3.f90 | 224 +++++++-----------
5 files changed, 266 insertions(+), 362 deletions(-)
diff --git a/flang/test/Lower/forall/forall-allocatable-2.f90 b/flang/test/Lower/forall/forall-allocatable-2.f90
index 16bfc286d9482..3fb4aa17f45e6 100644
--- a/flang/test/Lower/forall/forall-allocatable-2.f90
+++ b/flang/test/Lower/forall/forall-allocatable-2.f90
@@ -1,6 +1,6 @@
! Test forall lowering
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
subroutine forall_with_allocatable2(a1)
real :: a1(:)
@@ -14,42 +14,36 @@ subroutine forall_with_allocatable2(a1)
end forall
end subroutine forall_with_allocatable2
-! CHECK-LABEL: func @_QPforall_with_allocatable2(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?xf32>>{{.*}}) {
-! CHECK: %[[VAL_1:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"}
-! CHECK: %[[VAL_2:.*]] = fir.alloca !fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}> {bindc_name = "thing", uniq_name = "_QFforall_with_allocatable2Ething"}
-! CHECK: %[[ADDR:.*]] = fir.address_of(@_QQ_QFforall_with_allocatable2Tt.DerivedInit) : !fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
-! CHECK: fir.copy %[[ADDR]] to %[[VAL_2]] no_overlap : !fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
-! CHECK: %[[VAL_9:.*]] = arith.constant 5 : i32
-! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_9]] : (i32) -> index
-! CHECK: %[[VAL_11:.*]] = arith.constant 15 : i32
-! CHECK: %[[VAL_12:.*]] = fir.convert %[[VAL_11]] : (i32) -> index
-! CHECK: %[[VAL_13:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_15:.*]] = fir.coordinate_of %[[VAL_2]], arr : (!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>) -> !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
-! CHECK: %[[VAL_16:.*]] = fir.load %[[VAL_15]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
-! CHECK: %[[VAL_17:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_18:.*]]:3 = fir.box_dims %[[VAL_16]], %[[VAL_17]] : (!fir.box<!fir.heap<!fir.array<?xf32>>>, index) -> (index, index, index)
-! CHECK: %[[VAL_19:.*]] = fir.box_addr %[[VAL_16]] : (!fir.box<!fir.heap<!fir.array<?xf32>>>) -> !fir.heap<!fir.array<?xf32>>
-! CHECK: %[[VAL_20:.*]] = fir.shape_shift %[[VAL_18]]#0, %[[VAL_18]]#1 : (index, index) -> !fir.shapeshift<1>
-! CHECK: %[[VAL_21:.*]] = fir.array_load %[[VAL_19]](%[[VAL_20]]) : (!fir.heap<!fir.array<?xf32>>, !fir.shapeshift<1>) -> !fir.array<?xf32>
-! CHECK: %[[VAL_22:.*]] = fir.array_load %[[VAL_0]] : (!fir.box<!fir.array<?xf32>>) -> !fir.array<?xf32>
-! CHECK: %[[VAL_23:.*]] = fir.do_loop %[[VAL_24:.*]] = %[[VAL_10]] to %[[VAL_12]] step %[[VAL_13]] unordered iter_args(%[[VAL_25:.*]] = %[[VAL_21]]) -> (!fir.array<?xf32>) {
-! CHECK: %[[VAL_26:.*]] = fir.convert %[[VAL_24]] : (index) -> i32
-! CHECK: fir.store %[[VAL_26]] to %[[VAL_1]] : !fir.ref<i32>
-! CHECK: %[[VAL_27:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_28:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
-! CHECK: %[[VAL_29:.*]] = fir.convert %[[VAL_28]] : (i32) -> i64
-! CHECK: %[[VAL_30:.*]] = fir.convert %[[VAL_29]] : (i64) -> index
-! CHECK: %[[VAL_31:.*]] = arith.subi %[[VAL_30]], %[[VAL_27]] : index
-! CHECK: %[[VAL_32:.*]] = fir.array_fetch %[[VAL_22]], %[[VAL_31]] : (!fir.array<?xf32>, index) -> f32
-! CHECK: %[[VAL_33:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_34:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
-! CHECK: %[[VAL_35:.*]] = fir.convert %[[VAL_34]] : (i32) -> i64
-! CHECK: %[[VAL_36:.*]] = fir.convert %[[VAL_35]] : (i64) -> index
-! CHECK: %[[VAL_37:.*]] = arith.subi %[[VAL_36]], %[[VAL_33]] : index
-! CHECK: %[[VAL_38:.*]] = fir.array_update %[[VAL_25]], %[[VAL_32]], %[[VAL_37]] : (!fir.array<?xf32>, f32, index) -> !fir.array<?xf32>
-! CHECK: fir.result %[[VAL_38]] : !fir.array<?xf32>
+! CHECK-LABEL: func.func @_QPforall_with_allocatable2(
+! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?xf32>> {fir.bindc_name = "a1"}) {
+! CHECK: %[[VAL_1:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[VAL_7:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope %[[VAL_1]] arg 1 {uniq_name = "_QFforall_with_allocatable2Ea1"} : (!fir.box<!fir.array<?xf32>>, !fir.dscope) -> (!fir.box<!fir.array<?xf32>>, !fir.box<!fir.array<?xf32>>)
+! CHECK: %[[VAL_8:.*]] = fir.alloca !fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}> {bindc_name = "thing", uniq_name = "_QFforall_with_allocatable2Ething"}
+! CHECK: %[[VAL_9:.*]]:2 = hlfir.declare %[[VAL_8]] {uniq_name = "_QFforall_with_allocatable2Ething"} : (!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>) -> (!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>, !fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>)
+! CHECK: %[[VAL_10:.*]] = fir.address_of(@_QQ_QFforall_with_allocatable2Tt.DerivedInit) : !fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+! CHECK: fir.copy %[[VAL_10]] to %[[VAL_9]]#0 no_overlap : !fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>, !fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>
+! CHECK: %[[VAL_11:.*]] = arith.constant 5 : i32
+! CHECK: %[[VAL_12:.*]] = arith.constant 15 : i32
+! CHECK: hlfir.forall lb {
+! CHECK: hlfir.yield %[[VAL_11]] : i32
+! CHECK: } ub {
+! CHECK: hlfir.yield %[[VAL_12]] : i32
+! CHECK: } (%[[VAL_13:.*]]: i32) {
+! CHECK: %[[VAL_14:.*]] = hlfir.forall_index "i" %[[VAL_13]] : (i32) -> !fir.ref<i32>
+! CHECK: hlfir.region_assign {
+! CHECK: %[[VAL_15:.*]] = fir.load %[[VAL_14]] : !fir.ref<i32>
+! CHECK: %[[VAL_16:.*]] = fir.convert %[[VAL_15]] : (i32) -> i64
+! CHECK: %[[VAL_17:.*]] = hlfir.designate %[[VAL_7]]#0 (%[[VAL_16]]) : (!fir.box<!fir.array<?xf32>>, i64) -> !fir.ref<f32>
+! CHECK: %[[VAL_18:.*]] = fir.load %[[VAL_17]] : !fir.ref<f32>
+! CHECK: hlfir.yield %[[VAL_18]] : f32
+! CHECK: } to {
+! CHECK: %[[VAL_19:.*]] = hlfir.designate %[[VAL_9]]#0{"arr"} {fortran_attrs = #fir.var_attrs<allocatable>} : (!fir.ref<!fir.type<_QFforall_with_allocatable2Tt{i:i32,arr:!fir.box<!fir.heap<!fir.array<?xf32>>>}>>) -> !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+! CHECK: %[[VAL_20:.*]] = fir.load %[[VAL_19]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+! CHECK: %[[VAL_21:.*]] = fir.load %[[VAL_14]] : !fir.ref<i32>
+! CHECK: %[[VAL_22:.*]] = fir.convert %[[VAL_21]] : (i32) -> i64
+! CHECK: %[[VAL_23:.*]] = hlfir.designate %[[VAL_20]] (%[[VAL_22]]) : (!fir.box<!fir.heap<!fir.array<?xf32>>>, i64) -> !fir.ref<f32>
+! CHECK: hlfir.yield %[[VAL_23]] : !fir.ref<f32>
+! CHECK: }
! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_21]], %[[VAL_39:.*]] to %[[VAL_19]] : !fir.array<?xf32>, !fir.array<?xf32>, !fir.heap<!fir.array<?xf32>>
! CHECK: return
! CHECK: }
diff --git a/flang/test/Lower/forall/forall-allocatable.f90 b/flang/test/Lower/forall/forall-allocatable.f90
index 8e54d282aea4b..a865452a292e3 100644
--- a/flang/test/Lower/forall/forall-allocatable.f90
+++ b/flang/test/Lower/forall/forall-allocatable.f90
@@ -1,6 +1,6 @@
! Test forall lowering
-! RUN: bbc --use-desc-for-alloc=false -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
subroutine forall_with_allocatable(a1)
real :: a1(:)
@@ -10,41 +10,38 @@ subroutine forall_with_allocatable(a1)
end forall
end subroutine forall_with_allocatable
-! CHECK-LABEL: func @_QPforall_with_allocatable(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?xf32>>{{.*}}) {
-! CHECK: %[[VAL_1:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"}
-! CHECK: %[[VAL_2:.*]] = fir.alloca !fir.heap<!fir.array<?xf32>> {uniq_name = "_QFforall_with_allocatableEarr.addr"}
-! CHECK: %[[VAL_3:.*]] = fir.alloca index {uniq_name = "_QFforall_with_allocatableEarr.lb0"}
-! CHECK: %[[VAL_4:.*]] = fir.alloca index {uniq_name = "_QFforall_with_allocatableEarr.ext0"}
-! CHECK: %[[VAL_5:.*]] = fir.zero_bits !fir.heap<!fir.array<?xf32>>
-! CHECK: fir.store %[[VAL_5]] to %[[VAL_2]] : !fir.ref<!fir.heap<!fir.array<?xf32>>>
-! CHECK: %[[VAL_7:.*]] = arith.constant 5 : i32
-! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_7]] : (i32) -> index
-! CHECK: %[[VAL_9:.*]] = arith.constant 15 : i32
-! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_9]] : (i32) -> index
-! CHECK: %[[VAL_11:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_12:.*]] = fir.load %[[VAL_3]] : !fir.ref<index>
-! CHECK: %[[VAL_13:.*]] = fir.load %[[VAL_4]] : !fir.ref<index>
-! CHECK: %[[VAL_14:.*]] = fir.load %[[VAL_2]] : !fir.ref<!fir.heap<!fir.array<?xf32>>>
-! CHECK: %[[VAL_15:.*]] = fir.shape_shift %[[VAL_12]], %[[VAL_13]] : (index, index) -> !fir.shapeshift<1>
-! CHECK: %[[VAL_16:.*]] = fir.array_load %[[VAL_14]](%[[VAL_15]]) : (!fir.heap<!fir.array<?xf32>>, !fir.shapeshift<1>) -> !fir.array<?xf32>
-! CHECK: %[[VAL_17:.*]] = fir.array_load %[[VAL_0]] : (!fir.box<!fir.array<?xf32>>) -> !fir.array<?xf32>
-! CHECK: %[[VAL_18:.*]] = fir.do_loop %[[VAL_19:.*]] = %[[VAL_8]] to %[[VAL_10]] step %[[VAL_11]] unordered iter_args(%[[VAL_20:.*]] = %[[VAL_16]]) -> (!fir.array<?xf32>) {
-! CHECK: %[[VAL_21:.*]] = fir.convert %[[VAL_19]] : (index) -> i32
-! CHECK: fir.store %[[VAL_21]] to %[[VAL_1]] : !fir.ref<i32>
-! CHECK: %[[VAL_22:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_23:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
-! CHECK: %[[VAL_24:.*]] = fir.convert %[[VAL_23]] : (i32) -> i64
-! CHECK: %[[VAL_25:.*]] = fir.convert %[[VAL_24]] : (i64) -> index
-! CHECK: %[[VAL_26:.*]] = arith.subi %[[VAL_25]], %[[VAL_22]] : index
-! CHECK: %[[VAL_27:.*]] = fir.array_fetch %[[VAL_17]], %[[VAL_26]] : (!fir.array<?xf32>, index) -> f32
-! CHECK: %[[VAL_29:.*]] = fir.load %[[VAL_1]] : !fir.ref<i32>
-! CHECK: %[[VAL_30:.*]] = fir.convert %[[VAL_29]] : (i32) -> i64
-! CHECK: %[[VAL_31:.*]] = fir.convert %[[VAL_30]] : (i64) -> index
-! CHECK: %[[VAL_32:.*]] = arith.subi %[[VAL_31]], %[[VAL_12]] : index
-! CHECK: %[[VAL_33:.*]] = fir.array_update %[[VAL_20]], %[[VAL_27]], %[[VAL_32]] : (!fir.array<?xf32>, f32, index) -> !fir.array<?xf32>
-! CHECK: fir.result %[[VAL_33]] : !fir.array<?xf32>
+! CHECK-LABEL: func.func @_QPforall_with_allocatable(
+! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?xf32>> {fir.bindc_name = "a1"}) {
+! CHECK: %[[VAL_1:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope %[[VAL_1]] arg 1 {uniq_name = "_QFforall_with_allocatableEa1"} : (!fir.box<!fir.array<?xf32>>, !fir.dscope) -> (!fir.box<!fir.array<?xf32>>, !fir.box<!fir.array<?xf32>>)
+! CHECK: %[[VAL_3:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?xf32>>> {bindc_name = "arr", uniq_name = "_QFforall_with_allocatableEarr"}
+! CHECK: %[[VAL_4:.*]] = fir.zero_bits !fir.heap<!fir.array<?xf32>>
+! CHECK: %[[VAL_5:.*]] = arith.constant 0 : index
+! CHECK: %[[VAL_6:.*]] = fir.shape %[[VAL_5]] : (index) -> !fir.shape<1>
+! CHECK: %[[VAL_7:.*]] = fir.embox %[[VAL_4]](%[[VAL_6]]) : (!fir.heap<!fir.array<?xf32>>, !fir.shape<1>) -> !fir.box<!fir.heap<!fir.array<?xf32>>>
+! CHECK: fir.store %[[VAL_7]] to %[[VAL_3]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+! CHECK: %[[VAL_8:.*]]:2 = hlfir.declare %[[VAL_3]] {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFforall_with_allocatableEarr"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>)
+! CHECK: %[[VAL_9:.*]] = arith.constant 5 : i32
+! CHECK: %[[VAL_10:.*]] = arith.constant 15 : i32
+! CHECK: hlfir.forall lb {
+! CHECK: hlfir.yield %[[VAL_9]] : i32
+! CHECK: } ub {
+! CHECK: hlfir.yield %[[VAL_10]] : i32
+! CHECK: } (%[[VAL_11:.*]]: i32) {
+! CHECK: %[[VAL_12:.*]] = hlfir.forall_index "i" %[[VAL_11]] : (i32) -> !fir.ref<i32>
+! CHECK: hlfir.region_assign {
+! CHECK: %[[VAL_13:.*]] = fir.load %[[VAL_12]] : !fir.ref<i32>
+! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_13]] : (i32) -> i64
+! CHECK: %[[VAL_15:.*]] = hlfir.designate %[[VAL_2]]#0 (%[[VAL_14]]) : (!fir.box<!fir.array<?xf32>>, i64) -> !fir.ref<f32>
+! CHECK: %[[VAL_16:.*]] = fir.load %[[VAL_15]] : !fir.ref<f32>
+! CHECK: hlfir.yield %[[VAL_16]] : f32
+! CHECK: } to {
+! CHECK: %[[VAL_17:.*]] = fir.load %[[VAL_8]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
+! CHECK: %[[VAL_18:.*]] = fir.load %[[VAL_12]] : !fir.ref<i32>
+! CHECK: %[[VAL_19:.*]] = fir.convert %[[VAL_18]] : (i32) -> i64
+! CHECK: %[[VAL_20:.*]] = hlfir.designate %[[VAL_17]] (%[[VAL_19]]) : (!fir.box<!fir.heap<!fir.array<?xf32>>>, i64) -> !fir.ref<f32>
+! CHECK: hlfir.yield %[[VAL_20]] : !fir.ref<f32>
+! CHECK: }
! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_16]], %[[VAL_34:.*]] to %[[VAL_14]] : !fir.array<?xf32>, !fir.array<?xf32>, !fir.heap<!fir.array<?xf32>>
! CHECK: return
! CHECK: }
diff --git a/flang/test/Lower/forall/forall-array.f90 b/flang/test/Lower/forall/forall-array.f90
index 2abc5a30610a9..b41631b586386 100644
--- a/flang/test/Lower/forall/forall-array.f90
+++ b/flang/test/Lower/forall/forall-array.f90
@@ -1,6 +1,6 @@
! Test forall lowering
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
!*** Test a FORALL construct with an array assignment
! This is similar to the following embedded WHERE construct test, but the
@@ -17,49 +17,46 @@ subroutine test_forall_with_array_assignment(aa,bb)
end forall
end subroutine test_forall_with_array_assignment
-! CHECK-LABEL: func @_QPtest_forall_with_array_assignment(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>{{.*}}, %[[VAL_1:.*]]: !fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>{{.*}}) {
-! CHECK: %[[VAL_2:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"}
-! CHECK: %[[VAL_3:.*]] = arith.constant 10 : index
-! CHECK: %[[VAL_4:.*]] = arith.constant 10 : index
-! CHECK: %[[VAL_5:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_5]] : (i32) -> index
-! CHECK: %[[VAL_7:.*]] = arith.constant 10 : i32
-! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_7]] : (i32) -> index
-! CHECK: %[[VAL_9:.*]] = arith.constant 2 : i32
-! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_9]] : (i32) -> index
-! CHECK: %[[VAL_11:.*]] = fir.shape %[[VAL_3]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_12:.*]] = fir.array_load %[[VAL_0]](%[[VAL_11]]) : (!fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>, !fir.shape<1>) -> !fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>
-! CHECK: %[[VAL_13:.*]] = fir.shape %[[VAL_4]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_14:.*]] = fir.array_load %[[VAL_1]](%[[VAL_13]]) : (!fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>, !fir.shape<1>) -> !fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>
-! CHECK: %[[VAL_15:.*]] = fir.do_loop %[[VAL_16:.*]] = %[[VAL_6]] to %[[VAL_8]] step %[[VAL_10]] unordered iter_args(%[[VAL_17:.*]] = %[[VAL_12]]) -> (!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>) {
-! CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_16]] : (index) -> i32
-! CHECK: fir.store %[[VAL_18]] to %[[VAL_2]] : !fir.ref<i32>
-! CHECK: %[[VAL_19:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_20:.*]] = fir.load %[[VAL_2]] : !fir.ref<i32>
-! CHECK: %[[VAL_21:.*]] = fir.convert %[[VAL_20]] : (i32) -> i64
-! CHECK: %[[VAL_22:.*]] = fir.convert %[[VAL_21]] : (i64) -> index
-! CHECK: %[[VAL_23:.*]] = arith.subi %[[VAL_22]], %[[VAL_19]] : index
-! CHECK: %[[VAL_24:.*]] = fir.field_index block1, !fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>
-! CHECK: %[[VAL_26:.*]] = arith.constant 64 : index
-! CHECK: %[[VAL_27:.*]] = arith.constant 1 : index
-! CHECK-DAG: %[[VAL_28:.*]] = fir.load %[[VAL_2]] : !fir.ref<i32>
-! CHECK-DAG: %[[VAL_29:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_30:.*]] = arith.addi %[[VAL_28]], %[[VAL_29]] : i32
-! CHECK: %[[VAL_31:.*]] = fir.convert %[[VAL_30]] : (i32) -> i64
-! CHECK: %[[VAL_32:.*]] = fir.convert %[[VAL_31]] : (i64) -> index
-! CHECK: %[[VAL_33:.*]] = arith.subi %[[VAL_32]], %[[VAL_27]] : index
-! CHECK: %[[VAL_34:.*]] = fir.field_index block2, !fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>
-! CHECK: %[[VAL_35:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_36:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_37:.*]] = arith.subi %[[VAL_26]], %[[VAL_35]] : index
-! CHECK: %[[VAL_38:.*]] = fir.do_loop %[[VAL_39:.*]] = %[[VAL_36]] to %[[VAL_37]] step %[[VAL_35]] unordered iter_args(%[[VAL_40:.*]] = %[[VAL_17]]) -> (!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>) {
-! CHECK: %[[VAL_41:.*]] = fir.array_fetch %[[VAL_14]], %[[VAL_33]], %[[VAL_34]], %[[VAL_39]] : (!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>, index, !fir.field, index) -> i64
-! CHECK: %[[VAL_42:.*]] = fir.array_update %[[VAL_40]], %[[VAL_41]], %[[VAL_23]], %[[VAL_24]], %[[VAL_39]] : (!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>, i64, index, !fir.field, index) -> !fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>
-! CHECK: fir.result %[[VAL_42]] : !fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>
+! CHECK-LABEL: func.func @_QPtest_forall_with_array_assignment(
+! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>> {fir.bindc_name = "aa"},
+! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>> {fir.bindc_name = "bb"}) {
+! CHECK: %[[VAL_2:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[VAL_13:.*]] = arith.constant 10 : index
+! CHECK: %[[VAL_14:.*]] = fir.shape %[[VAL_13]] : (index) -> !fir.shape<1>
+! CHECK: %[[VAL_15:.*]]:2 = hlfir.declare %[[VAL_0]](%[[VAL_14]]) dummy_scope %[[VAL_2]] arg 1 {uniq_name = "_QFtest_forall_with_array_assignmentEaa"} : (!fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>, !fir.shape<1>, !fir.dscope) -> (!fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>, !fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>)
+! CHECK: %[[VAL_16:.*]] = arith.constant 10 : index
+! CHECK: %[[VAL_17:.*]] = fir.shape %[[VAL_16]] : (index) -> !fir.shape<1>
+! CHECK: %[[VAL_18:.*]]:2 = hlfir.declare %[[VAL_1]](%[[VAL_17]]) dummy_scope %[[VAL_2]] arg 2 {uniq_name = "_QFtest_forall_with_array_assignmentEbb"} : (!fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>, !fir.shape<1>, !fir.dscope) -> (!fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>, !fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>)
+! CHECK: %[[VAL_19:.*]] = arith.constant 1 : i32
+! CHECK: %[[VAL_20:.*]] = arith.constant 10 : i32
+! CHECK: %[[VAL_21:.*]] = arith.constant 2 : i32
+! CHECK: hlfir.forall lb {
+! CHECK: hlfir.yield %[[VAL_19]] : i32
+! CHECK: } ub {
+! CHECK: hlfir.yield %[[VAL_20]] : i32
+! CHECK: } step {
+! CHECK: hlfir.yield %[[VAL_21]] : i32
+! CHECK: } (%[[VAL_22:.*]]: i32) {
+! CHECK: %[[VAL_23:.*]] = hlfir.forall_index "i" %[[VAL_22]] : (i32) -> !fir.ref<i32>
+! CHECK: hlfir.region_assign {
+! CHECK: %[[VAL_24:.*]] = fir.load %[[VAL_23]] : !fir.ref<i32>
+! CHECK: %[[VAL_25:.*]] = arith.constant 1 : i32
+! CHECK: %[[VAL_26:.*]] = arith.addi %[[VAL_24]], %[[VAL_25]] overflow<nsw> : i32
+! CHECK: %[[VAL_27:.*]] = fir.convert %[[VAL_26]] : (i32) -> i64
+! CHECK: %[[VAL_28:.*]] = hlfir.designate %[[VAL_18]]#0 (%[[VAL_27]]) : (!fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>, i64) -> !fir.ref<!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>
+! CHECK: %[[VAL_29:.*]] = arith.constant 64 : index
+! CHECK: %[[VAL_30:.*]] = fir.shape %[[VAL_29]] : (index) -> !fir.shape<1>
+! CHECK: %[[VAL_31:.*]] = hlfir.designate %[[VAL_28]]{"block2"}{{ *}}shape %[[VAL_30]] : (!fir.ref<!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>, !fir.shape<1>) -> !fir.ref<!fir.array<64xi64>>
+! CHECK: hlfir.yield %[[VAL_31]] : !fir.ref<!fir.array<64xi64>>
+! CHECK: } to {
+! CHECK: %[[VAL_32:.*]] = fir.load %[[VAL_23]] : !fir.ref<i32>
+! CHECK: %[[VAL_33:.*]] = fir.convert %[[VAL_32]] : (i32) -> i64
+! CHECK: %[[VAL_34:.*]] = hlfir.designate %[[VAL_15]]#0 (%[[VAL_33]]) : (!fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>, i64) -> !fir.ref<!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>
+! CHECK: %[[VAL_35:.*]] = arith.constant 64 : index
+! CHECK: %[[VAL_36:.*]] = fir.shape %[[VAL_35]] : (index) -> !fir.shape<1>
+! CHECK: %[[VAL_37:.*]] = hlfir.designate %[[VAL_34]]{"block1"}{{ *}}shape %[[VAL_36]] : (!fir.ref<!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>, !fir.shape<1>) -> !fir.ref<!fir.array<64xi64>>
+! CHECK: hlfir.yield %[[VAL_37]] : !fir.ref<!fir.array<64xi64>>
! CHECK: }
-! CHECK: fir.result %[[VAL_43:.*]] : !fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>
! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_12]], %[[VAL_44:.*]] to %[[VAL_0]] : !fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>, !fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>, !fir.ref<!fir.array<10x!fir.type<_QFtest_forall_with_array_assignmentTt{block1:!fir.array<64xi64>,block2:!fir.array<64xi64>}>>>
! CHECK: return
! CHECK: }
diff --git a/flang/test/Lower/forall/forall-construct-2.f90 b/flang/test/Lower/forall/forall-construct-2.f90
index 3bca192ef8e2e..9528cb61a4866 100644
--- a/flang/test/Lower/forall/forall-construct-2.f90
+++ b/flang/test/Lower/forall/forall-construct-2.f90
@@ -1,6 +1,6 @@
! Test forall lowering
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
!*** Test forall with multiple assignment statements
subroutine test2_forall_construct(a,b)
@@ -11,114 +11,80 @@ subroutine test2_forall_construct(a,b)
end forall
end subroutine test2_forall_construct
-! CHECK-LABEL: func @_QPtest2_forall_construct(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<100x400xf32>>{{.*}}, %[[VAL_1:.*]]: !fir.ref<!fir.array<200x200xf32>>{{.*}}) {
-! CHECK: %[[VAL_2:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "j"}
-! CHECK: %[[VAL_3:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"}
-! CHECK: %[[VAL_4:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "j"}
-! CHECK: %[[VAL_5:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"}
-! CHECK: %[[VAL_6:.*]] = arith.constant 100 : index
-! CHECK: %[[VAL_7:.*]] = arith.constant 400 : index
+! CHECK-LABEL: func.func @_QPtest2_forall_construct(
+! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<100x400xf32>> {fir.bindc_name = "a"},
+! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.array<200x200xf32>> {fir.bindc_name = "b"}) {
+! CHECK: %[[VAL_2:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[VAL_3:.*]] = arith.constant 100 : index
+! CHECK: %[[VAL_4:.*]] = arith.constant 400 : index
+! CHECK: %[[VAL_5:.*]] = fir.shape %[[VAL_3]], %[[VAL_4]] : (index, index) -> !fir.shape<2>
+! CHECK: %[[VAL_6:.*]]:2 = hlfir.declare %[[VAL_0]](%[[VAL_5]]) dummy_scope %[[VAL_2]] arg 1 {uniq_name = "_QFtest2_forall_constructEa"} : (!fir.ref<!fir.array<100x400xf32>>, !fir.shape<2>, !fir.dscope) -> (!fir.ref<!fir.array<100x400xf32>>, !fir.ref<!fir.array<100x400xf32>>)
+! CHECK: %[[VAL_7:.*]] = arith.constant 200 : index
! CHECK: %[[VAL_8:.*]] = arith.constant 200 : index
-! CHECK: %[[VAL_9:.*]] = arith.constant 200 : index
-! CHECK: %[[VAL_10:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_10]] : (i32) -> index
+! CHECK: %[[VAL_9:.*]] = fir.shape %[[VAL_7]], %[[VAL_8]] : (index, index) -> !fir.shape<2>
+! CHECK: %[[VAL_10:.*]]:2 = hlfir.declare %[[VAL_1]](%[[VAL_9]]) dummy_scope %[[VAL_2]] arg 2 {uniq_name = "_QFtest2_forall_constructEb"} : (!fir.ref<!fir.array<200x200xf32>>, !fir.shape<2>, !fir.dscope) -> (!fir.ref<!fir.array<200x200xf32>>, !fir.ref<!fir.array<200x200xf32>>)
+! CHECK: %[[VAL_11:.*]] = arith.constant 1 : i32
! CHECK: %[[VAL_12:.*]] = arith.constant 100 : i32
-! CHECK: %[[VAL_13:.*]] = fir.convert %[[VAL_12]] : (i32) -> index
-! CHECK: %[[VAL_14:.*]] = arith.constant 1 : index
! CHECK: %[[VAL_15:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_16:.*]] = fir.convert %[[VAL_15]] : (i32) -> index
-! CHECK: %[[VAL_17:.*]] = arith.constant 200 : i32
-! CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_17]] : (i32) -> index
-! CHECK: %[[VAL_19:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_20:.*]] = fir.shape %[[VAL_6]], %[[VAL_7]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_21:.*]] = fir.array_load %[[VAL_0]](%[[VAL_20]]) : (!fir.ref<!fir.array<100x400xf32>>, !fir.shape<2>) -> !fir.array<100x400xf32>
-! CHECK: %[[VAL_22:.*]] = fir.shape %[[VAL_8]], %[[VAL_9]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_23:.*]] = fir.array_load %[[VAL_1]](%[[VAL_22]]) : (!fir.ref<!fir.array<200x200xf32>>, !fir.shape<2>) -> !fir.array<200x200xf32>
-! CHECK: %[[VAL_24:.*]] = fir.shape %[[VAL_8]], %[[VAL_9]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_25:.*]] = fir.array_load %[[VAL_1]](%[[VAL_24]]) : (!fir.ref<!fir.array<200x200xf32>>, !fir.shape<2>) -> !fir.array<200x200xf32>
-! CHECK: %[[VAL_26:.*]] = fir.do_loop %[[VAL_27:.*]] = %[[VAL_11]] to %[[VAL_13]] step %[[VAL_14]] unordered iter_args(%[[VAL_28:.*]] = %[[VAL_21]]) -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_29:.*]] = fir.convert %[[VAL_27]] : (index) -> i32
-! CHECK: fir.store %[[VAL_29]] to %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_30:.*]] = fir.do_loop %[[VAL_31:.*]] = %[[VAL_16]] to %[[VAL_18]] step %[[VAL_19]] unordered iter_args(%[[VAL_32:.*]] = %[[VAL_28]]) -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_33:.*]] = fir.convert %[[VAL_31]] : (index) -> i32
-! CHECK: fir.store %[[VAL_33]] to %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_34:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_35:.*]] = fir.load %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_36:.*]] = fir.convert %[[VAL_35]] : (i32) -> i64
-! CHECK: %[[VAL_37:.*]] = fir.convert %[[VAL_36]] : (i64) -> index
-! CHECK: %[[VAL_38:.*]] = arith.subi %[[VAL_37]], %[[VAL_34]] : index
-! CHECK: %[[VAL_39:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_39]] : (i32) -> i64
-! CHECK: %[[VAL_41:.*]] = fir.convert %[[VAL_40]] : (i64) -> index
-! CHECK: %[[VAL_42:.*]] = arith.subi %[[VAL_41]], %[[VAL_34]] : index
-! CHECK: %[[VAL_54:.*]] = fir.array_fetch %[[VAL_23]], %[[VAL_38]], %[[VAL_42]] : (!fir.array<200x200xf32>, index, index) -> f32
-! CHECK: %[[VAL_43:.*]] = arith.constant 1 : index
-! CHECK-DAG: %[[VAL_44:.*]] = fir.load %[[VAL_5]] : !fir.ref<i32>
-! CHECK-DAG: %[[VAL_45:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_46:.*]] = arith.addi %[[VAL_44]], %[[VAL_45]] : i32
-! CHECK: %[[VAL_47:.*]] = fir.convert %[[VAL_46]] : (i32) -> i64
-! CHECK: %[[VAL_48:.*]] = fir.convert %[[VAL_47]] : (i64) -> index
-! CHECK: %[[VAL_49:.*]] = arith.subi %[[VAL_48]], %[[VAL_43]] : index
-! CHECK: %[[VAL_50:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_51:.*]] = fir.convert %[[VAL_50]] : (i32) -> i64
-! CHECK: %[[VAL_52:.*]] = fir.convert %[[VAL_51]] : (i64) -> index
-! CHECK: %[[VAL_53:.*]] = arith.subi %[[VAL_52]], %[[VAL_43]] : index
-! CHECK: %[[VAL_55:.*]] = fir.array_fetch %[[VAL_25]], %[[VAL_49]], %[[VAL_53]] : (!fir.array<200x200xf32>, index, index) -> f32
-! CHECK: %[[VAL_56:.*]] = arith.addf %[[VAL_54]], %[[VAL_55]] {{.*}}: f32
-! CHECK: %[[VAL_57:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_58:.*]] = fir.load %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_59:.*]] = fir.convert %[[VAL_58]] : (i32) -> i64
-! CHECK: %[[VAL_60:.*]] = fir.convert %[[VAL_59]] : (i64) -> index
-! CHECK: %[[VAL_61:.*]] = arith.subi %[[VAL_60]], %[[VAL_57]] : index
-! CHECK: %[[VAL_62:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_63:.*]] = fir.convert %[[VAL_62]] : (i32) -> i64
-! CHECK: %[[VAL_64:.*]] = fir.convert %[[VAL_63]] : (i64) -> index
-! CHECK: %[[VAL_65:.*]] = arith.subi %[[VAL_64]], %[[VAL_57]] : index
-! CHECK: %[[VAL_66:.*]] = fir.array_update %[[VAL_32]], %[[VAL_56]], %[[VAL_61]], %[[VAL_65]] : (!fir.array<100x400xf32>, f32, index, index) -> !fir.array<100x400xf32>
-! CHECK: fir.result %[[VAL_66]] : !fir.array<100x400xf32>
-! CHECK: }
-! CHECK: fir.result %[[VAL_67:.*]] : !fir.array<100x400xf32>
-! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_21]], %[[VAL_68:.*]] to %[[VAL_0]] : !fir.array<100x400xf32>, !fir.array<100x400xf32>, !fir.ref<!fir.array<100x400xf32>>
-! CHECK: %[[VAL_69:.*]] = fir.shape %[[VAL_6]], %[[VAL_7]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_70:.*]] = fir.array_load %[[VAL_0]](%[[VAL_69]]) : (!fir.ref<!fir.array<100x400xf32>>, !fir.shape<2>) -> !fir.array<100x400xf32>
-! CHECK: %[[VAL_71:.*]] = fir.shape %[[VAL_8]], %[[VAL_9]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_72:.*]] = fir.array_load %[[VAL_1]](%[[VAL_71]]) : (!fir.ref<!fir.array<200x200xf32>>, !fir.shape<2>) -> !fir.array<200x200xf32>
-! CHECK: %[[VAL_73:.*]] = fir.do_loop %[[VAL_74:.*]] = %[[VAL_11]] to %[[VAL_13]] step %[[VAL_14]] unordered iter_args(%[[VAL_75:.*]] = %[[VAL_70]]) -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_76:.*]] = fir.convert %[[VAL_74]] : (index) -> i32
-! CHECK: fir.store %[[VAL_76]] to %[[VAL_3]] : !fir.ref<i32>
-! CHECK: %[[VAL_77:.*]] = fir.do_loop %[[VAL_78:.*]] = %[[VAL_16]] to %[[VAL_18]] step %[[VAL_19]] unordered iter_args(%[[VAL_79:.*]] = %[[VAL_75]]) -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_80:.*]] = fir.convert %[[VAL_78]] : (index) -> i32
-! CHECK: fir.store %[[VAL_80]] to %[[VAL_2]] : !fir.ref<i32>
-! CHECK: %[[VAL_81:.*]] = arith.constant 1.000000e+00 : f32
-! CHECK: %[[VAL_82:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_83:.*]] = fir.load %[[VAL_2]] : !fir.ref<i32>
-! CHECK: %[[VAL_84:.*]] = fir.convert %[[VAL_83]] : (i32) -> i64
-! CHECK: %[[VAL_85:.*]] = fir.convert %[[VAL_84]] : (i64) -> index
-! CHECK: %[[VAL_86:.*]] = arith.subi %[[VAL_85]], %[[VAL_82]] : index
-! CHECK: %[[VAL_87:.*]] = fir.load %[[VAL_3]] : !fir.ref<i32>
-! CHECK: %[[VAL_88:.*]] = fir.convert %[[VAL_87]] : (i32) -> i64
-! CHECK: %[[VAL_89:.*]] = fir.convert %[[VAL_88]] : (i64) -> index
-! CHECK: %[[VAL_90:.*]] = arith.subi %[[VAL_89]], %[[VAL_82]] : index
-! CHECK: %[[VAL_91:.*]] = fir.array_fetch %[[VAL_72]], %[[VAL_86]], %[[VAL_90]] : (!fir.array<200x200xf32>, index, index) -> f32
-! CHECK: %[[VAL_92:.*]] = arith.divf %[[VAL_81]], %[[VAL_91]] {{.*}}: f32
-! CHECK: %[[VAL_93:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_94:.*]] = fir.load %[[VAL_3]] : !fir.ref<i32>
-! CHECK: %[[VAL_95:.*]] = fir.convert %[[VAL_94]] : (i32) -> i64
-! CHECK: %[[VAL_96:.*]] = fir.convert %[[VAL_95]] : (i64) -> index
-! CHECK: %[[VAL_97:.*]] = arith.subi %[[VAL_96]], %[[VAL_93]] : index
-! CHECK: %[[VAL_98:.*]] = arith.constant 200 : i32
-! CHECK: %[[VAL_99:.*]] = fir.load %[[VAL_2]] : !fir.ref<i32>
-! CHECK: %[[VAL_100:.*]] = arith.addi %[[VAL_98]], %[[VAL_99]] : i32
-! CHECK: %[[VAL_101:.*]] = fir.convert %[[VAL_100]] : (i32) -> i64
-! CHECK: %[[VAL_102:.*]] = fir.convert %[[VAL_101]] : (i64) -> index
-! CHECK: %[[VAL_103:.*]] = arith.subi %[[VAL_102]], %[[VAL_93]] : index
-! CHECK: %[[VAL_104:.*]] = fir.array_update %[[VAL_79]], %[[VAL_92]], %[[VAL_97]], %[[VAL_103]] : (!fir.array<100x400xf32>, f32, index, index) -> !fir.array<100x400xf32>
-! CHECK: fir.result %[[VAL_104]] : !fir.array<100x400xf32>
-! CHECK: }
-! CHECK: fir.result %[[VAL_105:.*]] : !fir.array<100x400xf32>
-! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_70]], %[[VAL_106:.*]] to %[[VAL_0]] : !fir.array<100x400xf32>, !fir.array<100x400xf32>, !fir.ref<!fir.array<100x400xf32>>
-! CHECK: return
-! CHECK: }
+! CHECK: %[[VAL_16:.*]] = arith.constant 200 : i32
+! CHECK: hlfir.forall lb {
+! CHECK-NEXT: hlfir.yield %[[VAL_11]] : i32
+! CHECK-NEXT: } ub {
+! CHECK-NEXT: hlfir.yield %[[VAL_12]] : i32
+! CHECK-NEXT: } (%[[VAL_13:.*]]: i32) {
+! CHECK-NEXT: %[[VAL_14:.*]] = hlfir.forall_index "i" %[[VAL_13]] : (i32) -> !fir.ref<i32>
+! CHECK-NEXT: hlfir.forall lb {
+! CHECK-NEXT: hlfir.yield %[[VAL_15]] : i32
+! CHECK-NEXT: } ub {
+! CHECK-NEXT: hlfir.yield %[[VAL_16]] : i32
+! CHECK-NEXT: } (%[[VAL_17:.*]]: i32) {
+! CHECK-NEXT: %[[VAL_18:.*]] = hlfir.forall_index "j" %[[VAL_17]] : (i32) -> !fir.ref<i32>
+! CHECK-NEXT: hlfir.region_assign {
+! CHECK-NEXT: %[[VAL_19:.*]] = fir.load %[[VAL_14]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_20:.*]] = fir.convert %[[VAL_19]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_21:.*]] = fir.load %[[VAL_18]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_22:.*]] = fir.convert %[[VAL_21]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_23:.*]] = hlfir.designate %[[VAL_10]]#0 (%[[VAL_20]], %[[VAL_22]]) : (!fir.ref<!fir.array<200x200xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK-NEXT: %[[VAL_24:.*]] = fir.load %[[VAL_23]] : !fir.ref<f32>
+! CHECK-NEXT: %[[VAL_25:.*]] = fir.load %[[VAL_14]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_26:.*]] = arith.constant 1 : i32
+! CHECK-NEXT: %[[VAL_27:.*]] = arith.addi %[[VAL_25]], %[[VAL_26]] overflow<nsw> : i32
+! CHECK-NEXT: %[[VAL_28:.*]] = fir.convert %[[VAL_27]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_29:.*]] = fir.load %[[VAL_18]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_30:.*]] = fir.convert %[[VAL_29]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_31:.*]] = hlfir.designate %[[VAL_10]]#0 (%[[VAL_28]], %[[VAL_30]]) : (!fir.ref<!fir.array<200x200xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK-NEXT: %[[VAL_32:.*]] = fir.load %[[VAL_31]] : !fir.ref<f32>
+! CHECK-NEXT: %[[VAL_33:.*]] = arith.addf %[[VAL_24]], %[[VAL_32]] fastmath<contract> : f32
+! CHECK-NEXT: hlfir.yield %[[VAL_33]] : f32
+! CHECK-NEXT: } to {
+! CHECK-NEXT: %[[VAL_34:.*]] = fir.load %[[VAL_14]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_35:.*]] = fir.convert %[[VAL_34]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_36:.*]] = fir.load %[[VAL_18]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_37:.*]] = fir.convert %[[VAL_36]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_38:.*]] = hlfir.designate %[[VAL_6]]#0 (%[[VAL_35]], %[[VAL_37]]) : (!fir.ref<!fir.array<100x400xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK-NEXT: hlfir.yield %[[VAL_38]] : !fir.ref<f32>
+! CHECK-NEXT: }
+! CHECK-NEXT: hlfir.region_assign {
+! CHECK-NEXT: %[[VAL_39:.*]] = arith.constant 1.000000e+00 : f32
+! CHECK-NEXT: %[[VAL_40:.*]] = fir.load %[[VAL_18]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_41:.*]] = fir.convert %[[VAL_40]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_42:.*]] = fir.load %[[VAL_14]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_43:.*]] = fir.convert %[[VAL_42]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_44:.*]] = hlfir.designate %[[VAL_10]]#0 (%[[VAL_41]], %[[VAL_43]]) : (!fir.ref<!fir.array<200x200xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK-NEXT: %[[VAL_45:.*]] = fir.load %[[VAL_44]] : !fir.ref<f32>
+! CHECK-NEXT: %[[VAL_46:.*]] = arith.divf %[[VAL_39]], %[[VAL_45]] fastmath<contract> : f32
+! CHECK-NEXT: hlfir.yield %[[VAL_46]] : f32
+! CHECK-NEXT: } to {
+! CHECK-NEXT: %[[VAL_47:.*]] = fir.load %[[VAL_14]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_48:.*]] = fir.convert %[[VAL_47]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_49:.*]] = arith.constant 200 : i32
+! CHECK-NEXT: %[[VAL_50:.*]] = fir.load %[[VAL_18]] : !fir.ref<i32>
+! CHECK-NEXT: %[[VAL_51:.*]] = arith.addi %[[VAL_49]], %[[VAL_50]] overflow<nsw> : i32
+! CHECK-NEXT: %[[VAL_52:.*]] = fir.convert %[[VAL_51]] : (i32) -> i64
+! CHECK-NEXT: %[[VAL_53:.*]] = hlfir.designate %[[VAL_6]]#0 (%[[VAL_48]], %[[VAL_52]]) : (!fir.ref<!fir.array<100x400xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK-NEXT: hlfir.yield %[[VAL_53]] : !fir.ref<f32>
+! CHECK-NEXT: }
+! CHECK-NEXT: }
+! CHECK-NEXT: }
+! CHECK-NEXT: return
+! CHECK-NEXT: }
diff --git a/flang/test/Lower/forall/forall-construct-3.f90 b/flang/test/Lower/forall/forall-construct-3.f90
index 59583330eb084..a2dbd6f5fd427 100644
--- a/flang/test/Lower/forall/forall-construct-3.f90
+++ b/flang/test/Lower/forall/forall-construct-3.f90
@@ -1,6 +1,6 @@
! Test forall lowering
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
!*** Test forall with multiple assignment statements and mask
subroutine test3_forall_construct(a,b, mask)
@@ -12,146 +12,96 @@ subroutine test3_forall_construct(a,b, mask)
end forall
end subroutine test3_forall_construct
-! CHECK-LABEL: func @_QPtest3_forall_construct(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<100x400xf32>>{{.*}}, %[[VAL_1:.*]]: !fir.ref<!fir.array<200x200xf32>>{{.*}}, %[[VAL_2:.*]]: !fir.ref<!fir.array<100x200x!fir.logical<4>>>{{.*}}) {
-! CHECK: %[[VAL_3:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "j"}
-! CHECK: %[[VAL_4:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"}
-! CHECK: %[[VAL_5:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "j"}
-! CHECK: %[[VAL_6:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"}
-! CHECK: %[[VAL_7:.*]] = arith.constant 100 : index
-! CHECK: %[[VAL_8:.*]] = arith.constant 400 : index
+! CHECK-LABEL: func.func @_QPtest3_forall_construct(
+! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<100x400xf32>> {fir.bindc_name = "a"},
+! CHECK-SAME: %[[VAL_1:.*]]: !fir.ref<!fir.array<200x200xf32>> {fir.bindc_name = "b"},
+! CHECK-SAME: %[[VAL_2:.*]]: !fir.ref<!fir.array<100x200x!fir.logical<4>>> {fir.bindc_name = "mask"}) {
+! CHECK: %[[VAL_3:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[VAL_4:.*]] = arith.constant 100 : index
+! CHECK: %[[VAL_5:.*]] = arith.constant 400 : index
+! CHECK: %[[VAL_6:.*]] = fir.shape %[[VAL_4]], %[[VAL_5]] : (index, index) -> !fir.shape<2>
+! CHECK: %[[VAL_7:.*]]:2 = hlfir.declare %[[VAL_0]](%[[VAL_6]]) dummy_scope %[[VAL_3]] arg 1 {uniq_name = "_QFtest3_forall_constructEa"} : (!fir.ref<!fir.array<100x400xf32>>, !fir.shape<2>, !fir.dscope) -> (!fir.ref<!fir.array<100x400xf32>>, !fir.ref<!fir.array<100x400xf32>>)
+! CHECK: %[[VAL_8:.*]] = arith.constant 200 : index
! CHECK: %[[VAL_9:.*]] = arith.constant 200 : index
-! CHECK: %[[VAL_10:.*]] = arith.constant 200 : index
-! CHECK: %[[VAL_11:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_12:.*]] = fir.convert %[[VAL_11]] : (i32) -> index
-! CHECK: %[[VAL_13:.*]] = arith.constant 100 : i32
-! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_13]] : (i32) -> index
-! CHECK: %[[VAL_15:.*]] = arith.constant 1 : index
+! CHECK: %[[VAL_10:.*]] = fir.shape %[[VAL_8]], %[[VAL_9]] : (index, index) -> !fir.shape<2>
+! CHECK: %[[VAL_11:.*]]:2 = hlfir.declare %[[VAL_1]](%[[VAL_10]]) dummy_scope %[[VAL_3]] arg 2 {uniq_name = "_QFtest3_forall_constructEb"} : (!fir.ref<!fir.array<200x200xf32>>, !fir.shape<2>, !fir.dscope) -> (!fir.ref<!fir.array<200x200xf32>>, !fir.ref<!fir.array<200x200xf32>>)
+! CHECK: %[[VAL_12:.*]] = arith.constant 100 : index
+! CHECK: %[[VAL_13:.*]] = arith.constant 200 : index
+! CHECK: %[[VAL_14:.*]] = fir.shape %[[VAL_12]], %[[VAL_13]] : (index, index) -> !fir.shape<2>
+! CHECK: %[[VAL_15:.*]]:2 = hlfir.declare %[[VAL_2]](%[[VAL_14]]) dummy_scope %[[VAL_3]] arg 3 {uniq_name = "_QFtest3_forall_constructEmask"} : (!fir.ref<!fir.array<100x200x!fir.logical<4>>>, !fir.shape<2>, !fir.dscope) -> (!fir.ref<!fir.array<100x200x!fir.logical<4>>>, !fir.ref<!fir.array<100x200x!fir.logical<4>>>)
! CHECK: %[[VAL_16:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_16]] : (i32) -> index
-! CHECK: %[[VAL_18:.*]] = arith.constant 200 : i32
-! CHECK: %[[VAL_19:.*]] = fir.convert %[[VAL_18]] : (i32) -> index
-! CHECK: %[[VAL_20:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_21:.*]] = fir.shape %[[VAL_7]], %[[VAL_8]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_22:.*]] = fir.array_load %[[VAL_0]](%[[VAL_21]]) : (!fir.ref<!fir.array<100x400xf32>>, !fir.shape<2>) -> !fir.array<100x400xf32>
-! CHECK: %[[VAL_23:.*]] = fir.shape %[[VAL_9]], %[[VAL_10]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_24:.*]] = fir.array_load %[[VAL_1]](%[[VAL_23]]) : (!fir.ref<!fir.array<200x200xf32>>, !fir.shape<2>) -> !fir.array<200x200xf32>
-! CHECK: %[[VAL_25:.*]] = fir.shape %[[VAL_9]], %[[VAL_10]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_26:.*]] = fir.array_load %[[VAL_1]](%[[VAL_25]]) : (!fir.ref<!fir.array<200x200xf32>>, !fir.shape<2>) -> !fir.array<200x200xf32>
-! CHECK: %[[VAL_27:.*]] = fir.do_loop %[[VAL_28:.*]] = %[[VAL_12]] to %[[VAL_14]] step %[[VAL_15]] unordered iter_args(%[[VAL_29:.*]] = %[[VAL_22]]) -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_30:.*]] = fir.convert %[[VAL_28]] : (index) -> i32
-! CHECK: fir.store %[[VAL_30]] to %[[VAL_6]] : !fir.ref<i32>
-! CHECK: %[[VAL_31:.*]] = fir.do_loop %[[VAL_32:.*]] = %[[VAL_17]] to %[[VAL_19]] step %[[VAL_20]] unordered iter_args(%[[VAL_33:.*]] = %[[VAL_29]]) -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_34:.*]] = fir.convert %[[VAL_32]] : (index) -> i32
-! CHECK: fir.store %[[VAL_34]] to %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_35:.*]] = fir.load %[[VAL_6]] : !fir.ref<i32>
-! CHECK: %[[VAL_36:.*]] = fir.convert %[[VAL_35]] : (i32) -> i64
-! CHECK: %[[VAL_37:.*]] = arith.constant 1 : i64
-! CHECK: %[[VAL_38:.*]] = arith.subi %[[VAL_36]], %[[VAL_37]] : i64
-! CHECK: %[[VAL_39:.*]] = fir.load %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_39]] : (i32) -> i64
-! CHECK: %[[VAL_41:.*]] = arith.constant 1 : i64
-! CHECK: %[[VAL_42:.*]] = arith.subi %[[VAL_40]], %[[VAL_41]] : i64
-! CHECK: %[[VAL_43:.*]] = fir.coordinate_of %[[VAL_2]], %[[VAL_38]], %[[VAL_42]] : (!fir.ref<!fir.array<100x200x!fir.logical<4>>>, i64, i64) -> !fir.ref<!fir.logical<4>>
-! CHECK: %[[VAL_44:.*]] = fir.load %[[VAL_43]] : !fir.ref<!fir.logical<4>>
-! CHECK: %[[VAL_45:.*]] = fir.convert %[[VAL_44]] : (!fir.logical<4>) -> i1
-! CHECK: %[[VAL_46:.*]] = fir.if %[[VAL_45]] -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_47:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_48:.*]] = fir.load %[[VAL_6]] : !fir.ref<i32>
-! CHECK: %[[VAL_49:.*]] = fir.convert %[[VAL_48]] : (i32) -> i64
-! CHECK: %[[VAL_50:.*]] = fir.convert %[[VAL_49]] : (i64) -> index
-! CHECK: %[[VAL_51:.*]] = arith.subi %[[VAL_50]], %[[VAL_47]] : index
-! CHECK: %[[VAL_52:.*]] = fir.load %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_53:.*]] = fir.convert %[[VAL_52]] : (i32) -> i64
-! CHECK: %[[VAL_54:.*]] = fir.convert %[[VAL_53]] : (i64) -> index
-! CHECK: %[[VAL_55:.*]] = arith.subi %[[VAL_54]], %[[VAL_47]] : index
-! CHECK: %[[VAL_67:.*]] = fir.array_fetch %[[VAL_24]], %[[VAL_51]], %[[VAL_55]] : (!fir.array<200x200xf32>, index, index) -> f32
-! CHECK: %[[VAL_56:.*]] = arith.constant 1 : index
-! CHECK-DAG: %[[VAL_57:.*]] = fir.load %[[VAL_6]] : !fir.ref<i32>
-! CHECK-DAG: %[[VAL_58:.*]] = arith.constant 1 : i32
-! CHECK: %[[VAL_59:.*]] = arith.addi %[[VAL_57]], %[[VAL_58]] : i32
-! CHECK: %[[VAL_60:.*]] = fir.convert %[[VAL_59]] : (i32) -> i64
-! CHECK: %[[VAL_61:.*]] = fir.convert %[[VAL_60]] : (i64) -> index
-! CHECK: %[[VAL_62:.*]] = arith.subi %[[VAL_61]], %[[VAL_56]] : index
-! CHECK: %[[VAL_63:.*]] = fir.load %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_64:.*]] = fir.convert %[[VAL_63]] : (i32) -> i64
-! CHECK: %[[VAL_65:.*]] = fir.convert %[[VAL_64]] : (i64) -> index
-! CHECK: %[[VAL_66:.*]] = arith.subi %[[VAL_65]], %[[VAL_56]] : index
-! CHECK: %[[VAL_68:.*]] = fir.array_fetch %[[VAL_26]], %[[VAL_62]], %[[VAL_66]] : (!fir.array<200x200xf32>, index, index) -> f32
-! CHECK: %[[VAL_69:.*]] = arith.addf %[[VAL_67]], %[[VAL_68]] {{.*}}: f32
-! CHECK: %[[VAL_70:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_71:.*]] = fir.load %[[VAL_6]] : !fir.ref<i32>
-! CHECK: %[[VAL_72:.*]] = fir.convert %[[VAL_71]] : (i32) -> i64
-! CHECK: %[[VAL_73:.*]] = fir.convert %[[VAL_72]] : (i64) -> index
-! CHECK: %[[VAL_74:.*]] = arith.subi %[[VAL_73]], %[[VAL_70]] : index
-! CHECK: %[[VAL_75:.*]] = fir.load %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_76:.*]] = fir.convert %[[VAL_75]] : (i32) -> i64
-! CHECK: %[[VAL_77:.*]] = fir.convert %[[VAL_76]] : (i64) -> index
-! CHECK: %[[VAL_78:.*]] = arith.subi %[[VAL_77]], %[[VAL_70]] : index
-! CHECK: %[[VAL_79:.*]] = fir.array_update %[[VAL_33]], %[[VAL_69]], %[[VAL_74]], %[[VAL_78]] : (!fir.array<100x400xf32>, f32, index, index) -> !fir.array<100x400xf32>
-! CHECK: fir.result %[[VAL_79]] : !fir.array<100x400xf32>
-! CHECK: } else {
-! CHECK: fir.result %[[VAL_33]] : !fir.array<100x400xf32>
+! CHECK: %[[VAL_17:.*]] = arith.constant 100 : i32
+! CHECK: %[[VAL_18:.*]] = arith.constant 1 : i32
+! CHECK: %[[VAL_19:.*]] = arith.constant 200 : i32
+! CHECK: hlfir.forall lb {
+! CHECK: hlfir.yield %[[VAL_16]] : i32
+! CHECK: } ub {
+! CHECK: hlfir.yield %[[VAL_17]] : i32
+! CHECK: } (%[[VAL_20:.*]]: i32) {
+! CHECK: %[[VAL_21:.*]] = hlfir.forall_index "i" %[[VAL_20]] : (i32) -> !fir.ref<i32>
+! CHECK: hlfir.forall lb {
+! CHECK: hlfir.yield %[[VAL_18]] : i32
+! CHECK: } ub {
+! CHECK: hlfir.yield %[[VAL_19]] : i32
+! CHECK: } (%[[VAL_22:.*]]: i32) {
+! CHECK: %[[VAL_23:.*]] = hlfir.forall_index "j" %[[VAL_22]] : (i32) -> !fir.ref<i32>
+! CHECK: hlfir.forall_mask {
+! CHECK: %[[VAL_24:.*]] = fir.load %[[VAL_21]] : !fir.ref<i32>
+! CHECK: %[[VAL_25:.*]] = fir.convert %[[VAL_24]] : (i32) -> i64
+! CHECK: %[[VAL_26:.*]] = fir.load %[[VAL_23]] : !fir.ref<i32>
+! CHECK: %[[VAL_27:.*]] = fir.convert %[[VAL_26]] : (i32) -> i64
+! CHECK: %[[VAL_28:.*]] = hlfir.designate %[[VAL_15]]#0 (%[[VAL_25]], %[[VAL_27]]) : (!fir.ref<!fir.array<100x200x!fir.logical<4>>>, i64, i64) -> !fir.ref<!fir.logical<4>>
+! CHECK: %[[VAL_29:.*]] = fir.load %[[VAL_28]] : !fir.ref<!fir.logical<4>>
+! CHECK: %[[VAL_30:.*]] = fir.convert %[[VAL_29]] : (!fir.logical<4>) -> i1
+! CHECK: hlfir.yield %[[VAL_30]] : i1
+! CHECK: } do {
+! CHECK: hlfir.region_assign {
+! CHECK: %[[VAL_31:.*]] = fir.load %[[VAL_21]] : !fir.ref<i32>
+! CHECK: %[[VAL_32:.*]] = fir.convert %[[VAL_31]] : (i32) -> i64
+! CHECK: %[[VAL_33:.*]] = fir.load %[[VAL_23]] : !fir.ref<i32>
+! CHECK: %[[VAL_34:.*]] = fir.convert %[[VAL_33]] : (i32) -> i64
+! CHECK: %[[VAL_35:.*]] = hlfir.designate %[[VAL_11]]#0 (%[[VAL_32]], %[[VAL_34]]) : (!fir.ref<!fir.array<200x200xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK: %[[VAL_36:.*]] = fir.load %[[VAL_35]] : !fir.ref<f32>
+! CHECK: %[[VAL_37:.*]] = fir.load %[[VAL_21]] : !fir.ref<i32>
+! CHECK: %[[VAL_38:.*]] = arith.constant 1 : i32
+! CHECK: %[[VAL_39:.*]] = arith.addi %[[VAL_37]], %[[VAL_38]] overflow<nsw> : i32
+! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_39]] : (i32) -> i64
+! CHECK: %[[VAL_41:.*]] = fir.load %[[VAL_23]] : !fir.ref<i32>
+! CHECK: %[[VAL_42:.*]] = fir.convert %[[VAL_41]] : (i32) -> i64
+! CHECK: %[[VAL_43:.*]] = hlfir.designate %[[VAL_11]]#0 (%[[VAL_40]], %[[VAL_42]]) : (!fir.ref<!fir.array<200x200xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK: %[[VAL_44:.*]] = fir.load %[[VAL_43]] : !fir.ref<f32>
+! CHECK: %[[VAL_45:.*]] = arith.addf %[[VAL_36]], %[[VAL_44]] fastmath<contract> : f32
+! CHECK: hlfir.yield %[[VAL_45]] : f32
+! CHECK: } to {
+! CHECK: %[[VAL_46:.*]] = fir.load %[[VAL_21]] : !fir.ref<i32>
+! CHECK: %[[VAL_47:.*]] = fir.convert %[[VAL_46]] : (i32) -> i64
+! CHECK: %[[VAL_48:.*]] = fir.load %[[VAL_23]] : !fir.ref<i32>
+! CHECK: %[[VAL_49:.*]] = fir.convert %[[VAL_48]] : (i32) -> i64
+! CHECK: %[[VAL_50:.*]] = hlfir.designate %[[VAL_7]]#0 (%[[VAL_47]], %[[VAL_49]]) : (!fir.ref<!fir.array<100x400xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK: hlfir.yield %[[VAL_50]] : !fir.ref<f32>
+! CHECK: }
+! CHECK: hlfir.region_assign {
+! CHECK: %[[VAL_51:.*]] = arith.constant 1.000000e+00 : f32
+! CHECK: %[[VAL_52:.*]] = fir.load %[[VAL_23]] : !fir.ref<i32>
+! CHECK: %[[VAL_53:.*]] = fir.convert %[[VAL_52]] : (i32) -> i64
+! CHECK: %[[VAL_54:.*]] = fir.load %[[VAL_21]] : !fir.ref<i32>
+! CHECK: %[[VAL_55:.*]] = fir.convert %[[VAL_54]] : (i32) -> i64
+! CHECK: %[[VAL_56:.*]] = hlfir.designate %[[VAL_11]]#0 (%[[VAL_53]], %[[VAL_55]]) : (!fir.ref<!fir.array<200x200xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK: %[[VAL_57:.*]] = fir.load %[[VAL_56]] : !fir.ref<f32>
+! CHECK: %[[VAL_58:.*]] = arith.divf %[[VAL_51]], %[[VAL_57]] fastmath<contract> : f32
+! CHECK: hlfir.yield %[[VAL_58]] : f32
+! CHECK: } to {
+! CHECK: %[[VAL_59:.*]] = fir.load %[[VAL_21]] : !fir.ref<i32>
+! CHECK: %[[VAL_60:.*]] = fir.convert %[[VAL_59]] : (i32) -> i64
+! CHECK: %[[VAL_61:.*]] = arith.constant 200 : i32
+! CHECK: %[[VAL_62:.*]] = fir.load %[[VAL_23]] : !fir.ref<i32>
+! CHECK: %[[VAL_63:.*]] = arith.addi %[[VAL_61]], %[[VAL_62]] overflow<nsw> : i32
+! CHECK: %[[VAL_64:.*]] = fir.convert %[[VAL_63]] : (i32) -> i64
+! CHECK: %[[VAL_65:.*]] = hlfir.designate %[[VAL_7]]#0 (%[[VAL_60]], %[[VAL_64]]) : (!fir.ref<!fir.array<100x400xf32>>, i64, i64) -> !fir.ref<f32>
+! CHECK: hlfir.yield %[[VAL_65]] : !fir.ref<f32>
+! CHECK: }
! CHECK: }
-! CHECK: fir.result %[[VAL_80:.*]] : !fir.array<100x400xf32>
! CHECK: }
-! CHECK: fir.result %[[VAL_81:.*]] : !fir.array<100x400xf32>
! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_22]], %[[VAL_82:.*]] to %[[VAL_0]] : !fir.array<100x400xf32>, !fir.array<100x400xf32>, !fir.ref<!fir.array<100x400xf32>>
-! CHECK: %[[VAL_83:.*]] = fir.shape %[[VAL_7]], %[[VAL_8]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_84:.*]] = fir.array_load %[[VAL_0]](%[[VAL_83]]) : (!fir.ref<!fir.array<100x400xf32>>, !fir.shape<2>) -> !fir.array<100x400xf32>
-! CHECK: %[[VAL_85:.*]] = fir.shape %[[VAL_9]], %[[VAL_10]] : (index, index) -> !fir.shape<2>
-! CHECK: %[[VAL_86:.*]] = fir.array_load %[[VAL_1]](%[[VAL_85]]) : (!fir.ref<!fir.array<200x200xf32>>, !fir.shape<2>) -> !fir.array<200x200xf32>
-! CHECK: %[[VAL_87:.*]] = fir.do_loop %[[VAL_88:.*]] = %[[VAL_12]] to %[[VAL_14]] step %[[VAL_15]] unordered iter_args(%[[VAL_89:.*]] = %[[VAL_84]]) -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_90:.*]] = fir.convert %[[VAL_88]] : (index) -> i32
-! CHECK: fir.store %[[VAL_90]] to %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_91:.*]] = fir.do_loop %[[VAL_92:.*]] = %[[VAL_17]] to %[[VAL_19]] step %[[VAL_20]] unordered iter_args(%[[VAL_93:.*]] = %[[VAL_89]]) -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_94:.*]] = fir.convert %[[VAL_92]] : (index) -> i32
-! CHECK: fir.store %[[VAL_94]] to %[[VAL_3]] : !fir.ref<i32>
-! CHECK: %[[VAL_95:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_96:.*]] = fir.convert %[[VAL_95]] : (i32) -> i64
-! CHECK: %[[VAL_97:.*]] = arith.constant 1 : i64
-! CHECK: %[[VAL_98:.*]] = arith.subi %[[VAL_96]], %[[VAL_97]] : i64
-! CHECK: %[[VAL_99:.*]] = fir.load %[[VAL_3]] : !fir.ref<i32>
-! CHECK: %[[VAL_100:.*]] = fir.convert %[[VAL_99]] : (i32) -> i64
-! CHECK: %[[VAL_101:.*]] = arith.constant 1 : i64
-! CHECK: %[[VAL_102:.*]] = arith.subi %[[VAL_100]], %[[VAL_101]] : i64
-! CHECK: %[[VAL_103:.*]] = fir.coordinate_of %[[VAL_2]], %[[VAL_98]], %[[VAL_102]] : (!fir.ref<!fir.array<100x200x!fir.logical<4>>>, i64, i64) -> !fir.ref<!fir.logical<4>>
-! CHECK: %[[VAL_104:.*]] = fir.load %[[VAL_103]] : !fir.ref<!fir.logical<4>>
-! CHECK: %[[VAL_105:.*]] = fir.convert %[[VAL_104]] : (!fir.logical<4>) -> i1
-! CHECK: %[[VAL_106:.*]] = fir.if %[[VAL_105]] -> (!fir.array<100x400xf32>) {
-! CHECK: %[[VAL_107:.*]] = arith.constant 1.000000e+00 : f32
-! CHECK: %[[VAL_108:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_109:.*]] = fir.load %[[VAL_3]] : !fir.ref<i32>
-! CHECK: %[[VAL_110:.*]] = fir.convert %[[VAL_109]] : (i32) -> i64
-! CHECK: %[[VAL_111:.*]] = fir.convert %[[VAL_110]] : (i64) -> index
-! CHECK: %[[VAL_112:.*]] = arith.subi %[[VAL_111]], %[[VAL_108]] : index
-! CHECK: %[[VAL_113:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_114:.*]] = fir.convert %[[VAL_113]] : (i32) -> i64
-! CHECK: %[[VAL_115:.*]] = fir.convert %[[VAL_114]] : (i64) -> index
-! CHECK: %[[VAL_116:.*]] = arith.subi %[[VAL_115]], %[[VAL_108]] : index
-! CHECK: %[[VAL_117:.*]] = fir.array_fetch %[[VAL_86]], %[[VAL_112]], %[[VAL_116]] : (!fir.array<200x200xf32>, index, index) -> f32
-! CHECK: %[[VAL_118:.*]] = arith.divf %[[VAL_107]], %[[VAL_117]] {{.*}}: f32
-! CHECK: %[[VAL_119:.*]] = arith.constant 1 : index
-! CHECK: %[[VAL_120:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_121:.*]] = fir.convert %[[VAL_120]] : (i32) -> i64
-! CHECK: %[[VAL_122:.*]] = fir.convert %[[VAL_121]] : (i64) -> index
-! CHECK: %[[VAL_123:.*]] = arith.subi %[[VAL_122]], %[[VAL_119]] : index
-! CHECK: %[[VAL_124:.*]] = arith.constant 200 : i32
-! CHECK: %[[VAL_125:.*]] = fir.load %[[VAL_3]] : !fir.ref<i32>
-! CHECK: %[[VAL_126:.*]] = arith.addi %[[VAL_124]], %[[VAL_125]] : i32
-! CHECK: %[[VAL_127:.*]] = fir.convert %[[VAL_126]] : (i32) -> i64
-! CHECK: %[[VAL_128:.*]] = fir.convert %[[VAL_127]] : (i64) -> index
-! CHECK: %[[VAL_129:.*]] = arith.subi %[[VAL_128]], %[[VAL_119]] : index
-! CHECK: %[[VAL_130:.*]] = fir.array_update %[[VAL_93]], %[[VAL_118]], %[[VAL_123]], %[[VAL_129]] : (!fir.array<100x400xf32>, f32, index, index) -> !fir.array<100x400xf32>
-! CHECK: fir.result %[[VAL_130]] : !fir.array<100x400xf32>
-! CHECK: } else {
-! CHECK: fir.result %[[VAL_93]] : !fir.array<100x400xf32>
-! CHECK: }
-! CHECK: fir.result %[[VAL_131:.*]] : !fir.array<100x400xf32>
-! CHECK: }
-! CHECK: fir.result %[[VAL_132:.*]] : !fir.array<100x400xf32>
-! CHECK: }
-! CHECK: fir.array_merge_store %[[VAL_84]], %[[VAL_133:.*]] to %[[VAL_0]] : !fir.array<100x400xf32>, !fir.array<100x400xf32>, !fir.ref<!fir.array<100x400xf32>>
! CHECK: return
! CHECK: }
More information about the flang-commits
mailing list