[flang-commits] [flang] [flang][NFC] Converted five tests from old lowering to new lowering (part 42) (PR #191751)

Eugene Epshteyn via flang-commits flang-commits at lists.llvm.org
Sun Apr 12 19:38:59 PDT 2026


https://github.com/eugeneepshteyn created https://github.com/llvm/llvm-project/pull/191751

Tests converted from test/Lower/Intrinsics: storage_size.f90, sum.f90, system_clock.f90, trailz.f90, transfer.f90

>From c0d054b6328f2f9aeeeec54adc2cead912c06f30 Mon Sep 17 00:00:00 2001
From: Eugene Epshteyn <eepshteyn at nvidia.com>
Date: Sun, 12 Apr 2026 22:37:30 -0400
Subject: [PATCH] [flang][NFC] Converted five tests from old lowering to new
 lowering (part 42)

Tests converted from test/Lower/Intrinsics: storage_size.f90, sum.f90, system_clock.f90, trailz.f90, transfer.f90
---
 flang/test/Lower/Intrinsics/storage_size.f90 |  81 +++-----
 flang/test/Lower/Intrinsics/sum.f90          |  95 ++++-----
 flang/test/Lower/Intrinsics/system_clock.f90 | 197 ++++++++-----------
 flang/test/Lower/Intrinsics/trailz.f90       |  71 ++++---
 flang/test/Lower/Intrinsics/transfer.f90     | 118 +++--------
 5 files changed, 216 insertions(+), 346 deletions(-)

diff --git a/flang/test/Lower/Intrinsics/storage_size.f90 b/flang/test/Lower/Intrinsics/storage_size.f90
index d17602b4d4089..bf38ed8892b14 100644
--- a/flang/test/Lower/Intrinsics/storage_size.f90
+++ b/flang/test/Lower/Intrinsics/storage_size.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
 
 module storage_size_test
   type :: p1
@@ -21,23 +21,20 @@ integer function unlimited_polymorphic_pointer(p) result(size)
   end function
 
 ! CHECK-LABEL: func.func @_QMstorage_size_testPunlimited_polymorphic_pointer(
-! CHECK-SAME: %[[P:.*]]: !fir.ref<!fir.class<!fir.ptr<none>>> {fir.bindc_name = "p"}) -> i32 {
-! CHECK: %[[SIZE:.*]] = fir.alloca i32 {bindc_name = "size", uniq_name = "_QMstorage_size_testFunlimited_polymorphic_pointerEsize"}
-! CHECK: %[[LOAD_P:.*]] = fir.load %[[P]] : !fir.ref<!fir.class<!fir.ptr<none>>>
+! CHECK-SAME: %[[P:.*]]: !fir.ref<!fir.class<!fir.ptr<none>>>
+! CHECK: %[[pDecl:.*]]:2 = hlfir.declare %[[P]]
+! CHECK: %[[LOAD_P:.*]] = fir.load %[[pDecl]]#0 : !fir.ref<!fir.class<!fir.ptr<none>>>
 ! CHECK: %[[P_ADDR:.*]] = fir.box_addr %[[LOAD_P]] : (!fir.class<!fir.ptr<none>>) -> !fir.ptr<none>
 ! CHECK: %[[P_ADDR_I64:.*]] = fir.convert %[[P_ADDR]] : (!fir.ptr<none>) -> i64
 ! CHECK: %[[C0:.*]] = arith.constant 0 : i64
 ! CHECK: %[[IS_NULL_ADDR:.*]] = arith.cmpi eq, %[[P_ADDR_I64]], %[[C0]] : i64
 ! CHECK: fir.if %[[IS_NULL_ADDR]] {
-! CHECK:   fir.call @_FortranAReportFatalUserError(%{{.*}}, %{{.*}}, %{{.*}}) {{.*}} : (!fir.ref<i8>, !fir.ref<i8>, i32) -> ()
+! CHECK:   fir.call @_FortranAReportFatalUserError
 ! CHECK: }
-! CHECK: %[[LOAD_P:.*]] = fir.load %[[P]] : !fir.ref<!fir.class<!fir.ptr<none>>>
-! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[LOAD_P]] : (!fir.class<!fir.ptr<none>>) -> i32
+! CHECK: %[[LOAD_P2:.*]] = fir.load %[[pDecl]]#0 : !fir.ref<!fir.class<!fir.ptr<none>>>
+! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[LOAD_P2]] : (!fir.class<!fir.ptr<none>>) -> i32
 ! CHECK: %[[C8:.*]] = arith.constant 8 : i32
 ! CHECK: %[[BITS:.*]] = arith.muli %[[ELE_SIZE]], %[[C8]] : i32
-! CHECK: fir.store %[[BITS]] to %[[SIZE]] : !fir.ref<i32>
-! CHECK: %[[RES:.*]] = fir.load %[[SIZE]] : !fir.ref<i32>
-! CHECK: return %[[RES]] : i32
 
   integer function unlimited_polymorphic_allocatable(p) result(size)
     class(*), allocatable :: p
@@ -45,23 +42,20 @@ integer function unlimited_polymorphic_allocatable(p) result(size)
   end function
 
 ! CHECK-LABEL: func.func @_QMstorage_size_testPunlimited_polymorphic_allocatable(
-! CHECK-SAME: %[[P:.*]]: !fir.ref<!fir.class<!fir.heap<none>>> {fir.bindc_name = "p"}) -> i32 {
-! CHECK: %[[SIZE:.*]] = fir.alloca i32 {bindc_name = "size", uniq_name = "_QMstorage_size_testFunlimited_polymorphic_allocatableEsize"}
-! CHECK: %[[LOAD_P:.*]] = fir.load %[[P]] : !fir.ref<!fir.class<!fir.heap<none>>>
+! CHECK-SAME: %[[P:.*]]: !fir.ref<!fir.class<!fir.heap<none>>>
+! CHECK: %[[pDecl:.*]]:2 = hlfir.declare %[[P]]
+! CHECK: %[[LOAD_P:.*]] = fir.load %[[pDecl]]#0 : !fir.ref<!fir.class<!fir.heap<none>>>
 ! CHECK: %[[P_ADDR:.*]] = fir.box_addr %[[LOAD_P]] : (!fir.class<!fir.heap<none>>) -> !fir.heap<none>
 ! CHECK: %[[P_ADDR_I64:.*]] = fir.convert %[[P_ADDR]] : (!fir.heap<none>) -> i64
 ! CHECK: %[[C0:.*]] = arith.constant 0 : i64
 ! CHECK: %[[IS_NULL_ADDR:.*]] = arith.cmpi eq, %[[P_ADDR_I64]], %[[C0]] : i64
 ! CHECK: fir.if %[[IS_NULL_ADDR]] {
-! CHECK:   fir.call @_FortranAReportFatalUserError(%{{.*}}, %{{.*}}, %{{.*}}) {{.*}} : (!fir.ref<i8>, !fir.ref<i8>, i32) -> ()
+! CHECK:   fir.call @_FortranAReportFatalUserError
 ! CHECK: }
-! CHECK: %[[LOAD_P:.*]] = fir.load %[[P]] : !fir.ref<!fir.class<!fir.heap<none>>>
-! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[LOAD_P]] : (!fir.class<!fir.heap<none>>) -> i32
+! CHECK: %[[LOAD_P2:.*]] = fir.load %[[pDecl]]#0 : !fir.ref<!fir.class<!fir.heap<none>>>
+! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[LOAD_P2]] : (!fir.class<!fir.heap<none>>) -> i32
 ! CHECK: %[[C8:.*]] = arith.constant 8 : i32
 ! CHECK: %[[BITS:.*]] = arith.muli %[[ELE_SIZE]], %[[C8]] : i32
-! CHECK: fir.store %[[BITS]] to %[[SIZE]] : !fir.ref<i32>
-! CHECK: %[[RES:.*]] = fir.load %[[SIZE]] : !fir.ref<i32>
-! CHECK: return %[[RES]] : i32
 
   integer function polymorphic_pointer(p) result(size)
     class(p1), pointer :: p
@@ -69,15 +63,12 @@ integer function polymorphic_pointer(p) result(size)
   end function
 
 ! CHECK-LABEL: func.func @_QMstorage_size_testPpolymorphic_pointer(
-! CHECK-SAME: %[[P:.*]]: !fir.ref<!fir.class<!fir.ptr<!fir.type<_QMstorage_size_testTp1{a:i32}>>>> {fir.bindc_name = "p"}) -> i32 {
-! CHECK: %[[SIZE:.*]] = fir.alloca i32 {bindc_name = "size", uniq_name = "_QMstorage_size_testFpolymorphic_pointerEsize"}
-! CHECK: %[[LOAD_P:.*]] = fir.load %[[P]] : !fir.ref<!fir.class<!fir.ptr<!fir.type<_QMstorage_size_testTp1{a:i32}>>>>
+! CHECK-SAME: %[[P:.*]]: !fir.ref<!fir.class<!fir.ptr<!fir.type<_QMstorage_size_testTp1{a:i32}>>>>
+! CHECK: %[[pDecl:.*]]:2 = hlfir.declare %[[P]]
+! CHECK: %[[LOAD_P:.*]] = fir.load %[[pDecl]]#0 : !fir.ref<!fir.class<!fir.ptr<!fir.type<_QMstorage_size_testTp1{a:i32}>>>>
 ! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[LOAD_P]] : (!fir.class<!fir.ptr<!fir.type<_QMstorage_size_testTp1{a:i32}>>>) -> i32
 ! CHECK: %[[C8:.*]] = arith.constant 8 : i32
 ! CHECK: %[[BITS:.*]] = arith.muli %[[ELE_SIZE]], %[[C8]] : i32
-! CHECK: fir.store %[[BITS]] to %[[SIZE]] : !fir.ref<i32>
-! CHECK: %[[RES:.*]] = fir.load %[[SIZE]] : !fir.ref<i32>
-! CHECK: return %[[RES]] : i32
 
   integer function polymorphic(p) result(size)
     class(p1) :: p
@@ -85,14 +76,11 @@ integer function polymorphic(p) result(size)
   end function
 
 ! CHECK-LABEL: func.func @_QMstorage_size_testPpolymorphic(
-! CHECK-SAME: %[[P:.*]]: !fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>> {fir.bindc_name = "p"}) -> i32 {
-! CHECK: %[[SIZE:.*]] = fir.alloca i32 {bindc_name = "size", uniq_name = "_QMstorage_size_testFpolymorphicEsize"}
-! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[P]] : (!fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>) -> i32
+! CHECK-SAME: %[[P:.*]]: !fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>
+! CHECK: %[[pDecl:.*]]:2 = hlfir.declare %[[P]]
+! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[pDecl]]#1 : (!fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>) -> i32
 ! CHECK: %[[C8:.*]] = arith.constant 8 : i32
 ! CHECK: %[[BITS:.*]] = arith.muli %[[ELE_SIZE]], %[[C8]] : i32
-! CHECK: fir.store %[[BITS]] to %[[SIZE]] : !fir.ref<i32>
-! CHECK: %[[RES:.*]] = fir.load %[[SIZE]] : !fir.ref<i32>
-! CHECK: return %[[RES]] : i32
 
   integer(8) function polymorphic_rank(p) result(size)
     class(p1) :: p
@@ -100,14 +88,11 @@ integer(8) function polymorphic_rank(p) result(size)
   end function
 
 ! CHECK-LABEL: func.func @_QMstorage_size_testPpolymorphic_rank(
-! CHECK-SAME: %[[P:.*]]: !fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>> {fir.bindc_name = "p"}) -> i64 {
-! CHECK: %[[SIZE:.*]] = fir.alloca i64 {bindc_name = "size", uniq_name = "_QMstorage_size_testFpolymorphic_rankEsize"}
-! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[P]] : (!fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>) -> i64
+! CHECK-SAME: %[[P:.*]]: !fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>
+! CHECK: %[[pDecl:.*]]:2 = hlfir.declare %[[P]]
+! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[pDecl]]#1 : (!fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>) -> i64
 ! CHECK: %[[C8:.*]] = arith.constant 8 : i64
 ! CHECK: %[[BITS:.*]] = arith.muli %[[ELE_SIZE]], %[[C8]] : i64
-! CHECK: fir.store %[[BITS]] to %[[SIZE]] : !fir.ref<i64>
-! CHECK: %[[RES:.*]] = fir.load %[[SIZE]] : !fir.ref<i64>
-! CHECK: return %[[RES]] : i64
 
   integer function polymorphic_value(t) result(size)
     type(p3) :: t
@@ -115,22 +100,14 @@ integer function polymorphic_value(t) result(size)
   end function
 
 ! CHECK-LABEL: func.func @_QMstorage_size_testPpolymorphic_value(
-! CHECK-SAME: %[[T:.*]]: !fir.ref<!fir.type<_QMstorage_size_testTp3{p:!fir.class<!fir.ptr<!fir.array<?x!fir.type<_QMstorage_size_testTp1{a:i32}>>>>}>> {fir.bindc_name = "t"}) -> i32 {
-! CHECK: %[[ALLOCA:.*]] = fir.alloca i32 {bindc_name = "size", uniq_name = "_QMstorage_size_testFpolymorphic_valueEsize"}
-! CHECK: %[[COORD_P:.*]] = fir.coordinate_of %[[T]], p : (!fir.ref<!fir.type<_QMstorage_size_testTp3{p:!fir.class<!fir.ptr<!fir.array<?x!fir.type<_QMstorage_size_testTp1{a:i32}>>>>}>>) -> !fir.ref<!fir.class<!fir.ptr<!fir.array<?x!fir.type<_QMstorage_size_testTp1{a:i32}>>>>>
-! CHECK: %[[LOAD_COORD_P:.*]] = fir.load %[[COORD_P]] : !fir.ref<!fir.class<!fir.ptr<!fir.array<?x!fir.type<_QMstorage_size_testTp1{a:i32}>>>>>
-! CHECK: %[[C0:.*]] = arith.constant 0 : index
-! CHECK: %[[BOX_DIMS:.*]]:3 = fir.box_dims %[[LOAD_COORD_P]], %[[C0]] : (!fir.class<!fir.ptr<!fir.array<?x!fir.type<_QMstorage_size_testTp1{a:i32}>>>>, index) -> (index, index, index)
-! CHECK: %[[C1:.*]] = arith.constant 1 : i64
-! CHECK: %[[DIMI64:.*]] = fir.convert %[[BOX_DIMS]]#0 : (index) -> i64
-! CHECK: %[[IDX:.*]] = arith.subi %[[C1]], %[[DIMI64]] : i64
-! CHECK: %[[COORD_OF:.*]] = fir.coordinate_of %[[LOAD_COORD_P]], %[[IDX]] : (!fir.class<!fir.ptr<!fir.array<?x!fir.type<_QMstorage_size_testTp1{a:i32}>>>>, i64) -> !fir.ref<!fir.type<_QMstorage_size_testTp1{a:i32}>>
-! CHECK: %[[BOXED:.*]] = fir.embox %[[COORD_OF]] source_box %[[LOAD_COORD_P]] : (!fir.ref<!fir.type<_QMstorage_size_testTp1{a:i32}>>, !fir.class<!fir.ptr<!fir.array<?x!fir.type<_QMstorage_size_testTp1{a:i32}>>>>) -> !fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>
-! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[BOXED]] : (!fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>) -> i32
+! CHECK-SAME: %[[T:.*]]: !fir.ref<!fir.type<_QMstorage_size_testTp3{p:!fir.class<!fir.ptr<!fir.array<?x!fir.type<_QMstorage_size_testTp1{a:i32}>>>>}>>
+! CHECK: %[[tDecl:.*]]:2 = hlfir.declare %[[T]]
+! CHECK: %[[FIELD_P:.*]] = hlfir.designate %[[tDecl]]#0{"p"}
+! CHECK: %[[LOAD_P:.*]] = fir.load %[[FIELD_P]]
+! CHECK: %[[C1:.*]] = arith.constant 1 : index
+! CHECK: %[[ELEM:.*]] = hlfir.designate %[[LOAD_P]] (%[[C1]])
+! CHECK: %[[ELE_SIZE:.*]] = fir.box_elesize %[[ELEM]] : (!fir.class<!fir.type<_QMstorage_size_testTp1{a:i32}>>) -> i32
 ! CHECK: %[[C8:.*]] = arith.constant 8 : i32
 ! CHECK: %[[SIZE:.*]] = arith.muli %[[ELE_SIZE]], %[[C8]] : i32
-! CHECK: fir.store %[[SIZE]] to %[[ALLOCA]] : !fir.ref<i32>
-! CHECK: %[[RET:.*]] = fir.load %[[ALLOCA]] : !fir.ref<i32>
-! CHECK: return %[[RET]] : i32
 
 end module
diff --git a/flang/test/Lower/Intrinsics/sum.f90 b/flang/test/Lower/Intrinsics/sum.f90
index 454d564684e89..1150084dfa57b 100644
--- a/flang/test/Lower/Intrinsics/sum.f90
+++ b/flang/test/Lower/Intrinsics/sum.f90
@@ -1,63 +1,41 @@
 ! REQUIRES: x86-registered-target
-! RUN: bbc -target x86_64-unknown-linux-gnu --use-desc-for-alloc=false -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -triple x86_64-unknown-linux-gnu -emit-hlfir %s -o - | FileCheck %s
 
 ! CHECK-LABEL: func @_QPsum_test(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32 {
+! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32
 integer function sum_test(a)
 integer :: a(:)
-! CHECK-DAG:  %[[c0:.*]] = arith.constant 0 : index
-! CHECK-DAG:  %[[a1:.*]] = fir.absent !fir.box<i1>
-! CHECK-DAG: %[[a3:.*]] = fir.convert %[[arg0]] : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
-! CHECK-DAG:  %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG:  %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK: hlfir.declare %[[arg0]]
 sum_test = sum(a)
-! CHECK:  %{{.*}} = fir.call @_FortranASumInteger4(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: hlfir.sum {{.*}} : (!fir.box<!fir.array<?xi32>>) -> i32
 end function
 
 ! CHECK-LABEL: func @_QPsum_test2(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?x?xi32>>{{.*}}, %[[arg1:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) {
+! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?x?xi32>>{{.*}}, %[[arg1:.*]]: !fir.box<!fir.array<?xi32>>
 subroutine sum_test2(a,r)
 integer :: a(:,:)
 integer :: r(:)
 ! CHECK-DAG:  %[[c2_i32:.*]] = arith.constant 2 : i32
-! CHECK-DAG:  %[[a0:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?xi32>>>
-! CHECK-DAG:  %[[a1:.*]] = fir.absent !fir.box<i1>
-! CHECK-DAG:  %[[a6:.*]] = fir.convert %[[a0]] : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
-! CHECK-DAG:  %[[a7:.*]] = fir.convert %[[arg0]] : (!fir.box<!fir.array<?x?xi32>>) -> !fir.box<none>
-! CHECK-DAG:  %[[a9:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK-DAG: %[[aDecl:.*]]:2 = hlfir.declare %[[arg0]]
+! CHECK-DAG: %[[rDecl:.*]]:2 = hlfir.declare %[[arg1]]
 r = sum(a,dim=2)
-! CHECK:  fir.call @_FortranASumDim(%[[a6]], %[[a7]], %[[c2_i32]], %{{.*}}, %{{.*}}, %[[a9]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, !fir.ref<i8>, i32, !fir.box<none>) -> ()
-! CHECK-DAG: %[[a11:.*]] = fir.load %[[a0]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
-! CHECK-DAG:  %[[a13:.*]] = fir.box_addr %[[a11]] : (!fir.box<!fir.heap<!fir.array<?xi32>>>) -> !fir.heap<!fir.array<?xi32>>
-! CHECK-DAG:  fir.freemem %[[a13]]
+! CHECK: hlfir.sum %[[aDecl]]#0 dim %[[c2_i32]] {{.*}} : (!fir.box<!fir.array<?x?xi32>>, i32) -> !hlfir.expr<?xi32>
 end subroutine
 
 ! CHECK-LABEL: func @_QPsum_test3(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xcomplex<f32>>>{{.*}}) -> complex<f32> {
+! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xcomplex<f32>>>{{.*}}) -> complex<f32>
 complex function sum_test3(a)
 complex :: a(:)
-! CHECK-DAG:  %[[c0:.*]] = arith.constant 0 : index
-! CHECK-DAG:  %[[a0:.*]] = fir.alloca complex<f32>
-! CHECK-DAG:  %[[a3:.*]] = fir.absent !fir.box<i1>
-! CHECK-DAG:  %[[a6:.*]] = fir.convert %[[arg0]] : (!fir.box<!fir.array<?xcomplex<f32>>>) -> !fir.box<none>
-! CHECK-DAG:  %[[a8:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG:  %[[a9:.*]] = fir.convert %[[a3]] : (!fir.box<i1>) -> !fir.box<none>
 sum_test3 = sum(a)
-! CHECK:  fir.call @_FortranACppSumComplex4(%[[a0]], %[[a6]], %{{.*}}, %{{.*}}, %[[a8]], %[[a9]]) {{.*}}: (!fir.ref<complex<f32>>, !fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> ()
+! CHECK: hlfir.sum {{.*}} : (!fir.box<!fir.array<?xcomplex<f32>>>) -> complex<f32>
 end function
 
 ! CHECK-LABEL: func @_QPsum_test4(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xcomplex<f80>>>{{.*}}) -> complex<f80> {
+! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xcomplex<f80>>>{{.*}}) -> complex<f80>
 complex(10) function sum_test4(x)
 complex(10):: x(:)
-! CHECK-DAG:  %[[c0:.*]] = arith.constant 0 : index
-! CHECK-DAG:  %[[a0:.*]] = fir.alloca complex<f80>
 sum_test4 = sum(x)
-! CHECK-DAG: %[[a2:.*]] = fir.absent !fir.box<i1>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[arg0]] : (!fir.box<!fir.array<?xcomplex<f80>>>) -> !fir.box<none>
-! CHECK-DAG:  %[[a7:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG:  %[[a8:.*]] = fir.convert %[[a2]] : (!fir.box<i1>) -> !fir.box<none>
-! CHECK: fir.call @_FortranACppSumComplex10(%[[a0]], %[[a5]], %{{.*}}, %{{.*}}, %[[a7]], %{{[0-9]+}}) {{.*}}: (!fir.ref<complex<f80>>, !fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> ()
+! CHECK: hlfir.sum {{.*}} : (!fir.box<!fir.array<?xcomplex<f80>>>) -> complex<f80>
 end
 
 ! CHECK-LABEL: func @_QPsum_test_optional(
@@ -66,8 +44,12 @@ integer function sum_test_optional(mask, x)
 integer :: x(:)
 logical, optional :: mask(:)
 sum_test_optional = sum(x, mask=mask)
-! CHECK:  %[[VAL_9:.*]] = fir.convert %[[VAL_0]] : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
-! CHECK:  fir.call @_FortranASumInteger4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_9]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK-DAG:  %[[maskDecl:.*]]:2 = hlfir.declare %[[VAL_0]] {{.*}}optional
+! CHECK-DAG:  %[[xDecl:.*]]:2 = hlfir.declare %{{.*}} {{.*}}{uniq_name = "_QFsum_test_optionalEx"}
+! CHECK:  %[[isPresent:.*]] = fir.is_present %[[maskDecl]]#0
+! CHECK:  %[[absent:.*]] = fir.absent !fir.box<!fir.array<?x!fir.logical<4>>>
+! CHECK:  %[[opt:.*]] = arith.select %[[isPresent]], %[[maskDecl]]#1, %[[absent]]
+! CHECK:  hlfir.sum %[[xDecl]]#0 mask %[[opt]] {{.*}} : (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?x!fir.logical<4>>>) -> i32
 end function
 
 ! CHECK-LABEL: func @_QPsum_test_optional_2(
@@ -76,16 +58,16 @@ integer function sum_test_optional_2(mask, x)
 integer :: x(:)
 logical, pointer :: mask(:)
 sum_test_optional = sum(x, mask=mask)
-! CHECK:  %[[VAL_4:.*]] = fir.load %[[VAL_0]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>
+! CHECK:  %[[maskDecl:.*]]:2 = hlfir.declare %[[VAL_0]]
+! CHECK:  %[[VAL_4:.*]] = fir.load %[[maskDecl]]#0 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>
 ! CHECK:  %[[VAL_5:.*]] = fir.box_addr %[[VAL_4]] : (!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>) -> !fir.ptr<!fir.array<?x!fir.logical<4>>>
 ! CHECK:  %[[VAL_6:.*]] = fir.convert %[[VAL_5]] : (!fir.ptr<!fir.array<?x!fir.logical<4>>>) -> i64
 ! CHECK:  %[[VAL_7:.*]] = arith.constant 0 : i64
 ! CHECK:  %[[VAL_8:.*]] = arith.cmpi ne, %[[VAL_6]], %[[VAL_7]] : i64
-! CHECK:  %[[VAL_9:.*]] = fir.load %[[VAL_0]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>
+! CHECK:  %[[VAL_9:.*]] = fir.load %[[maskDecl]]#0 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>
 ! CHECK:  %[[VAL_10:.*]] = fir.absent !fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>
 ! CHECK:  %[[VAL_11:.*]] = arith.select %[[VAL_8]], %[[VAL_9]], %[[VAL_10]] : !fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>
-! CHECK:  %[[VAL_18:.*]] = fir.convert %[[VAL_11]] : (!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>) -> !fir.box<none>
-! CHECK:  fir.call @_FortranASumInteger4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_18]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK:  hlfir.sum {{.*}} mask %[[VAL_11]] {{.*}} : (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>) -> i32
 end function
 
 ! CHECK-LABEL: func @_QPsum_test_optional_3(
@@ -94,14 +76,13 @@ integer function sum_test_optional_3(mask, x)
 integer :: x(:)
 logical, optional :: mask(10)
 sum_test_optional = sum(x, mask=mask)
-! CHECK:  %[[VAL_2:.*]] = arith.constant 10 : index
-! CHECK:  %[[VAL_5:.*]] = fir.is_present %[[VAL_0]] : (!fir.ref<!fir.array<10x!fir.logical<4>>>) -> i1
-! CHECK:  %[[VAL_6:.*]] = fir.shape %[[VAL_2]] : (index) -> !fir.shape<1>
-! CHECK:  %[[VAL_7:.*]] = fir.embox %[[VAL_0]](%[[VAL_6]]) : (!fir.ref<!fir.array<10x!fir.logical<4>>>, !fir.shape<1>) -> !fir.box<!fir.array<10x!fir.logical<4>>>
+! CHECK:  %[[maskDecl:.*]]:2 = hlfir.declare %[[VAL_0]]
+! CHECK:  %[[VAL_5:.*]] = fir.is_present %[[maskDecl]]#0 : (!fir.ref<!fir.array<10x!fir.logical<4>>>) -> i1
+! CHECK:  %[[VAL_6:.*]] = fir.shape
+! CHECK:  %[[VAL_7:.*]] = fir.embox %[[maskDecl]]#0(%[[VAL_6]])
 ! CHECK:  %[[VAL_8:.*]] = fir.absent !fir.box<!fir.array<10x!fir.logical<4>>>
 ! CHECK:  %[[VAL_9:.*]] = arith.select %[[VAL_5]], %[[VAL_7]], %[[VAL_8]] : !fir.box<!fir.array<10x!fir.logical<4>>>
-! CHECK:  %[[VAL_18:.*]] = fir.convert %[[VAL_9]] : (!fir.box<!fir.array<10x!fir.logical<4>>>) -> !fir.box<none>
-! CHECK:  fir.call @_FortranASumInteger4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_18]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK:  hlfir.sum {{.*}} mask %[[VAL_9]] {{.*}} : (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<10x!fir.logical<4>>>) -> i32
 end function
 
 ! CHECK-LABEL: func @_QPsum_test_optional_4(
@@ -117,17 +98,13 @@ integer function sum_test_optional_4(x, use_mask)
   ! CHECK: fir.call @_QPset_mask
 end if
 sum_test_optional = sum(x, mask=mask)
-! CHECK:  %[[VAL_20:.*]] = fir.load %[[VAL_3:.*]] : !fir.ref<!fir.heap<!fir.array<?x!fir.logical<4>>>>
-! CHECK:  %[[VAL_21:.*]] = fir.convert %[[VAL_20]] : (!fir.heap<!fir.array<?x!fir.logical<4>>>) -> i64
-! CHECK:  %[[VAL_22:.*]] = arith.constant 0 : i64
-! CHECK:  %[[VAL_23:.*]] = arith.cmpi ne, %[[VAL_21]], %[[VAL_22]] : i64
-! CHECK:  %[[VAL_24:.*]] = fir.load %[[VAL_4:.*]] : !fir.ref<index>
-! CHECK:  %[[VAL_25:.*]] = fir.load %[[VAL_5:.*]] : !fir.ref<index>
-! CHECK:  %[[VAL_26:.*]] = fir.load %[[VAL_3]] : !fir.ref<!fir.heap<!fir.array<?x!fir.logical<4>>>>
-! CHECK:  %[[VAL_27:.*]] = fir.shape_shift %[[VAL_24]], %[[VAL_25]] : (index, index) -> !fir.shapeshift<1>
-! CHECK:  %[[VAL_28:.*]] = fir.embox %[[VAL_26]](%[[VAL_27]]) : (!fir.heap<!fir.array<?x!fir.logical<4>>>, !fir.shapeshift<1>) -> !fir.box<!fir.array<?x!fir.logical<4>>>
-! CHECK:  %[[VAL_29:.*]] = fir.absent !fir.box<!fir.array<?x!fir.logical<4>>>
-! CHECK:  %[[VAL_30:.*]] = arith.select %[[VAL_23]], %[[VAL_28]], %[[VAL_29]] : !fir.box<!fir.array<?x!fir.logical<4>>>
-! CHECK:  %[[VAL_37:.*]] = fir.convert %[[VAL_30]] : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
-! CHECK:  fir.call @_FortranASumInteger4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_37]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK:  %[[VAL_20:.*]] = fir.load %[[maskBox:.*]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>>
+! CHECK:  %[[VAL_21:.*]] = fir.box_addr %[[VAL_20]] : (!fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>) -> !fir.heap<!fir.array<?x!fir.logical<4>>>
+! CHECK:  %[[VAL_22:.*]] = fir.convert %[[VAL_21]] : (!fir.heap<!fir.array<?x!fir.logical<4>>>) -> i64
+! CHECK:  %[[VAL_23:.*]] = arith.constant 0 : i64
+! CHECK:  %[[VAL_24:.*]] = arith.cmpi ne, %[[VAL_22]], %[[VAL_23]] : i64
+! CHECK:  %[[VAL_25:.*]] = fir.load %[[maskBox]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>>
+! CHECK:  %[[VAL_26:.*]] = fir.absent !fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>
+! CHECK:  %[[VAL_27:.*]] = arith.select %[[VAL_24]], %[[VAL_25]], %[[VAL_26]] : !fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>
+! CHECK:  hlfir.sum {{.*}} mask %[[VAL_27]] {{.*}} : (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>) -> i32
 end function
diff --git a/flang/test/Lower/Intrinsics/system_clock.f90 b/flang/test/Lower/Intrinsics/system_clock.f90
index f6fae1113b315..d3340e41acd5a 100644
--- a/flang/test/Lower/Intrinsics/system_clock.f90
+++ b/flang/test/Lower/Intrinsics/system_clock.f90
@@ -1,141 +1,114 @@
-! RUN: bbc --use-desc-for-alloc=false -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
 
-! CHECK-LABEL: system_clock_test
+! CHECK-LABEL: func.func @_QPsystem_clock_test() {
 subroutine system_clock_test()
   integer(4) :: c
   integer(8) :: m
   real :: r
-  ! CHECK-DAG: %[[c:.*]] = fir.alloca i32 {bindc_name = "c"
-  ! CHECK-DAG: %[[m:.*]] = fir.alloca i64 {bindc_name = "m"
-  ! CHECK-DAG: %[[r:.*]] = fir.alloca f32 {bindc_name = "r"
+  ! CHECK-DAG: %[[c_addr:.*]] = fir.alloca i32 {bindc_name = "c"
+  ! CHECK-DAG: %[[c:.*]]:2 = hlfir.declare %[[c_addr]]
+  ! CHECK-DAG: %[[m_addr:.*]] = fir.alloca i64 {bindc_name = "m"
+  ! CHECK-DAG: %[[m:.*]]:2 = hlfir.declare %[[m_addr]]
+  ! CHECK-DAG: %[[r_addr:.*]] = fir.alloca f32 {bindc_name = "r"
+  ! CHECK-DAG: %[[r:.*]]:2 = hlfir.declare %[[r_addr]]
   ! CHECK: %[[c4:.*]] = arith.constant 4 : i32
   ! CHECK: %[[Count:.*]] = fir.call @_FortranASystemClockCount(%[[c4]]) {{.*}}: (i32) -> i64
   ! CHECK: %[[Count1:.*]] = fir.convert %[[Count]] : (i64) -> i32
-  ! CHECK: fir.store %[[Count1]] to %[[c]] : !fir.ref<i32>
+  ! CHECK: fir.store %[[Count1]] to %[[c]]#0 : !fir.ref<i32>
   ! CHECK: %[[c8:.*]] = arith.constant 8 : i32
   ! CHECK: %[[Rate:.*]] = fir.call @_FortranASystemClockCountRate(%[[c8]]) {{.*}}: (i32) -> i64
   ! CHECK: %[[Rate1:.*]] = fir.convert %[[Rate]] : (i64) -> f32
-  ! CHECK: fir.store %[[Rate1]] to %[[r]] : !fir.ref<f32>
+  ! CHECK: fir.store %[[Rate1]] to %[[r]]#0 : !fir.ref<f32>
   ! CHECK: %[[c8_2:.*]] = arith.constant 8 : i32
   ! CHECK: %[[Max:.*]] = fir.call @_FortranASystemClockCountMax(%[[c8_2]]) {{.*}}: (i32) -> i64
-  ! CHECK: fir.store %[[Max]] to %[[m]] : !fir.ref<i64>
+  ! CHECK: fir.store %[[Max]] to %[[m]]#0 : !fir.ref<i64>
   call system_clock(c, r, m)
 ! print*, c, r, m
   ! CHECK-NOT: fir.call
   ! CHECK: %[[c8_3:.*]] = arith.constant 8 : i32
   ! CHECK: %[[Rate:.*]] = fir.call @_FortranASystemClockCountRate(%[[c8_3]]) {{.*}}: (i32) -> i64
-  ! CHECK: fir.store %[[Rate]] to %[[m]] : !fir.ref<i64>
+  ! CHECK: fir.store %[[Rate]] to %[[m]]#0 : !fir.ref<i64>
   call system_clock(count_rate=m)
   ! CHECK-NOT: fir.call
 ! print*, m
 end subroutine
 
-! CHECK-LABEL: @_QPss
+! CHECK-LABEL: func.func @_QPss(
+! CHECK-SAME: %[[arg0:.*]]: !fir.ref<i64> {fir.bindc_name = "count", fir.optional})
 subroutine ss(count)
-  ! CHECK:   %[[V_1:[0-9]+]] = fir.alloca !fir.heap<i64> {uniq_name = "_QFssEcount_max.addr"}
-  ! CHECK:   %[[V_2:[0-9]+]] = fir.zero_bits !fir.heap<i64>
-  ! CHECK:   fir.store %[[V_2]] to %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:   %[[V_4:[0-9]+]] = fir.alloca !fir.ptr<i64> {uniq_name = "_QFssEcount_rate.addr"}
-  ! CHECK:   %[[V_5:[0-9]+]] = fir.zero_bits !fir.ptr<i64>
-  ! CHECK:   fir.store %[[V_5]] to %[[V_4]] : !fir.ref<!fir.ptr<i64>>
-  ! CHECK:   %[[V_6:[0-9]+]] = fir.alloca i64 {bindc_name = "count_rate_", fir.target, uniq_name = "_QFssEcount_rate_"}
-  ! CHECK:   %[[V_7:[0-9]+]] = fir.convert %[[V_6]] : (!fir.ref<i64>) -> !fir.ptr<i64>
-  ! CHECK:   fir.store %[[V_7]] to %[[V_4]] : !fir.ref<!fir.ptr<i64>>
-  ! CHECK:   %[[V_8:[0-9]+]] = fir.allocmem i64 {fir.must_be_heap = true, uniq_name = "_QFssEcount_max.alloc"}
-  ! CHECK:   fir.store %[[V_8]] to %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:   %[[V_9:[0-9]+]] = fir.load %[[V_4]] : !fir.ref<!fir.ptr<i64>>
-  ! CHECK:   %[[V_10:[0-9]+]] = fir.load %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:   %[[V_11:[0-9]+]] = fir.is_present %arg0 : (!fir.ref<i64>) -> i1
-  ! CHECK:   fir.if %[[V_11]] {
-  ! CHECK:     %[[V_29:[0-9]+]] = fir.call @_FortranASystemClockCount(%c8{{.*}}_i32) {{.*}}: (i32) -> i64
-  ! CHECK:     fir.store %[[V_29]] to %arg0 : !fir.ref<i64>
-  ! CHECK:   }
-  ! CHECK:   %[[V_12:[0-9]+]] = fir.convert %[[V_9]] : (!fir.ptr<i64>) -> i64
-  ! CHECK:   %[[V_13:[0-9]+]] = arith.cmpi ne, %[[V_12]], %c0{{.*}} : i64
-  ! CHECK:   fir.if %[[V_13]] {
-  ! CHECK:     %[[V_29:[0-9]+]] = fir.call @_FortranASystemClockCountRate(%c8{{.*}}_i32) {{.*}}: (i32) -> i64
-  ! CHECK:     fir.store %[[V_29]] to %[[V_9]] : !fir.ptr<i64>
-  ! CHECK:   }
-  ! CHECK:   %[[V_14:[0-9]+]] = fir.convert %[[V_10]] : (!fir.heap<i64>) -> i64
-  ! CHECK:   %[[V_15:[0-9]+]] = arith.cmpi ne, %[[V_14]], %c0{{.*}} : i64
-  ! CHECK:   fir.if %[[V_15]] {
-  ! CHECK:     %[[V_29]] = fir.call @_FortranASystemClockCountMax(%c8{{.*}}_i32) {{.*}}: (i32) -> i64
-  ! CHECK:     fir.store %[[V_29]] to %[[V_10]] : !fir.heap<i64>
-  ! CHECK:   }
-  ! CHECK:   %[[V_16:[0-9]+]] = fir.is_present %arg0 : (!fir.ref<i64>) -> i1
-  ! CHECK:   fir.if %[[V_16]] {
-  ! CHECK:     %[[V_31:[0-9]+]] = fir.call @_FortranAioBeginExternalListOutput
-  ! CHECK:     %[[V_32:[0-9]+]] = fir.load %arg0 : !fir.ref<i64>
-  ! CHECK:     %[[V_33:[0-9]+]] = fir.call @_FortranAioOutputInteger64(%[[V_31]], %[[V_32]]) {{.*}}: (!fir.ref<i8>, i64) -> i1
-  ! CHECK:     %[[V_34:[0-9]+]] = fir.load %[[V_4]] : !fir.ref<!fir.ptr<i64>>
-  ! CHECK:     %[[V_35:[0-9]+]] = fir.load %[[V_34]] : !fir.ptr<i64>
-  ! CHECK:     %[[V_36:[0-9]+]] = fir.call @_FortranAioOutputInteger64(%[[V_31]], %[[V_35]]) {{.*}}: (!fir.ref<i8>, i64) -> i1
-  ! CHECK:     %[[V_37:[0-9]+]] = fir.load %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:     %[[V_38:[0-9]+]] = fir.load %[[V_37]] : !fir.heap<i64>
-  ! CHECK:     %[[V_39:[0-9]+]] = fir.call @_FortranAioOutputInteger64(%[[V_31]], %[[V_38]]) {{.*}}: (!fir.ref<i8>, i64) -> i1
-  ! CHECK:     %[[V_40:[0-9]+]] = fir.call @_FortranAioEndIoStatement(%[[V_31]]) {{.*}}: (!fir.ref<i8>) -> i32
-  ! CHECK:   } else {
-  ! CHECK:     %[[V_29:[0-9]+]] = fir.load %[[V_4]] : !fir.ref<!fir.ptr<i64>>
-  ! CHECK:     %[[V_30:[0-9]+]] = fir.load %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:     %[[V_31:[0-9]+]] = fir.convert %[[V_29]] : (!fir.ptr<i64>) -> i64
-  ! CHECK:     %[[V_32:[0-9]+]] = arith.cmpi ne, %[[V_31]], %c0{{.*}} : i64
-  ! CHECK:     fir.if %[[V_32]] {
-  ! CHECK:       %[[V_45:[0-9]+]] = fir.call @_FortranASystemClockCountRate(%c8{{.*}}_i32) {{.*}}: (i32) -> i64
-  ! CHECK:       fir.store %[[V_45]] to %[[V_29]] : !fir.ptr<i64>
-  ! CHECK:     }
-  ! CHECK:     %[[V_33:[0-9]+]] = fir.convert %[[V_30]] : (!fir.heap<i64>) -> i64
-  ! CHECK:     %[[V_34:[0-9]+]] = arith.cmpi ne, %[[V_33]], %c0{{.*}} : i64
-  ! CHECK:     fir.if %[[V_34]] {
-  ! CHECK:       %[[V_45]] = fir.call @_FortranASystemClockCountMax(%c8{{.*}}_i32) {{.*}}: (i32) -> i64
-  ! CHECK:       fir.store %[[V_45]] to %[[V_30]] : !fir.heap<i64>
-  ! CHECK:     }
-  ! CHECK:     %[[V_37:[0-9]+]] = fir.call @_FortranAioBeginExternalListOutput
-  ! CHECK:     %[[V_38:[0-9]+]] = fir.load %[[V_4]] : !fir.ref<!fir.ptr<i64>>
-  ! CHECK:     %[[V_39:[0-9]+]] = fir.load %[[V_38]] : !fir.ptr<i64>
-  ! CHECK:     %[[V_40:[0-9]+]] = fir.call @_FortranAioOutputInteger64(%[[V_37]], %[[V_39]]) {{.*}}: (!fir.ref<i8>, i64) -> i1
-  ! CHECK:     %[[V_41:[0-9]+]] = fir.load %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:     %[[V_42:[0-9]+]] = fir.load %[[V_41]] : !fir.heap<i64>
-  ! CHECK:     %[[V_43:[0-9]+]] = fir.call @_FortranAioOutputInteger64(%[[V_37]], %[[V_42]]) {{.*}}: (!fir.ref<i8>, i64) -> i1
-  ! CHECK:     %[[V_44:[0-9]+]] = fir.call @_FortranAioEndIoStatement(%[[V_37]]) {{.*}}: (!fir.ref<i8>) -> i32
-  ! CHECK:   }
-  ! CHECK:   %[[V_17:[0-9]+]] = fir.is_present %arg0 : (!fir.ref<i64>) -> i1
-  ! CHECK:   fir.if %[[V_17]] {
-  ! CHECK:     %[[C_0:c[0-9a-z_]+]] = arith.constant 0 : i64
-  ! CHECK:     fir.store %[[C_0]] to %arg0 : !fir.ref<i64>
-  ! CHECK:   }
-  ! CHECK:   %[[V_18:[0-9]+]] = fir.zero_bits !fir.ptr<i64>
-  ! CHECK:   fir.store %[[V_18]] to %[[V_4]] : !fir.ref<!fir.ptr<i64>>
-  ! CHECK:   %[[V_19:[0-9]+]] = fir.load %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:   fir.freemem %[[V_19]] : !fir.heap<i64>
-  ! CHECK:   %[[V_20:[0-9]+]] = fir.zero_bits !fir.heap<i64>
-  ! CHECK:   fir.store %[[V_20]] to %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:   %[[V_21:[0-9]+]] = fir.load %[[V_4]] : !fir.ref<!fir.ptr<i64>>
-  ! CHECK:   %[[V_22:[0-9]+]] = fir.load %[[V_1]] : !fir.ref<!fir.heap<i64>>
-  ! CHECK:   %[[V_23:[0-9]+]] = fir.is_present %arg0 : (!fir.ref<i64>) -> i1
-  ! CHECK:   fir.if %[[V_23]] {
-  ! CHECK:     %[[V_29]] = fir.call @_FortranASystemClockCount(%c8{{.*}}_i32) {{.*}}: (i32) -> i64
-  ! CHECK:     fir.store %[[V_29]] to %arg0 : !fir.ref<i64>
-  ! CHECK:   }
-  ! CHECK:   %[[V_24:[0-9]+]] = fir.convert %[[V_21]] : (!fir.ptr<i64>) -> i64
-  ! CHECK:   %[[V_25:[0-9]+]] = arith.cmpi ne, %[[V_24]], %c0{{.*}} : i64
-  ! CHECK:   fir.if %[[V_25]] {
-  ! CHECK:     %[[V_29]] = fir.call @_FortranASystemClockCountRate(%c8{{.*}}_i32) {{.*}}: (i32) -> i64
-  ! CHECK:     fir.store %[[V_29]] to %[[V_21]] : !fir.ptr<i64>
-  ! CHECK:   }
-  ! CHECK:   %[[V_26:[0-9]+]] = fir.convert %[[V_22]] : (!fir.heap<i64>) -> i64
-  ! CHECK:   %[[V_27:[0-9]+]] = arith.cmpi ne, %[[V_26]], %c0{{.*}} : i64
-  ! CHECK:   fir.if %[[V_27]] {
-  ! CHECK:     %[[V_29]] = fir.call @_FortranASystemClockCountMax(%c8{{.*}}_i32) {{.*}}: (i32) -> i64
-  ! CHECK:     fir.store %[[V_29]] to %[[V_22]] : !fir.heap<i64>
+  ! CHECK: %[[count:.*]]:2 = hlfir.declare %[[arg0]]
+  ! CHECK: %[[count_max_box:.*]] = fir.alloca !fir.box<!fir.heap<i64>> {bindc_name = "count_max"
+  ! CHECK: %[[count_max:.*]]:2 = hlfir.declare %[[count_max_box]]
+  ! CHECK: %[[count_rate_box:.*]] = fir.alloca !fir.box<!fir.ptr<i64>> {bindc_name = "count_rate"
+  ! CHECK: %[[count_rate:.*]]:2 = hlfir.declare %[[count_rate_box]]
+  ! CHECK: %[[count_rate_base:.*]] = fir.alloca i64 {bindc_name = "count_rate_", fir.target
+  ! CHECK: %[[count_rate_base_decl:.*]]:2 = hlfir.declare %[[count_rate_base]]
+  ! CHECK: %[[embox:.*]] = fir.embox %[[count_rate_base_decl]]#0 : (!fir.ref<i64>) -> !fir.box<!fir.ptr<i64>>
+  ! CHECK: fir.store %[[embox]] to %[[count_rate]]#0 : !fir.ref<!fir.box<!fir.ptr<i64>>>
+  ! CHECK: %[[alloc:.*]] = fir.allocmem i64
+  ! CHECK: %[[embox_max:.*]] = fir.embox %[[alloc]] : (!fir.heap<i64>) -> !fir.box<!fir.heap<i64>>
+  ! CHECK: fir.store %[[embox_max]] to %[[count_max]]#0 : !fir.ref<!fir.box<!fir.heap<i64>>>
+  ! CHECK: %[[box_rate:.*]] = fir.load %[[count_rate]]#0 : !fir.ref<!fir.box<!fir.ptr<i64>>>
+  ! CHECK: %[[addr_rate:.*]] = fir.box_addr %[[box_rate]] : (!fir.box<!fir.ptr<i64>>) -> !fir.ptr<i64>
+  ! CHECK: %[[box_max_val:.*]] = fir.load %[[count_max]]#0 : !fir.ref<!fir.box<!fir.heap<i64>>>
+  ! CHECK: %[[addr_max:.*]] = fir.box_addr %[[box_max_val]] : (!fir.box<!fir.heap<i64>>) -> !fir.heap<i64>
+  ! CHECK: %[[c8:.*]] = arith.constant 8 : i32
+  ! CHECK: %[[val_count:.*]] = fir.call @_FortranASystemClockCount(%[[c8]]) {{.*}} : (i32) -> i64
+  ! CHECK: fir.store %[[val_count]] to %[[count]]#0 : !fir.ref<i64>
+  ! CHECK: %[[addr_rate_i64:.*]] = fir.convert %[[addr_rate]] : (!fir.ptr<i64>) -> i64
+  ! CHECK: %[[c0_i64:.*]] = arith.constant 0 : i64
+  ! CHECK: %[[is_rate_present:.*]] = arith.cmpi ne, %[[addr_rate_i64]], %[[c0_i64]] : i64
+  ! CHECK: fir.if %[[is_rate_present]] {
+  ! CHECK:   %[[c8_new:.*]] = arith.constant 8 : i32
+  ! CHECK:   %[[val_rate:.*]] = fir.call @_FortranASystemClockCountRate(%[[c8_new]]) {{.*}} : (i32) -> i64
+  ! CHECK:   fir.store %[[val_rate]] to %[[addr_rate]] : !fir.ptr<i64>
+  ! CHECK: }
+  ! CHECK: %[[addr_max_i64:.*]] = fir.convert %[[addr_max]] : (!fir.heap<i64>) -> i64
+  ! CHECK: %[[c0_i64_2:.*]] = arith.constant 0 : i64
+  ! CHECK: %[[is_max_present:.*]] = arith.cmpi ne, %[[addr_max_i64]], %[[c0_i64_2]] : i64
+  ! CHECK: fir.if %[[is_max_present]] {
+  ! CHECK:   %[[c8_new2:.*]] = arith.constant 8 : i32
+  ! CHECK:   %[[val_max:.*]] = fir.call @_FortranASystemClockCountMax(%[[c8_new2]]) {{.*}} : (i32) -> i64
+  ! CHECK:   fir.store %[[val_max]] to %[[addr_max]] : !fir.heap<i64>
+  ! CHECK: }
+
+  ! CHECK: %[[is_count_present:.*]] = fir.is_present %[[count]]#0 : (!fir.ref<i64>) -> i1
+  ! CHECK: fir.if %[[is_count_present]] {
+  ! CHECK:   %[[io_begin:.*]] = fir.call @_FortranAioBeginExternalListOutput
+  ! CHECK:   %[[val_count_io:.*]] = fir.load %[[count]]#0 : !fir.ref<i64>
+  ! CHECK:   fir.call @_FortranAioOutputInteger64(%[[io_begin]], %[[val_count_io]])
+  ! CHECK: } else {
+  ! CHECK:   fir.if %{{.*}} {
+  ! CHECK:     fir.call @_FortranASystemClockCountRate
   ! CHECK:   }
-  ! CHECK:   %[[V_28:[0-9]+]] = fir.is_present %arg0 : (!fir.ref<i64>) -> i1
-  ! CHECK:   fir.if %[[V_28]] {
-  ! CHECK:     %[[V_31]] = fir.call @_FortranAioBeginExternalListOutput
-  ! CHECK:     %[[V_32]] = fir.load %arg0 : !fir.ref<i64>
-  ! CHECK:     %[[V_33]] = fir.call @_FortranAioOutputInteger64(%[[V_31]], %[[V_32]]) {{.*}}: (!fir.ref<i8>, i64) -> i1
-  ! CHECK:     %[[V_34]] = fir.call @_FortranAioEndIoStatement(%[[V_31]]) {{.*}}: (!fir.ref<i8>) -> i32
+  ! CHECK:   fir.if %{{.*}} {
+  ! CHECK:     fir.call @_FortranASystemClockCountMax
   ! CHECK:   }
-  ! CHECK:   return
+  ! CHECK: }
+
+  ! CHECK: %[[is_count_present_2:.*]] = fir.is_present %[[count]]#0 : (!fir.ref<i64>) -> i1
+  ! CHECK: fir.if %[[is_count_present_2]] {
+  ! CHECK:   %[[c0_i64_3:.*]] = arith.constant 0 : i64
+  ! CHECK:   hlfir.assign %[[c0_i64_3]] to %[[count]]#0 : i64, !fir.ref<i64>
+  ! CHECK: }
+
+  ! CHECK: %[[zero_ptr:.*]] = fir.zero_bits !fir.ptr<i64>
+  ! CHECK: %[[embox_null:.*]] = fir.embox %[[zero_ptr]]
+  ! CHECK: fir.store %[[embox_null]] to %[[count_rate]]#0
+  ! CHECK: %[[box_max_free:.*]] = fir.load %[[count_max]]#0
+  ! CHECK: %[[addr_max_free:.*]] = fir.box_addr %[[box_max_free]]
+  ! CHECK: fir.freemem %[[addr_max_free]]
+  ! CHECK: %[[zero_heap:.*]] = fir.zero_bits !fir.heap<i64>
+  ! CHECK: %[[embox_null_max:.*]] = fir.embox %[[zero_heap]]
+  ! CHECK: fir.store %[[embox_null_max]] to %[[count_max]]#0
+
+  ! CHECK: %[[val_count_last:.*]] = fir.call @_FortranASystemClockCount
+  ! CHECK: fir.store %[[val_count_last]] to %[[count]]#0
+  ! CHECK: fir.if %{{.*}} {
+  ! CHECK:   fir.call @_FortranASystemClockCountRate
+  ! CHECK: }
+  ! CHECK: fir.if %{{.*}} {
+  ! CHECK:   fir.call @_FortranASystemClockCountMax
   ! CHECK: }
 
   integer(8), optional :: count
diff --git a/flang/test/Lower/Intrinsics/trailz.f90 b/flang/test/Lower/Intrinsics/trailz.f90
index 4433775510eff..b2c44ec020289 100644
--- a/flang/test/Lower/Intrinsics/trailz.f90
+++ b/flang/test/Lower/Intrinsics/trailz.f90
@@ -1,66 +1,75 @@
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
-! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
 
-! CHECK-LABEL: trailz1_test
-! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i8>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}}
+! CHECK-LABEL: func.func @_QPtrailz1_test(
+! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i8>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}})
 subroutine trailz1_test(a, b)
   integer(1) :: a
   integer :: b
 
-  ! CHECK:  %[[AVAL:.*]] = fir.load %[[AREF]] : !fir.ref<i8>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[AREF]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[BREF]]
   b = trailz(a)
-  ! CHECK:  %[[COUNT:.*]] = math.cttz %[[AVAL]] : i8
-  ! CHECK:  %[[RESULT:.*]] = fir.convert %[[COUNT]] : (i8) -> i32
-  ! CHECK:  fir.store %[[RESULT]] to %[[BREF]] : !fir.ref<i32>
+! CHECK-DAG:  %[[AVAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i8>
+! CHECK:  %[[COUNT:.*]] = math.cttz %[[AVAL]] : i8
+! CHECK:  %[[RESULT:.*]] = fir.convert %[[COUNT]] : (i8) -> i32
+! CHECK:  hlfir.assign %[[RESULT]] to %[[B]]#0 : i32, !fir.ref<i32>
 end subroutine trailz1_test
 
-! CHECK-LABEL: trailz2_test
-! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i16>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}}
+! CHECK-LABEL: func.func @_QPtrailz2_test(
+! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i16>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}})
 subroutine trailz2_test(a, b)
   integer(2) :: a
   integer :: b
 
-  ! CHECK:  %[[AVAL:.*]] = fir.load %[[AREF]] : !fir.ref<i16>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[AREF]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[BREF]]
   b = trailz(a)
-  ! CHECK:  %[[COUNT:.*]] = math.cttz %[[AVAL]] : i16
-  ! CHECK:  %[[RESULT:.*]] = fir.convert %[[COUNT]] : (i16) -> i32
-  ! CHECK:  fir.store %[[RESULT]] to %[[BREF]] : !fir.ref<i32>
+! CHECK-DAG:  %[[AVAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i16>
+! CHECK:  %[[COUNT:.*]] = math.cttz %[[AVAL]] : i16
+! CHECK:  %[[RESULT:.*]] = fir.convert %[[COUNT]] : (i16) -> i32
+! CHECK:  hlfir.assign %[[RESULT]] to %[[B]]#0 : i32, !fir.ref<i32>
 end subroutine trailz2_test
 
-! CHECK-LABEL: trailz4_test
-! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i32>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}}
+! CHECK-LABEL: func.func @_QPtrailz4_test(
+! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i32>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}})
 subroutine trailz4_test(a, b)
   integer(4) :: a
   integer :: b
 
-  ! CHECK:  %[[AVAL:.*]] = fir.load %[[AREF]] : !fir.ref<i32>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[AREF]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[BREF]]
   b = trailz(a)
-  ! CHECK:  %[[RESULT:.*]] = math.cttz %[[AVAL]] : i32
-  ! CHECK:  fir.store %[[RESULT]] to %[[BREF]] : !fir.ref<i32>
+! CHECK-DAG:  %[[AVAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i32>
+! CHECK:  %[[RESULT:.*]] = math.cttz %[[AVAL]] : i32
+! CHECK:  hlfir.assign %[[RESULT]] to %[[B]]#0 : i32, !fir.ref<i32>
 end subroutine trailz4_test
 
-! CHECK-LABEL: trailz8_test
-! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i64>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}}
+! CHECK-LABEL: func.func @_QPtrailz8_test(
+! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i64>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}})
 subroutine trailz8_test(a, b)
   integer(8) :: a
   integer :: b
 
-  ! CHECK:  %[[AVAL:.*]] = fir.load %[[AREF]] : !fir.ref<i64>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[AREF]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[BREF]]
   b = trailz(a)
-  ! CHECK:  %[[COUNT:.*]] = math.cttz %[[AVAL]] : i64
-  ! CHECK:  %[[RESULT:.*]] = fir.convert %[[COUNT]] : (i64) -> i32
-  ! CHECK:  fir.store %[[RESULT]] to %[[BREF]] : !fir.ref<i32>
+! CHECK-DAG:  %[[AVAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i64>
+! CHECK:  %[[COUNT:.*]] = math.cttz %[[AVAL]] : i64
+! CHECK:  %[[RESULT:.*]] = fir.convert %[[COUNT]] : (i64) -> i32
+! CHECK:  hlfir.assign %[[RESULT]] to %[[B]]#0 : i32, !fir.ref<i32>
 end subroutine trailz8_test
 
-! CHECK-LABEL: trailz16_test
-! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i128>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}}
+! CHECK-LABEL: func.func @_QPtrailz16_test(
+! CHECK-SAME: %[[AREF:.*]]: !fir.ref<i128>{{.*}}, %[[BREF:.*]]: !fir.ref<i32>{{.*}})
 subroutine trailz16_test(a, b)
   integer(16) :: a
   integer :: b
 
-  ! CHECK:  %[[AVAL:.*]] = fir.load %[[AREF]] : !fir.ref<i128>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[AREF]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[BREF]]
   b = trailz(a)
-  ! CHECK:  %[[COUNT:.*]] = math.cttz %[[AVAL]] : i128
-  ! CHECK:  %[[RESULT:.*]] = fir.convert %[[COUNT]] : (i128) -> i32
-  ! CHECK:  fir.store %[[RESULT]] to %[[BREF]] : !fir.ref<i32>
+! CHECK-DAG:  %[[AVAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i128>
+! CHECK:  %[[COUNT:.*]] = math.cttz %[[AVAL]] : i128
+! CHECK:  %[[RESULT:.*]] = fir.convert %[[COUNT]] : (i128) -> i32
+! CHECK:  hlfir.assign %[[RESULT]] to %[[B]]#0 : i32, !fir.ref<i32>
 end subroutine trailz16_test
diff --git a/flang/test/Lower/Intrinsics/transfer.f90 b/flang/test/Lower/Intrinsics/transfer.f90
index a792c8e91ba01..6a9ea14570fb3 100644
--- a/flang/test/Lower/Intrinsics/transfer.f90
+++ b/flang/test/Lower/Intrinsics/transfer.f90
@@ -1,26 +1,19 @@
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
 
 subroutine trans_test(store, word)
     ! CHECK-LABEL: func @_QPtrans_test(
     ! CHECK-SAME:                      %[[VAL_0:.*]]: !fir.ref<i32>{{.*}}, %[[VAL_1:.*]]: !fir.ref<f32>{{.*}}) {
-    ! CHECK:         %[[VAL_2:.*]] = fir.alloca !fir.box<!fir.heap<i32>>
-    ! CHECK:         %[[VAL_3:.*]] = fir.embox %[[VAL_1]] : (!fir.ref<f32>) -> !fir.box<f32>
-    ! CHECK:         %[[VAL_4:.*]] = fir.embox %[[VAL_0]] : (!fir.ref<i32>) -> !fir.box<i32>
-    ! CHECK:         %[[VAL_5:.*]] = fir.zero_bits !fir.heap<i32>
-    ! CHECK:         %[[VAL_6:.*]] = fir.embox %[[VAL_5]] : (!fir.heap<i32>) -> !fir.box<!fir.heap<i32>>
-    ! CHECK:         fir.store %[[VAL_6]] to %[[VAL_2]] : !fir.ref<!fir.box<!fir.heap<i32>>>
-    ! CHECK:         %[[VAL_7:.*]] = fir.address_of(@_QQclX{{.*}}) : !fir.ref<!fir.char<1,{{.*}}>>
-    ! CHECK:         %[[VAL_8:.*]] = arith.constant {{.*}} : i32
-    ! CHECK:         %[[VAL_9:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.box<!fir.heap<i32>>>) -> !fir.ref<!fir.box<none>>
-    ! CHECK:         %[[VAL_10:.*]] = fir.convert %[[VAL_3]] : (!fir.box<f32>) -> !fir.box<none>
-    ! CHECK:         %[[VAL_11:.*]] = fir.convert %[[VAL_4]] : (!fir.box<i32>) -> !fir.box<none>
-    ! CHECK:         %[[VAL_12:.*]] = fir.convert %[[VAL_7]] : (!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
-    ! CHECK:         fir.call @_FortranATransfer(%[[VAL_9]], %[[VAL_10]], %[[VAL_11]], %[[VAL_12]], %[[VAL_8]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> ()
-    ! CHECK:         %[[VAL_14:.*]] = fir.load %[[VAL_2]] : !fir.ref<!fir.box<!fir.heap<i32>>>
-    ! CHECK:         %[[VAL_15:.*]] = fir.box_addr %[[VAL_14]] : (!fir.box<!fir.heap<i32>>) -> !fir.heap<i32>
-    ! CHECK:         %[[VAL_16:.*]] = fir.load %[[VAL_15]] : !fir.heap<i32>
-    ! CHECK:         fir.freemem %[[VAL_15]]
-    ! CHECK:         fir.store %[[VAL_16]] to %[[VAL_0]] : !fir.ref<i32>
+    ! CHECK-DAG:     %[[RESULT_BOX:.*]] = fir.alloca !fir.box<!fir.heap<i32>>
+    ! CHECK-DAG:     %[[store:.*]]:2 = hlfir.declare %[[VAL_0]] {{.*}}{uniq_name = "_QFtrans_testEstore"}
+    ! CHECK-DAG:     %[[word:.*]]:2 = hlfir.declare %[[VAL_1]] {{.*}}{uniq_name = "_QFtrans_testEword"}
+    ! CHECK:         %[[VAL_3:.*]] = fir.embox %[[word]]#0 : (!fir.ref<f32>) -> !fir.box<f32>
+    ! CHECK:         %[[VAL_4:.*]] = fir.embox %[[store]]#0 : (!fir.ref<i32>) -> !fir.box<i32>
+    ! CHECK:         fir.call @_FortranATransfer({{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> ()
+    ! CHECK:         %[[LOADED:.*]] = fir.load %[[RESULT_BOX]] : !fir.ref<!fir.box<!fir.heap<i32>>>
+    ! CHECK:         %[[ADDR:.*]] = fir.box_addr %[[LOADED]] : (!fir.box<!fir.heap<i32>>) -> !fir.heap<i32>
+    ! CHECK:         %[[VAL:.*]] = fir.load %[[ADDR]] : !fir.heap<i32>
+    ! CHECK:         fir.freemem %[[ADDR]]
+    ! CHECK:         hlfir.assign %[[VAL]] to %[[store]]#0 : i32, !fir.ref<i32>
     ! CHECK:         return
     ! CHECK:       }
     integer :: store
@@ -29,48 +22,14 @@ subroutine trans_test(store, word)
   end subroutine
 
   ! CHECK-LABEL: func @_QPtrans_test2(
-  ! CHECK-SAME:        %[[VAL_0:.*]]: !fir.ref<!fir.array<3xi32>>{{.*}}, %[[VAL_1:.*]]: !fir.ref<f32>{{.*}}) {
-  ! CHECK:         %[[VAL_2:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?xi32>>>
-  ! CHECK:         %[[VAL_3:.*]] = arith.constant 3 : index
-  ! CHECK:         %[[VAL_4:.*]] = fir.shape %[[VAL_3]] : (index) -> !fir.shape<1>
-  ! CHECK:         %[[VAL_5:.*]] = fir.array_load %[[VAL_0]](%[[VAL_4]]) : (!fir.ref<!fir.array<3xi32>>, !fir.shape<1>) -> !fir.array<3xi32>
-  ! CHECK:         %[[VAL_6:.*]] = arith.constant 3 : i32
-  ! CHECK:         %[[VAL_7:.*]] = fir.embox %[[VAL_1]] : (!fir.ref<f32>) -> !fir.box<f32>
-  ! CHECK:         %[[VAL_8:.*]] = fir.shape %[[VAL_3]] : (index) -> !fir.shape<1>
-  ! CHECK:         %[[VAL_9:.*]] = fir.embox %[[VAL_0]](%[[VAL_8]]) : (!fir.ref<!fir.array<3xi32>>, !fir.shape<1>) -> !fir.box<!fir.array<3xi32>>
-  ! CHECK:         %[[VAL_10:.*]] = fir.zero_bits !fir.heap<!fir.array<?xi32>>
-  ! CHECK:         %[[VAL_11:.*]] = arith.constant 0 : index
-  ! CHECK:         %[[VAL_12:.*]] = fir.shape %[[VAL_11]] : (index) -> !fir.shape<1>
-  ! CHECK:         %[[VAL_13:.*]] = fir.embox %[[VAL_10]](%[[VAL_12]]) : (!fir.heap<!fir.array<?xi32>>, !fir.shape<1>) -> !fir.box<!fir.heap<!fir.array<?xi32>>>
-  ! CHECK:         fir.store %[[VAL_13]] to %[[VAL_2]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
-  ! CHECK:         %[[VAL_14:.*]] = fir.address_of(@_QQclX{{.*}}) : !fir.ref<!fir.char<1,
-  ! CHECK:         %[[VAL_15:.*]] = arith.constant {{.*}} : i32
-  ! CHECK:         %[[VAL_16:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
-  ! CHECK:         %[[VAL_17:.*]] = fir.convert %[[VAL_7]] : (!fir.box<f32>) -> !fir.box<none>
-  ! CHECK:         %[[VAL_18:.*]] = fir.convert %[[VAL_9]] : (!fir.box<!fir.array<3xi32>>) -> !fir.box<none>
-  ! CHECK:         %[[VAL_19:.*]] = fir.convert %[[VAL_14]] : (!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
-  ! CHECK:         %[[VAL_20:.*]] = fir.convert %[[VAL_6]] : (i32) -> i64
-  ! CHECK:         fir.call @_FortranATransferSize(%[[VAL_16]], %[[VAL_17]], %[[VAL_18]], %[[VAL_19]], %[[VAL_15]], %[[VAL_20]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32, i64) -> ()
-  ! CHECK:         %[[VAL_22:.*]] = fir.load %[[VAL_2]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
-  ! CHECK:         %[[VAL_23:.*]] = arith.constant 0 : index
-  ! CHECK:         %[[VAL_24:.*]]:3 = fir.box_dims %[[VAL_22]], %[[VAL_23]] : (!fir.box<!fir.heap<!fir.array<?xi32>>>, index) -> (index, index, index)
-  ! CHECK:         %[[VAL_25:.*]] = fir.box_addr %[[VAL_22]] : (!fir.box<!fir.heap<!fir.array<?xi32>>>) -> !fir.heap<!fir.array<?xi32>>
-  ! CHECK:         %[[VAL_26:.*]] = fir.shape_shift %[[VAL_24]]#0, %[[VAL_24]]#1 : (index, index) -> !fir.shapeshift<1>
-  ! CHECK:         %[[VAL_27:.*]] = fir.array_load %[[VAL_25]](%[[VAL_26]]) : (!fir.heap<!fir.array<?xi32>>, !fir.shapeshift<1>) -> !fir.array<?xi32>
-  ! CHECK:         %[[VAL_28:.*]] = arith.constant 1 : index
-  ! CHECK:         %[[VAL_29:.*]] = arith.constant 0 : index
-  ! CHECK:         %[[VAL_30:.*]] = arith.subi %[[VAL_3]], %[[VAL_28]] : index
-  ! CHECK:         %[[VAL_31:.*]] = fir.do_loop %[[VAL_32:.*]] = %[[VAL_29]] to %[[VAL_30]] step %[[VAL_28]] unordered iter_args(%[[VAL_33:.*]] = %[[VAL_5]]) -> (!fir.array<3xi32>) {
-  ! CHECK:           %[[VAL_34:.*]] = fir.array_fetch %[[VAL_27]], %[[VAL_32]] : (!fir.array<?xi32>, index) -> i32
-  ! CHECK:           %[[VAL_35:.*]] = fir.array_update %[[VAL_33]], %[[VAL_34]], %[[VAL_32]] : (!fir.array<3xi32>, i32, index) -> !fir.array<3xi32>
-  ! CHECK:           fir.result %[[VAL_35]] : !fir.array<3xi32>
-  ! CHECK:         }
-  ! CHECK:         fir.array_merge_store %[[VAL_5]], %[[VAL_36:.*]] to %[[VAL_0]] : !fir.array<3xi32>, !fir.array<3xi32>, !fir.ref<!fir.array<3xi32>>
-  ! CHECK:         fir.freemem %[[VAL_25]]
-  ! CHECK:         return
-  ! CHECK:       }
-
   subroutine trans_test2(store, word)
+    ! CHECK-DAG:     %[[RESULT_BOX:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?xi32>>>
+    ! CHECK-DAG:     %[[storeDecl:.*]]:2 = hlfir.declare {{.*}}{uniq_name = "_QFtrans_test2Estore"}
+    ! CHECK-DAG:     %[[wordDecl:.*]]:2 = hlfir.declare {{.*}}{uniq_name = "_QFtrans_test2Eword"}
+    ! CHECK:         fir.call @_FortranATransferSize({{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32, i64) -> ()
+    ! CHECK:         hlfir.assign {{.*}} to %[[storeDecl]]#0
+    ! CHECK:         hlfir.destroy {{.*}}
+    ! CHECK:         return
     integer :: store(3)
     real :: word
     store = transfer(word, store, 3)
@@ -79,38 +38,13 @@ subroutine trans_test2(store, word)
   integer function trans_test3(p)
     ! CHECK-LABEL: func @_QPtrans_test3(
     ! CHECK-SAME:                       %[[VAL_0:.*]]: !fir.ref<i32>{{.*}}) -> i32 {
-    ! CHECK:         %[[VAL_1:.*]] = fir.alloca !fir.box<!fir.type<_QFtrans_test3Tobj{x:i32}>>
-    ! CHECK:         %[[VAL_2:.*]] = fir.alloca !fir.box<!fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>>
-    ! CHECK:         %[[VAL_3:.*]] = fir.alloca !fir.type<_QFtrans_test3Tobj{x:i32}> {bindc_name = "t", uniq_name = "_QFtrans_test3Et"}
-    ! CHECK:         %[[VAL_4:.*]] = fir.alloca i32 {bindc_name = "trans_test3", uniq_name = "_QFtrans_test3Etrans_test3"}
-    ! CHECK:         %[[VAL_5:.*]] = fir.embox %[[VAL_0]] : (!fir.ref<i32>) -> !fir.box<i32>
-    ! CHECK:         %[[VAL_6:.*]] = fir.embox %[[VAL_3]] : (!fir.ref<!fir.type<_QFtrans_test3Tobj{x:i32}>>) -> !fir.box<!fir.type<_QFtrans_test3Tobj{x:i32}>>
-    ! CHECK:         %[[VAL_7:.*]] = fir.zero_bits !fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>
-    ! CHECK:         %[[VAL_8:.*]] = fir.embox %[[VAL_7]] : (!fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>) -> !fir.box<!fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>>
-    ! CHECK:         fir.store %[[VAL_8]] to %[[VAL_2]] : !fir.ref<!fir.box<!fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>>>
-    ! CHECK:         %[[VAL_9:.*]] = fir.address_of(@_QQclX{{.*}}) : !fir.ref<!fir.char<1,{{.*}}>>
-    ! CHECK:         %[[VAL_10:.*]] = arith.constant {{.*}} : i32
-    ! CHECK:         %[[VAL_11:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.box<!fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>>>) -> !fir.ref<!fir.box<none>>
-    ! CHECK:         %[[VAL_12:.*]] = fir.convert %[[VAL_5]] : (!fir.box<i32>) -> !fir.box<none>
-    ! CHECK:         %[[VAL_13:.*]] = fir.convert %[[VAL_6]] : (!fir.box<!fir.type<_QFtrans_test3Tobj{x:i32}>>) -> !fir.box<none>
-    ! CHECK:         %[[VAL_14:.*]] = fir.convert %[[VAL_9]] : (!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
-    ! CHECK:         fir.call @_FortranATransfer(%[[VAL_11]], %[[VAL_12]], %[[VAL_13]], %[[VAL_14]], %[[VAL_10]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> ()
-    ! CHECK:         %[[VAL_16:.*]] = fir.load %[[VAL_2]] : !fir.ref<!fir.box<!fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>>>
-    ! CHECK:         %[[VAL_17:.*]] = fir.box_addr %[[VAL_16]] : (!fir.box<!fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>>) -> !fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>
-    ! CHECK:         %[[VAL_18:.*]] = fir.embox %[[VAL_3]] : (!fir.ref<!fir.type<_QFtrans_test3Tobj{x:i32}>>) -> !fir.box<!fir.type<_QFtrans_test3Tobj{x:i32}>>
-    ! CHECK:         fir.store %[[VAL_18]] to %[[VAL_1]] : !fir.ref<!fir.box<!fir.type<_QFtrans_test3Tobj{x:i32}>>>
-    ! CHECK:         %[[VAL_19:.*]] = fir.address_of(@_QQclX{{.*}}) : !fir.ref<!fir.char<1,{{.*}}>>
-    ! CHECK:         %[[VAL_20:.*]] = arith.constant {{.*}} : i32
-    ! CHECK:         %[[VAL_21:.*]] = fir.convert %[[VAL_1]] : (!fir.ref<!fir.box<!fir.type<_QFtrans_test3Tobj{x:i32}>>>) -> !fir.ref<!fir.box<none>>
-    ! CHECK:         %[[VAL_22:.*]] = fir.convert %[[VAL_16]] : (!fir.box<!fir.heap<!fir.type<_QFtrans_test3Tobj{x:i32}>>>) -> !fir.box<none>
-    ! CHECK:         %[[VAL_23:.*]] = fir.convert %[[VAL_19]] : (!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
-    ! CHECK:         fir.call @_FortranAAssign(%[[VAL_21]], %[[VAL_22]], %[[VAL_23]], %[[VAL_20]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.ref<i8>, i32) -> ()
-    ! CHECK:         fir.freemem %[[VAL_17]]
-    ! CHECK:         %[[VAL_26:.*]] = fir.coordinate_of %[[VAL_3]], x : (!fir.ref<!fir.type<_QFtrans_test3Tobj{x:i32}>>) -> !fir.ref<i32>
-    ! CHECK:         %[[VAL_27:.*]] = fir.load %[[VAL_26]] : !fir.ref<i32>
-    ! CHECK:         fir.store %[[VAL_27]] to %[[VAL_4]] : !fir.ref<i32>
-    ! CHECK:         %[[VAL_28:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>
-    ! CHECK:         return %[[VAL_28]] : i32
+    ! CHECK-DAG:     %[[pDecl:.*]]:2 = hlfir.declare %[[VAL_0]] {{.*}}{uniq_name = "_QFtrans_test3Ep"}
+    ! CHECK-DAG:     %[[tDecl:.*]]:2 = hlfir.declare {{.*}}{uniq_name = "_QFtrans_test3Et"}
+    ! CHECK:         fir.call @_FortranATransfer({{.*}}) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.box<none>, !fir.ref<i8>, i32) -> ()
+    ! CHECK:         hlfir.assign {{.*}} to %[[tDecl]]#0
+    ! CHECK:         %[[x_field:.*]] = hlfir.designate %[[tDecl]]#0{"x"}
+    ! CHECK:         %[[x_val:.*]] = fir.load %[[x_field]] : !fir.ref<i32>
+    ! CHECK:         return %{{.*}} : i32
     ! CHECK:       }
     type obj
       integer :: x



More information about the flang-commits mailing list