[flang-commits] [flang] [flang][NFC] Converted five tests from old lowering to new lowering (part 31) (PR #186299)
Eugene Epshteyn via flang-commits
flang-commits at lists.llvm.org
Thu Mar 12 20:09:17 PDT 2026
https://github.com/eugeneepshteyn created https://github.com/llvm/llvm-project/pull/186299
Tests converted from test/Lower/Intrinsics: iall.f90, iand.f90, iany.f90, ibclr.f90, ibits.f90
>From 354275c760bd8d6b64bc412ac96033dfd1a83262 Mon Sep 17 00:00:00 2001
From: Eugene Epshteyn <eepshteyn at nvidia.com>
Date: Thu, 12 Mar 2026 23:07:44 -0400
Subject: [PATCH] [flang][NFC] Converted five tests from old lowering to new
lowering (part 31)
Tests converted from test/Lower/Intrinsics: iall.f90, iand.f90, iany.f90, ibclr.f90, ibits.f90
---
flang/test/Lower/Intrinsics/iall.f90 | 227 ++++++++++++++++----------
flang/test/Lower/Intrinsics/iand.f90 | 90 ++++++----
flang/test/Lower/Intrinsics/iany.f90 | 145 +++++++---------
flang/test/Lower/Intrinsics/ibclr.f90 | 32 ++--
flang/test/Lower/Intrinsics/ibits.f90 | 42 ++---
5 files changed, 296 insertions(+), 240 deletions(-)
diff --git a/flang/test/Lower/Intrinsics/iall.f90 b/flang/test/Lower/Intrinsics/iall.f90
index a1d320ea8b1a2..200a7f7eac8e5 100644
--- a/flang/test/Lower/Intrinsics/iall.f90
+++ b/flang/test/Lower/Intrinsics/iall.f90
@@ -1,156 +1,215 @@
-! 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: func @_QPiall_test_1(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi8>>{{.*}}) -> i8 {
+! CHECK-SAME: %[[ARG0:.*]]: !fir.box<!fir.array<?xi8>>{{.*}}) -> i8 {
integer(1) function iall_test_1(a)
integer(1) :: 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<?xi8>>) -> !fir.box<none>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK-DAG: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK-DAG: %[[ARG_DECL:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %[[SCOPE]] arg 1 {{.*}} : (!fir.box<!fir.array<?xi8>>, !fir.dscope) -> (!fir.box<!fir.array<?xi8>>, !fir.box<!fir.array<?xi8>>)
+! CHECK-DAG: %[[RES_ALLOCA:.*]] = fir.alloca i8
+! CHECK-DAG: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]] {{.*}} : (!fir.ref<i8>) -> (!fir.ref<i8>, !fir.ref<i8>)
+! CHECK-DAG: %[[ABSENT:.*]] = fir.absent !fir.box<i1>
+! CHECK-DAG: %[[C0:.*]] = arith.constant 0 : index
+! CHECK-DAG: %[[CONV_ARG:.*]] = fir.convert %[[ARG_DECL]]#1 : (!fir.box<!fir.array<?xi8>>) -> !fir.box<none>
+! CHECK-DAG: %[[CONV_C0:.*]] = fir.convert %[[C0]] : (index) -> i32
+! CHECK-DAG: %[[CONV_ABSENT:.*]] = fir.convert %[[ABSENT]] : (!fir.box<i1>) -> !fir.box<none>
iall_test_1 = iall(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAll1(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i8
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll1(%[[CONV_ARG]], %{{.*}}, %{{.*}}, %[[CONV_C0]], %[[CONV_ABSENT]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i8
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i8, !fir.ref<i8>
end function
! CHECK-LABEL: func @_QPiall_test_2(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi16>>{{.*}}) -> i16 {
+! CHECK-SAME: %[[ARG0:.*]]: !fir.box<!fir.array<?xi16>>{{.*}}) -> i16 {
integer(2) function iall_test_2(a)
integer(2) :: 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<?xi16>>) -> !fir.box<none>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK-DAG: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK-DAG: %[[ARG_DECL:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %[[SCOPE]] arg 1 {{.*}} : (!fir.box<!fir.array<?xi16>>, !fir.dscope) -> (!fir.box<!fir.array<?xi16>>, !fir.box<!fir.array<?xi16>>)
+! CHECK-DAG: %[[RES_ALLOCA:.*]] = fir.alloca i16
+! CHECK-DAG: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]] {{.*}} : (!fir.ref<i16>) -> (!fir.ref<i16>, !fir.ref<i16>)
+! CHECK-DAG: %[[ABSENT:.*]] = fir.absent !fir.box<i1>
+! CHECK-DAG: %[[C0:.*]] = arith.constant 0 : index
+! CHECK-DAG: %[[CONV_ARG:.*]] = fir.convert %[[ARG_DECL]]#1 : (!fir.box<!fir.array<?xi16>>) -> !fir.box<none>
+! CHECK-DAG: %[[CONV_C0:.*]] = fir.convert %[[C0]] : (index) -> i32
+! CHECK-DAG: %[[CONV_ABSENT:.*]] = fir.convert %[[ABSENT]] : (!fir.box<i1>) -> !fir.box<none>
iall_test_2 = iall(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAll2(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i16
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll2(%[[CONV_ARG]], %{{.*}}, %{{.*}}, %[[CONV_C0]], %[[CONV_ABSENT]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i16
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i16, !fir.ref<i16>
end function
! CHECK-LABEL: func @_QPiall_test_4(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32 {
+! CHECK-SAME: %[[ARG0:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32 {
integer function iall_test_4(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-DAG: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK-DAG: %[[ARG_DECL:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %[[SCOPE]] arg 1 {{.*}} : (!fir.box<!fir.array<?xi32>>, !fir.dscope) -> (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>)
+! CHECK-DAG: %[[RES_ALLOCA:.*]] = fir.alloca i32
+! CHECK-DAG: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]] {{.*}} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK-DAG: %[[ABSENT:.*]] = fir.absent !fir.box<i1>
+! CHECK-DAG: %[[C0:.*]] = arith.constant 0 : index
+! CHECK-DAG: %[[CONV_ARG:.*]] = fir.convert %[[ARG_DECL]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
+! CHECK-DAG: %[[CONV_C0:.*]] = fir.convert %[[C0]] : (index) -> i32
+! CHECK-DAG: %[[CONV_ABSENT:.*]] = fir.convert %[[ABSENT]] : (!fir.box<i1>) -> !fir.box<none>
iall_test_4 = iall(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAll4(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll4(%[[CONV_ARG]], %{{.*}}, %{{.*}}, %[[CONV_C0]], %[[CONV_ABSENT]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i32, !fir.ref<i32>
end function
! CHECK-LABEL: func @_QPiall_test_8(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi64>>{{.*}}) -> i64 {
+! CHECK-SAME: %[[ARG0:.*]]: !fir.box<!fir.array<?xi64>>{{.*}}) -> i64 {
integer(8) function iall_test_8(a)
integer(8) :: 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<?xi64>>) -> !fir.box<none>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK-DAG: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK-DAG: %[[ARG_DECL:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %[[SCOPE]] arg 1 {{.*}} : (!fir.box<!fir.array<?xi64>>, !fir.dscope) -> (!fir.box<!fir.array<?xi64>>, !fir.box<!fir.array<?xi64>>)
+! CHECK-DAG: %[[RES_ALLOCA:.*]] = fir.alloca i64
+! CHECK-DAG: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]] {{.*}} : (!fir.ref<i64>) -> (!fir.ref<i64>, !fir.ref<i64>)
+! CHECK-DAG: %[[ABSENT:.*]] = fir.absent !fir.box<i1>
+! CHECK-DAG: %[[C0:.*]] = arith.constant 0 : index
+! CHECK-DAG: %[[CONV_ARG:.*]] = fir.convert %[[ARG_DECL]]#1 : (!fir.box<!fir.array<?xi64>>) -> !fir.box<none>
+! CHECK-DAG: %[[CONV_C0:.*]] = fir.convert %[[C0]] : (index) -> i32
+! CHECK-DAG: %[[CONV_ABSENT:.*]] = fir.convert %[[ABSENT]] : (!fir.box<i1>) -> !fir.box<none>
iall_test_8 = iall(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAll8(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i64
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll8(%[[CONV_ARG]], %{{.*}}, %{{.*}}, %[[CONV_C0]], %[[CONV_ABSENT]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i64
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i64, !fir.ref<i64>
end function
! CHECK-LABEL: func @_QPiall_test_16(
-! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi128>>{{.*}}) -> i128 {
+! CHECK-SAME: %[[ARG0:.*]]: !fir.box<!fir.array<?xi128>>{{.*}}) -> i128 {
integer(16) function iall_test_16(a)
integer(16) :: 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<?xi128>>) -> !fir.box<none>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK-DAG: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK-DAG: %[[ARG_DECL:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %[[SCOPE]] arg 1 {{.*}} : (!fir.box<!fir.array<?xi128>>, !fir.dscope) -> (!fir.box<!fir.array<?xi128>>, !fir.box<!fir.array<?xi128>>)
+! CHECK-DAG: %[[RES_ALLOCA:.*]] = fir.alloca i128
+! CHECK-DAG: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]] {{.*}} : (!fir.ref<i128>) -> (!fir.ref<i128>, !fir.ref<i128>)
+! CHECK-DAG: %[[ABSENT:.*]] = fir.absent !fir.box<i1>
+! CHECK-DAG: %[[C0:.*]] = arith.constant 0 : index
+! CHECK-DAG: %[[CONV_ARG:.*]] = fir.convert %[[ARG_DECL]]#1 : (!fir.box<!fir.array<?xi128>>) -> !fir.box<none>
+! CHECK-DAG: %[[CONV_C0:.*]] = fir.convert %[[C0]] : (index) -> i32
+! CHECK-DAG: %[[CONV_ABSENT:.*]] = fir.convert %[[ABSENT]] : (!fir.box<i1>) -> !fir.box<none>
iall_test_16 = iall(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAll16(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i128
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll16(%[[CONV_ARG]], %{{.*}}, %{{.*}}, %[[CONV_C0]], %[[CONV_ABSENT]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i128
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i128, !fir.ref<i128>
end function
! CHECK-LABEL: func @_QPiall_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 iall_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: %[[BOX_ALLOCA:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?xi32>>>
+! CHECK-DAG: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK-DAG: %[[ARG0_DECL:.*]]:2 = hlfir.declare %[[ARG0]] dummy_scope %[[SCOPE]] arg 1 {{.*}} : (!fir.box<!fir.array<?x?xi32>>, !fir.dscope) -> (!fir.box<!fir.array<?x?xi32>>, !fir.box<!fir.array<?x?xi32>>)
+! CHECK-DAG: %[[ARG1_DECL:.*]]:2 = hlfir.declare %[[ARG1]] dummy_scope %[[SCOPE]] arg 2 {{.*}} : (!fir.box<!fir.array<?xi32>>, !fir.dscope) -> (!fir.box<!fir.array<?xi32>>, !fir.box<!fir.array<?xi32>>)
+! CHECK-DAG: %[[C2:.*]] = arith.constant 2 : i32
+! CHECK-DAG: %[[ABSENT:.*]] = fir.absent !fir.box<i1>
+! CHECK-DAG: %[[CONV_BOX:.*]] = fir.convert %[[BOX_ALLOCA]] : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>) -> !fir.ref<!fir.box<none>>
+! CHECK-DAG: %[[CONV_ARG0:.*]] = fir.convert %[[ARG0_DECL]]#1 : (!fir.box<!fir.array<?x?xi32>>) -> !fir.box<none>
+! CHECK-DAG: %[[CONV_ABSENT:.*]] = fir.convert %[[ABSENT]] : (!fir.box<i1>) -> !fir.box<none>
r = iall(a,dim=2)
-! CHECK: fir.call @_FortranAIAllDim(%[[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: fir.call @_FortranAIAllDim(%[[CONV_BOX]], %[[CONV_ARG0]], %[[C2]], %{{.*}}, %{{.*}}, %[[CONV_ABSENT]]) fastmath<contract> : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, !fir.ref<i8>, i32, !fir.box<none>) -> ()
+! CHECK: %[[BOX_LOAD:.*]] = fir.load %[[BOX_ALLOCA]] : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
+! CHECK: %[[ADDR:.*]] = fir.box_addr %[[BOX_LOAD]] : (!fir.box<!fir.heap<!fir.array<?xi32>>>) -> !fir.heap<!fir.array<?xi32>>
+! CHECK: %[[TMP_DECL:.*]]:2 = hlfir.declare %[[ADDR]]({{.*}}) {uniq_name = ".tmp.intrinsic_result"} : (!fir.heap<!fir.array<?xi32>>, !fir.shapeshift<1>) -> (!fir.box<!fir.array<?xi32>>, !fir.heap<!fir.array<?xi32>>)
+! CHECK: %[[EXPR:.*]] = hlfir.as_expr %[[TMP_DECL]]#0 move %{{.*}} : (!fir.box<!fir.array<?xi32>>, i1) -> !hlfir.expr<?xi32>
+! CHECK: hlfir.assign %[[EXPR]] to %[[ARG1_DECL]]#0 : !hlfir.expr<?xi32>, !fir.box<!fir.array<?xi32>>
+! CHECK: hlfir.destroy %[[EXPR]] : !hlfir.expr<?xi32>
end subroutine
! CHECK-LABEL: func @_QPiall_test_optional(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>
+! CHECK-SAME: %[[MASK:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>{{.*}}, %[[X:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32 {
integer function iall_test_optional(mask, x)
integer :: x(:)
logical, optional :: mask(:)
+! CHECK: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[RES_ALLOCA:.*]] = fir.alloca i32
+! CHECK: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]]
+! CHECK: %[[MASK_DECL:.*]]:2 = hlfir.declare %[[MASK]] dummy_scope %[[SCOPE]] arg 1 {fortran_attrs = #fir.var_attrs<optional>, {{.*}}}
+! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] dummy_scope %[[SCOPE]] arg 2 {{.*}}
iall_test_optional = iall(x, mask=mask)
-! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_0]] : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
-! CHECK: fir.call @_FortranAIAll4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_9]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[CONV_X:.*]] = fir.convert %[[X_DECL]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
+! CHECK: %[[CONV_MASK:.*]] = fir.convert %[[MASK_DECL]]#1 : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll4(%[[CONV_X]], %{{.*}}, %{{.*}}, %{{.*}}, %[[CONV_MASK]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i32, !fir.ref<i32>
end function
! CHECK-LABEL: func @_QPiall_test_optional_2(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>
+! CHECK-SAME: %[[MASK:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>{{.*}}, %[[X:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32 {
integer function iall_test_optional_2(mask, x)
integer :: x(:)
logical, pointer :: mask(:)
+! CHECK: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[RES_ALLOCA:.*]] = fir.alloca i32
+! CHECK: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]]
+! CHECK: %[[MASK_DECL:.*]]:2 = hlfir.declare %[[MASK]] dummy_scope %[[SCOPE]] arg 1 {fortran_attrs = #fir.var_attrs<pointer>, {{.*}}}
+! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] dummy_scope %[[SCOPE]] arg 2 {{.*}}
iall_test_optional_2 = iall(x, mask=mask)
-! CHECK: %[[VAL_4:.*]] = fir.load %[[VAL_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_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 @_FortranAIAll4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_18]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[MASK_LOAD1:.*]] = fir.load %[[MASK_DECL]]#0 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>
+! CHECK: %[[MASK_ADDR:.*]] = fir.box_addr %[[MASK_LOAD1]] : (!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>) -> !fir.ptr<!fir.array<?x!fir.logical<4>>>
+! CHECK: %[[MASK_PTR_CONV:.*]] = fir.convert %[[MASK_ADDR]] : (!fir.ptr<!fir.array<?x!fir.logical<4>>>) -> i64
+! CHECK: %[[C0_I64:.*]] = arith.constant 0 : i64
+! CHECK: %[[IS_PRESENT:.*]] = arith.cmpi ne, %[[MASK_PTR_CONV]], %[[C0_I64]] : i64
+! CHECK: %[[MASK_LOAD2:.*]] = fir.load %[[MASK_DECL]]#0 : !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>
+! CHECK: %[[ABSENT:.*]] = fir.absent !fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>
+! CHECK: %[[SELECTED:.*]] = arith.select %[[IS_PRESENT]], %[[MASK_LOAD2]], %[[ABSENT]] : !fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>
+! CHECK: %[[CONV_X:.*]] = fir.convert %[[X_DECL]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
+! CHECK: %[[CONV_MASK:.*]] = fir.convert %[[SELECTED]] : (!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>) -> !fir.box<none>
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll4(%[[CONV_X]], %{{.*}}, %{{.*}}, %{{.*}}, %[[CONV_MASK]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i32, !fir.ref<i32>
end function
! CHECK-LABEL: func @_QPiall_test_optional_3(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<10x!fir.logical<4>>>
+! CHECK-SAME: %[[MASK:.*]]: !fir.ref<!fir.array<10x!fir.logical<4>>>{{.*}}, %[[X:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32 {
integer function iall_test_optional_3(mask, x)
integer :: x(:)
logical, optional :: mask(10)
+! CHECK: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[RES_ALLOCA:.*]] = fir.alloca i32
+! CHECK: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]]
+! CHECK: %[[MASK_DECL:.*]]:2 = hlfir.declare %[[MASK]]({{.*}}) dummy_scope %[[SCOPE]] arg 1 {fortran_attrs = #fir.var_attrs<optional>, {{.*}}}
+! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] dummy_scope %[[SCOPE]] arg 2 {{.*}}
iall_test_optional_3 = iall(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: %[[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 @_FortranAIAll4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_18]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[IS_PRESENT:.*]] = fir.is_present %[[MASK_DECL]]#0 : (!fir.ref<!fir.array<10x!fir.logical<4>>>) -> i1
+! CHECK: %[[EMBOX:.*]] = fir.embox %[[MASK_DECL]]#0(%{{.*}}) : (!fir.ref<!fir.array<10x!fir.logical<4>>>, !fir.shape<1>) -> !fir.box<!fir.array<10x!fir.logical<4>>>
+! CHECK: %[[ABSENT:.*]] = fir.absent !fir.box<!fir.array<10x!fir.logical<4>>>
+! CHECK: %[[SELECTED:.*]] = arith.select %[[IS_PRESENT]], %[[EMBOX]], %[[ABSENT]] : !fir.box<!fir.array<10x!fir.logical<4>>>
+! CHECK: %[[CONV_X:.*]] = fir.convert %[[X_DECL]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
+! CHECK: %[[CONV_MASK:.*]] = fir.convert %[[SELECTED]] : (!fir.box<!fir.array<10x!fir.logical<4>>>) -> !fir.box<none>
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll4(%[[CONV_X]], %{{.*}}, %{{.*}}, %{{.*}}, %[[CONV_MASK]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i32, !fir.ref<i32>
end function
! CHECK-LABEL: func @_QPiall_test_optional_4(
+! CHECK-SAME: %[[X:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}, %[[USE_MASK:.*]]: !fir.ref<!fir.logical<4>>{{.*}}) -> i32 {
integer function iall_test_optional_4(x, use_mask)
! Test that local allocatable tracked in local variables
! are dealt as optional argument correctly.
integer :: x(:)
logical :: use_mask
logical, allocatable :: mask(:)
+! CHECK: %[[SCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[RES_ALLOCA:.*]] = fir.alloca i32
+! CHECK: %[[RES_DECL:.*]]:2 = hlfir.declare %[[RES_ALLOCA]]
+! CHECK: %[[MASK_ALLOCA:.*]] = fir.alloca !fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>
+! CHECK: %[[MASK_DECL:.*]]:2 = hlfir.declare %[[MASK_ALLOCA]] {fortran_attrs = #fir.var_attrs<allocatable>, {{.*}}}
+! CHECK: %[[USE_MASK_DECL:.*]]:2 = hlfir.declare %[[USE_MASK]] dummy_scope %[[SCOPE]] arg 2 {{.*}}
+! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] dummy_scope %[[SCOPE]] arg 1 {{.*}}
if (use_mask) then
allocate(mask(size(x, 1)))
call set_mask(mask)
- ! CHECK: fir.call @_QPset_mask
+ ! CHECK: fir.call @_QPset_mask(%{{.*}}) fastmath<contract> : (!fir.ref<!fir.array<?x!fir.logical<4>>>) -> ()
end if
iall_test_optional_4 = iall(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 @_FortranAIAll4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_37]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[MASK_LOAD1:.*]] = fir.load %[[MASK_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>>
+! CHECK: %[[MASK_ADDR1:.*]] = fir.box_addr %[[MASK_LOAD1]] : (!fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>) -> !fir.heap<!fir.array<?x!fir.logical<4>>>
+! CHECK: %[[MASK_PTR_CONV:.*]] = fir.convert %[[MASK_ADDR1]] : (!fir.heap<!fir.array<?x!fir.logical<4>>>) -> i64
+! CHECK: %[[C0_I64:.*]] = arith.constant 0 : i64
+! CHECK: %[[IS_ALLOCATED:.*]] = arith.cmpi ne, %[[MASK_PTR_CONV]], %[[C0_I64]] : i64
+! CHECK: %[[MASK_LOAD2:.*]] = fir.load %[[MASK_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>>
+! CHECK: %[[MASK_ADDR2:.*]] = fir.box_addr %[[MASK_LOAD2]] : (!fir.box<!fir.heap<!fir.array<?x!fir.logical<4>>>>) -> !fir.heap<!fir.array<?x!fir.logical<4>>>
+! CHECK: %[[EMBOX:.*]] = fir.embox %[[MASK_ADDR2]](%{{.*}}) : (!fir.heap<!fir.array<?x!fir.logical<4>>>, !fir.shapeshift<1>) -> !fir.box<!fir.array<?x!fir.logical<4>>>
+! CHECK: %[[ABSENT:.*]] = fir.absent !fir.box<!fir.array<?x!fir.logical<4>>>
+! CHECK: %[[SELECTED:.*]] = arith.select %[[IS_ALLOCATED]], %[[EMBOX]], %[[ABSENT]] : !fir.box<!fir.array<?x!fir.logical<4>>>
+! CHECK: %[[CONV_X:.*]] = fir.convert %[[X_DECL]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
+! CHECK: %[[CONV_MASK:.*]] = fir.convert %[[SELECTED]] : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
+! CHECK: %[[RESULT:.*]] = fir.call @_FortranAIAll4(%[[CONV_X]], %{{.*}}, %{{.*}}, %{{.*}}, %[[CONV_MASK]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: hlfir.assign %[[RESULT]] to %[[RES_DECL]]#0 : i32, !fir.ref<i32>
end function
diff --git a/flang/test/Lower/Intrinsics/iand.f90 b/flang/test/Lower/Intrinsics/iand.f90
index 0954948a62af4..1014183172dc7 100644
--- a/flang/test/Lower/Intrinsics/iand.f90
+++ b/flang/test/Lower/Intrinsics/iand.f90
@@ -1,77 +1,97 @@
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
-! CHECK-LABEL: iand_test
-! CHECK-SAME: %[[A:.*]]: !fir.ref<i32>{{.*}}, %[[B:.*]]: !fir.ref<i32>{{.*}}, %[[C:.*]]: !fir.ref<i32>{{.*}}
+! CHECK-LABEL: func.func @_QPiand_test(
+! CHECK-SAME: %[[A_ARG:.*]]: !fir.ref<i32>{{.*}}, %[[B_ARG:.*]]: !fir.ref<i32>{{.*}}, %[[C_ARG:.*]]: !fir.ref<i32>{{.*}})
subroutine iand_test(a, b, c)
integer :: a, b, c
-! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref<i32>
-! CHECK: %[[B_VAL:.*]] = fir.load %[[B]] : !fir.ref<i32>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[A_ARG]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[B_ARG]]
+! CHECK-DAG: %[[C:.*]]:2 = hlfir.declare %[[C_ARG]]
+! CHECK-DAG: %[[A_VAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i32>
+! CHECK-DAG: %[[B_VAL:.*]] = fir.load %[[B]]#0 : !fir.ref<i32>
c = iand(a, b)
! CHECK: %[[C_VAL:.*]] = arith.andi %[[A_VAL]], %[[B_VAL]] : i32
-! CHECK: fir.store %[[C_VAL]] to %[[C]] : !fir.ref<i32>
+! CHECK: hlfir.assign %[[C_VAL]] to %[[C]]#0 : i32, !fir.ref<i32>
end subroutine iand_test
-! CHECK-LABEL: iand_test1
-! CHECK-SAME: %[[A:.*]]: !fir.ref<i8>{{.*}}, %[[B:.*]]: !fir.ref<i8>{{.*}}, %[[C:.*]]: !fir.ref<i8>{{.*}}
+! CHECK-LABEL: func.func @_QPiand_test1(
+! CHECK-SAME: %[[A_ARG:.*]]: !fir.ref<i8>{{.*}}, %[[B_ARG:.*]]: !fir.ref<i8>{{.*}}, %[[C_ARG:.*]]: !fir.ref<i8>{{.*}})
subroutine iand_test1(a, b, c)
integer(kind=1) :: a, b, c
-! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref<i8>
-! CHECK: %[[B_VAL:.*]] = fir.load %[[B]] : !fir.ref<i8>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[A_ARG]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[B_ARG]]
+! CHECK-DAG: %[[C:.*]]:2 = hlfir.declare %[[C_ARG]]
+! CHECK-DAG: %[[A_VAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i8>
+! CHECK-DAG: %[[B_VAL:.*]] = fir.load %[[B]]#0 : !fir.ref<i8>
c = iand(a, b)
! CHECK: %[[C_VAL:.*]] = arith.andi %[[A_VAL]], %[[B_VAL]] : i8
-! CHECK: fir.store %[[C_VAL]] to %[[C]] : !fir.ref<i8>
+! CHECK: hlfir.assign %[[C_VAL]] to %[[C]]#0 : i8, !fir.ref<i8>
end subroutine iand_test1
-! CHECK-LABEL: iand_test2
-! CHECK-SAME: %[[A:.*]]: !fir.ref<i16>{{.*}}, %[[B:.*]]: !fir.ref<i16>{{.*}}, %[[C:.*]]: !fir.ref<i16>{{.*}}
+! CHECK-LABEL: func.func @_QPiand_test2(
+! CHECK-SAME: %[[A_ARG:.*]]: !fir.ref<i16>{{.*}}, %[[B_ARG:.*]]: !fir.ref<i16>{{.*}}, %[[C_ARG:.*]]: !fir.ref<i16>{{.*}})
subroutine iand_test2(a, b, c)
integer(kind=2) :: a, b, c
-! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref<i16>
-! CHECK: %[[B_VAL:.*]] = fir.load %[[B]] : !fir.ref<i16>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[A_ARG]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[B_ARG]]
+! CHECK-DAG: %[[C:.*]]:2 = hlfir.declare %[[C_ARG]]
+! CHECK-DAG: %[[A_VAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i16>
+! CHECK-DAG: %[[B_VAL:.*]] = fir.load %[[B]]#0 : !fir.ref<i16>
c = iand(a, b)
! CHECK: %[[C_VAL:.*]] = arith.andi %[[A_VAL]], %[[B_VAL]] : i16
-! CHECK: fir.store %[[C_VAL]] to %[[C]] : !fir.ref<i16>
+! CHECK: hlfir.assign %[[C_VAL]] to %[[C]]#0 : i16, !fir.ref<i16>
end subroutine iand_test2
-! CHECK-LABEL: iand_test3
-! CHECK-SAME: %[[A:.*]]: !fir.ref<i32>{{.*}}, %[[B:.*]]: !fir.ref<i32>{{.*}}, %[[C:.*]]: !fir.ref<i32>{{.*}}
+! CHECK-LABEL: func.func @_QPiand_test3(
+! CHECK-SAME: %[[A_ARG:.*]]: !fir.ref<i32>{{.*}}, %[[B_ARG:.*]]: !fir.ref<i32>{{.*}}, %[[C_ARG:.*]]: !fir.ref<i32>{{.*}})
subroutine iand_test3(a, b, c)
integer(kind=4) :: a, b, c
-! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref<i32>
-! CHECK: %[[B_VAL:.*]] = fir.load %[[B]] : !fir.ref<i32>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[A_ARG]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[B_ARG]]
+! CHECK-DAG: %[[C:.*]]:2 = hlfir.declare %[[C_ARG]]
+! CHECK-DAG: %[[A_VAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i32>
+! CHECK-DAG: %[[B_VAL:.*]] = fir.load %[[B]]#0 : !fir.ref<i32>
c = iand(a, b)
! CHECK: %[[C_VAL:.*]] = arith.andi %[[A_VAL]], %[[B_VAL]] : i32
-! CHECK: fir.store %[[C_VAL]] to %[[C]] : !fir.ref<i32>
+! CHECK: hlfir.assign %[[C_VAL]] to %[[C]]#0 : i32, !fir.ref<i32>
end subroutine iand_test3
-! CHECK-LABEL: iand_test4
-! CHECK-SAME: %[[A:.*]]: !fir.ref<i64>{{.*}}, %[[B:.*]]: !fir.ref<i64>{{.*}}, %[[C:.*]]: !fir.ref<i64>{{.*}}
+! CHECK-LABEL: func.func @_QPiand_test4(
+! CHECK-SAME: %[[A_ARG:.*]]: !fir.ref<i64>{{.*}}, %[[B_ARG:.*]]: !fir.ref<i64>{{.*}}, %[[C_ARG:.*]]: !fir.ref<i64>{{.*}})
subroutine iand_test4(a, b, c)
integer(kind=8) :: a, b, c
-! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref<i64>
-! CHECK: %[[B_VAL:.*]] = fir.load %[[B]] : !fir.ref<i64>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[A_ARG]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[B_ARG]]
+! CHECK-DAG: %[[C:.*]]:2 = hlfir.declare %[[C_ARG]]
+! CHECK-DAG: %[[A_VAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i64>
+! CHECK-DAG: %[[B_VAL:.*]] = fir.load %[[B]]#0 : !fir.ref<i64>
c = iand(a, b)
! CHECK: %[[C_VAL:.*]] = arith.andi %[[A_VAL]], %[[B_VAL]] : i64
-! CHECK: fir.store %[[C_VAL]] to %[[C]] : !fir.ref<i64>
+! CHECK: hlfir.assign %[[C_VAL]] to %[[C]]#0 : i64, !fir.ref<i64>
end subroutine iand_test4
-! CHECK-LABEL: iand_test5
-! CHECK-SAME: %[[A:.*]]: !fir.ref<i128>{{.*}}, %[[B:.*]]: !fir.ref<i128>{{.*}}, %[[C:.*]]: !fir.ref<i128>{{.*}}
+! CHECK-LABEL: func.func @_QPiand_test5(
+! CHECK-SAME: %[[A_ARG:.*]]: !fir.ref<i128>{{.*}}, %[[B_ARG:.*]]: !fir.ref<i128>{{.*}}, %[[C_ARG:.*]]: !fir.ref<i128>{{.*}})
subroutine iand_test5(a, b, c)
integer(kind=16) :: a, b, c
-! CHECK: %[[A_VAL:.*]] = fir.load %[[A]] : !fir.ref<i128>
-! CHECK: %[[B_VAL:.*]] = fir.load %[[B]] : !fir.ref<i128>
+! CHECK-DAG: %[[A:.*]]:2 = hlfir.declare %[[A_ARG]]
+! CHECK-DAG: %[[B:.*]]:2 = hlfir.declare %[[B_ARG]]
+! CHECK-DAG: %[[C:.*]]:2 = hlfir.declare %[[C_ARG]]
+! CHECK-DAG: %[[A_VAL:.*]] = fir.load %[[A]]#0 : !fir.ref<i128>
+! CHECK-DAG: %[[B_VAL:.*]] = fir.load %[[B]]#0 : !fir.ref<i128>
c = iand(a, b)
! CHECK: %[[C_VAL:.*]] = arith.andi %[[A_VAL]], %[[B_VAL]] : i128
-! CHECK: fir.store %[[C_VAL]] to %[[C]] : !fir.ref<i128>
+! CHECK: hlfir.assign %[[C_VAL]] to %[[C]]#0 : i128, !fir.ref<i128>
end subroutine iand_test5
-! CHECK-LABEL: iand_test6
-! CHECK-SAME: %[[S1:.*]]: !fir.ref<i32>{{.*}}, %[[S2:.*]]: !fir.ref<i32>{{.*}}
+! CHECK-LABEL: func.func @_QPiand_test6(
+! CHECK-SAME: %[[S1_ARG:.*]]: !fir.ref<i32>{{.*}}, %[[S2_ARG:.*]]: !fir.ref<i32>{{.*}})
subroutine iand_test6(s1, s2)
integer :: s1, s2
-! CHECK-DAG: %[[S1_VAL:.*]] = fir.load %[[S1]] : !fir.ref<i32>
-! CHECK-DAG: %[[S2_VAL:.*]] = fir.load %[[S2]] : !fir.ref<i32>
+! CHECK-DAG: %[[S1:.*]]:2 = hlfir.declare %[[S1_ARG]]
+! CHECK-DAG: %[[S2:.*]]:2 = hlfir.declare %[[S2_ARG]]
+! CHECK-DAG: %[[S1_VAL:.*]] = fir.load %[[S1]]#0 : !fir.ref<i32>
+! CHECK-DAG: %[[S2_VAL:.*]] = fir.load %[[S2]]#0 : !fir.ref<i32>
stop iand(s1,s2)
! CHECK-DAG: %[[ANDI:.*]] = arith.andi %[[S1_VAL]], %[[S2_VAL]] : i32
! CHECK: fir.call @_FortranAStopStatement(%[[ANDI]], {{.*}}, {{.*}}) {{.*}}: (i32, i1, i1) -> ()
diff --git a/flang/test/Lower/Intrinsics/iany.f90 b/flang/test/Lower/Intrinsics/iany.f90
index 3b9036bb670fe..c3c57b55b15a5 100644
--- a/flang/test/Lower/Intrinsics/iany.f90
+++ b/flang/test/Lower/Intrinsics/iany.f90
@@ -1,156 +1,127 @@
-! 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: func @_QPiany_test_1(
+! CHECK-LABEL: func.func @_QPiany_test_1(
! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi8>>{{.*}}) -> i8 {
integer(1) function iany_test_1(a)
integer(1) :: 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<?xi8>>) -> !fir.box<none>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK: %[[A:.*]]:2 = hlfir.declare %[[arg0]]
iany_test_1 = iany(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAny1(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i8
+! CHECK: %[[A_NONE:.*]] = fir.convert %[[A]]#1 : (!fir.box<!fir.array<?xi8>>) -> !fir.box<none>
+! CHECK: %{{.*}} = fir.call @_FortranAIAny1(%[[A_NONE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i8
end function
-! CHECK-LABEL: func @_QPiany_test_2(
+! CHECK-LABEL: func.func @_QPiany_test_2(
! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi16>>{{.*}}) -> i16 {
integer(2) function iany_test_2(a)
integer(2) :: 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<?xi16>>) -> !fir.box<none>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK: %[[A:.*]]:2 = hlfir.declare %[[arg0]]
iany_test_2 = iany(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAny2(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i16
+! CHECK: %[[A_NONE:.*]] = fir.convert %[[A]]#1 : (!fir.box<!fir.array<?xi16>>) -> !fir.box<none>
+! CHECK: %{{.*}} = fir.call @_FortranAIAny2(%[[A_NONE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i16
end function
-! CHECK-LABEL: func @_QPiany_test_4(
+! CHECK-LABEL: func.func @_QPiany_test_4(
! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) -> i32 {
integer function iany_test_4(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: %[[A:.*]]:2 = hlfir.declare %[[arg0]]
iany_test_4 = iany(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAny4(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[A_NONE:.*]] = fir.convert %[[A]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
+! CHECK: %{{.*}} = fir.call @_FortranAIAny4(%[[A_NONE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
end function
-! CHECK-LABEL: func @_QPiany_test_8(
+! CHECK-LABEL: func.func @_QPiany_test_8(
! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi64>>{{.*}}) -> i64 {
integer(8) function iany_test_8(a)
integer(8) :: 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<?xi64>>) -> !fir.box<none>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK: %[[A:.*]]:2 = hlfir.declare %[[arg0]]
iany_test_8 = iany(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAny8(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i64
+! CHECK: %[[A_NONE:.*]] = fir.convert %[[A]]#1 : (!fir.box<!fir.array<?xi64>>) -> !fir.box<none>
+! CHECK: %{{.*}} = fir.call @_FortranAIAny8(%[[A_NONE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i64
end function
-! CHECK-LABEL: func @_QPiany_test_16(
+! CHECK-LABEL: func.func @_QPiany_test_16(
! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?xi128>>{{.*}}) -> i128 {
integer(16) function iany_test_16(a)
integer(16) :: 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<?xi128>>) -> !fir.box<none>
-! CHECK-DAG: %[[a5:.*]] = fir.convert %[[c0]] : (index) -> i32
-! CHECK-DAG: %[[a6:.*]] = fir.convert %[[a1]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK: %[[A:.*]]:2 = hlfir.declare %[[arg0]]
iany_test_16 = iany(a)
-! CHECK: %{{.*}} = fir.call @_FortranAIAny16(%[[a3]], %{{.*}}, %{{.*}}, %[[a5]], %[[a6]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i128
+! CHECK: %[[A_NONE:.*]] = fir.convert %[[A]]#1 : (!fir.box<!fir.array<?xi128>>) -> !fir.box<none>
+! CHECK: %{{.*}} = fir.call @_FortranAIAny16(%[[A_NONE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i128
end function
-! CHECK-LABEL: func @_QPiany_test2(
+! CHECK-LABEL: func.func @_QPiany_test2(
! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?x?xi32>>{{.*}}, %[[arg1:.*]]: !fir.box<!fir.array<?xi32>>{{.*}}) {
subroutine iany_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: %[[A:.*]]:2 = hlfir.declare %[[arg0]]
+! CHECK: %[[R:.*]]:2 = hlfir.declare %[[arg1]]
+! CHECK: %[[A_NONE:.*]] = fir.convert %[[A]]#1 : (!fir.box<!fir.array<?x?xi32>>) -> !fir.box<none>
r = iany(a,dim=2)
-! CHECK: fir.call @_FortranAIAnyDim(%[[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: fir.call @_FortranAIAnyDim(%{{.*}}, %[[A_NONE]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}) fastmath<contract> : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, !fir.ref<i8>, i32, !fir.box<none>) -> ()
end subroutine
-! CHECK-LABEL: func @_QPiany_test_optional(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>
+! CHECK-LABEL: func.func @_QPiany_test_optional(
+! CHECK-SAME: %[[MASK_ARG:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>{{.*}}, %[[X_ARG:.*]]: !fir.box<!fir.array<?xi32>>{{.*}})
integer function iany_test_optional(mask, x)
integer :: x(:)
logical, optional :: mask(:)
+! CHECK: %[[MASK:.*]]:2 = hlfir.declare %[[MASK_ARG]]
+! CHECK: %[[X:.*]]:2 = hlfir.declare %[[X_ARG]]
iany_test_optional = iany(x, mask=mask)
-! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_0]] : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
-! CHECK: fir.call @_FortranAIAny4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_9]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[X_NONE:.*]] = fir.convert %[[X]]#1 : (!fir.box<!fir.array<?xi32>>) -> !fir.box<none>
+! CHECK: %[[MASK_NONE:.*]] = fir.convert %[[MASK]]#1 : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
+! CHECK: fir.call @_FortranAIAny4(%[[X_NONE]], %{{.*}}, %{{.*}}, %{{.*}}, %[[MASK_NONE]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
end function
-! CHECK-LABEL: func @_QPiany_test_optional_2(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>
+! CHECK-LABEL: func.func @_QPiany_test_optional_2(
+! CHECK-SAME: %[[MASK_ARG:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>>{{.*}})
integer function iany_test_optional_2(mask, x)
integer :: x(:)
logical, pointer :: mask(:)
+! CHECK: %[[MASK:.*]]:2 = hlfir.declare %[[MASK_ARG]]
iany_test_optional_2 = iany(x, mask=mask)
-! CHECK: %[[VAL_4:.*]] = fir.load %[[VAL_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_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 @_FortranAIAny4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_18]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[LOAD_MASK:.*]] = fir.load %[[MASK]]#0
+! CHECK: %[[MASK_ADDR:.*]] = fir.box_addr %[[LOAD_MASK]]
+! CHECK: %{{.*}} = arith.cmpi ne, %{{.*}}, %{{.*}} : i64
+! CHECK: %[[SEL_MASK:.*]] = arith.select %{{.*}}, %{{.*}}, %{{.*}} : !fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>
+! CHECK: %[[MASK_NONE:.*]] = fir.convert %[[SEL_MASK]] : (!fir.box<!fir.ptr<!fir.array<?x!fir.logical<4>>>>) -> !fir.box<none>
+! CHECK: fir.call @_FortranAIAny4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[MASK_NONE]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
end function
-! CHECK-LABEL: func @_QPiany_test_optional_3(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<!fir.array<10x!fir.logical<4>>>
+! CHECK-LABEL: func.func @_QPiany_test_optional_3(
+! CHECK-SAME: %[[MASK_ARG:.*]]: !fir.ref<!fir.array<10x!fir.logical<4>>>
integer function iany_test_optional_3(mask, x)
integer :: x(:)
logical, optional :: mask(10)
+! CHECK: %[[MASK:.*]]:2 = hlfir.declare %[[MASK_ARG]]
iany_test_optional_3 = iany(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: %[[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 @_FortranAIAny4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_18]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[PRESENT:.*]] = fir.is_present %[[MASK]]#0
+! CHECK: %[[EMBOX:.*]] = fir.embox %[[MASK]]#0
+! CHECK: %[[SEL_MASK:.*]] = arith.select %[[PRESENT]], %[[EMBOX]], %{{.*}} : !fir.box<!fir.array<10x!fir.logical<4>>>
+! CHECK: %[[MASK_NONE:.*]] = fir.convert %[[SEL_MASK]] : (!fir.box<!fir.array<10x!fir.logical<4>>>) -> !fir.box<none>
+! CHECK: fir.call @_FortranAIAny4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[MASK_NONE]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
end function
-! CHECK-LABEL: func @_QPiany_test_optional_4(
+! CHECK-LABEL: func.func @_QPiany_test_optional_4(
integer function iany_test_optional_4(x, use_mask)
! Test that local allocatable tracked in local variables
! are dealt as optional argument correctly.
integer :: x(:)
logical :: use_mask
logical, allocatable :: mask(:)
+! CHECK: %[[MASK:.*]]:2 = hlfir.declare %{{.*}}mask"}
if (use_mask) then
allocate(mask(size(x, 1)))
call set_mask(mask)
! CHECK: fir.call @_QPset_mask
end if
iany_test_optional_4 = iany(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 @_FortranAIAny4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_37]]) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
+! CHECK: %[[LOAD_MASK:.*]] = fir.load %[[MASK]]#0
+! CHECK: %[[MASK_ADDR:.*]] = fir.box_addr %[[LOAD_MASK]]
+! CHECK: %[[CMPI:.*]] = arith.cmpi ne, %{{.*}}, %{{.*}} : i64
+! CHECK: %[[SEL_MASK:.*]] = arith.select %[[CMPI]], %{{.*}}, %{{.*}} : !fir.box<!fir.array<?x!fir.logical<4>>>
+! CHECK: %[[MASK_NONE:.*]] = fir.convert %[[SEL_MASK]] : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.box<none>
+! CHECK: fir.call @_FortranAIAny4(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[MASK_NONE]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32, !fir.box<none>) -> i32
end function
diff --git a/flang/test/Lower/Intrinsics/ibclr.f90 b/flang/test/Lower/Intrinsics/ibclr.f90
index a11e677bf847f..ac4ed4533a7bd 100644
--- a/flang/test/Lower/Intrinsics/ibclr.f90
+++ b/flang/test/Lower/Intrinsics/ibclr.f90
@@ -1,19 +1,21 @@
-! 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: ibclr_test
+! CHECK-LABEL: func.func @_QPibclr_test(
+! CHECK-SAME: %[[I_ARG:.*]]: !fir.ref<i32>{{.*}}, %[[J_ARG:.*]]: !fir.ref<i32>{{.*}}) -> i32 {
function ibclr_test(i, j)
- ! CHECK-DAG: %[[result:.*]] = fir.alloca i32 {bindc_name = "ibclr_test"
- ! CHECK-DAG: %[[i:.*]] = fir.load %arg0 : !fir.ref<i32>
- ! CHECK-DAG: %[[j:.*]] = fir.load %arg1 : !fir.ref<i32>
- ! CHECK-DAG: %[[VAL_5:.*]] = arith.constant 1 : i32
- ! CHECK-DAG: %[[VAL_6:.*]] = arith.constant -1 : i32
- ! CHECK: %[[VAL_7:.*]] = arith.shli %[[VAL_5]], %[[j]] : i32
- ! CHECK: %[[VAL_8:.*]] = arith.xori %[[VAL_6]], %[[VAL_7]] : i32
- ! CHECK: %[[VAL_9:.*]] = arith.andi %[[i]], %[[VAL_8]] : i32
- ! CHECK: fir.store %[[VAL_9]] to %[[result]] : !fir.ref<i32>
- ! CHECK: %[[VAL_10:.*]] = fir.load %[[result]] : !fir.ref<i32>
- ! CHECK: return %[[VAL_10]] : i32
+! CHECK-DAG: %[[I:.*]]:2 = hlfir.declare %[[I_ARG]]
+! CHECK-DAG: %[[J:.*]]:2 = hlfir.declare %[[J_ARG]]
+! CHECK-DAG: %[[RESULT_VAR:.*]] = fir.alloca i32
+! CHECK-DAG: %[[RESULT:.*]]:2 = hlfir.declare %[[RESULT_VAR]]
+! CHECK-DAG: %[[I_VAL:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
+! CHECK-DAG: %[[J_VAL:.*]] = fir.load %[[J]]#0 : !fir.ref<i32>
+! CHECK-DAG: %[[C1:.*]] = arith.constant 1 : i32
+! CHECK-DAG: %[[CN1:.*]] = arith.constant -1 : i32
+! CHECK: %[[SHL:.*]] = arith.shli %[[C1]], %[[J_VAL]] : i32
+! CHECK: %[[XOR:.*]] = arith.xori %[[CN1]], %[[SHL]] : i32
+! CHECK: %[[AND:.*]] = arith.andi %[[I_VAL]], %[[XOR]] : i32
+! CHECK: hlfir.assign %[[AND]] to %[[RESULT]]#0 : i32, !fir.ref<i32>
+! CHECK: %[[RET:.*]] = fir.load %[[RESULT]]#0 : !fir.ref<i32>
+! CHECK: return %[[RET]] : i32
ibclr_test = ibclr(i, j)
end
-
diff --git a/flang/test/Lower/Intrinsics/ibits.f90 b/flang/test/Lower/Intrinsics/ibits.f90
index 008801710a66a..7563dd605d148 100644
--- a/flang/test/Lower/Intrinsics/ibits.f90
+++ b/flang/test/Lower/Intrinsics/ibits.f90
@@ -1,23 +1,27 @@
-! 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: ibits_test
+! CHECK-LABEL: func.func @_QPibits_test(
+! CHECK-SAME: %[[I_ARG:.*]]: !fir.ref<i32>{{.*}}, %[[J_ARG:.*]]: !fir.ref<i32>{{.*}}, %[[K_ARG:.*]]: !fir.ref<i32>{{.*}}) -> i32 {
function ibits_test(i, j, k)
- ! CHECK-DAG: %[[result:.*]] = fir.alloca i32 {bindc_name = "ibits_test"
- ! CHECK-DAG: %[[i:.*]] = fir.load %arg0 : !fir.ref<i32>
- ! CHECK-DAG: %[[j:.*]] = fir.load %arg1 : !fir.ref<i32>
- ! CHECK-DAG: %[[k:.*]] = fir.load %arg2 : !fir.ref<i32>
- ! CHECK-DAG: %[[VAL_7:.*]] = arith.constant 32 : i32
- ! CHECK-DAG: %[[VAL_8:.*]] = arith.subi %[[VAL_7]], %[[k]] : i32
- ! CHECK-DAG: %[[VAL_9:.*]] = arith.constant 0 : i32
- ! CHECK-DAG: %[[VAL_10:.*]] = arith.constant -1 : i32
- ! CHECK: %[[VAL_11:.*]] = arith.shrui %[[VAL_10]], %[[VAL_8]] : i32
- ! CHECK: %[[VAL_12:.*]] = arith.shrsi %[[i]], %[[j]] : i32
- ! CHECK: %[[VAL_13:.*]] = arith.andi %[[VAL_12]], %[[VAL_11]] : i32
- ! CHECK: %[[VAL_14:.*]] = arith.cmpi eq, %[[k]], %[[VAL_9]] : i32
- ! CHECK: %[[VAL_15:.*]] = arith.select %[[VAL_14]], %[[VAL_9]], %[[VAL_13]] : i32
- ! CHECK: fir.store %[[VAL_15]] to %[[result]] : !fir.ref<i32>
- ! CHECK: %[[VAL_16:.*]] = fir.load %[[result]] : !fir.ref<i32>
- ! CHECK: return %[[VAL_16]] : i32
+! CHECK-DAG: %[[I:.*]]:2 = hlfir.declare %[[I_ARG]]
+! CHECK-DAG: %[[J:.*]]:2 = hlfir.declare %[[J_ARG]]
+! CHECK-DAG: %[[K:.*]]:2 = hlfir.declare %[[K_ARG]]
+! CHECK-DAG: %[[RESULT_VAR:.*]] = fir.alloca i32
+! CHECK-DAG: %[[RESULT:.*]]:2 = hlfir.declare %[[RESULT_VAR]]
+! CHECK-DAG: %[[I_VAL:.*]] = fir.load %[[I]]#0 : !fir.ref<i32>
+! CHECK-DAG: %[[J_VAL:.*]] = fir.load %[[J]]#0 : !fir.ref<i32>
+! CHECK-DAG: %[[K_VAL:.*]] = fir.load %[[K]]#0 : !fir.ref<i32>
+! CHECK-DAG: %[[C32:.*]] = arith.constant 32 : i32
+! CHECK-DAG: %[[SUB:.*]] = arith.subi %[[C32]], %[[K_VAL]] : i32
+! CHECK-DAG: %[[C0:.*]] = arith.constant 0 : i32
+! CHECK-DAG: %[[CN1:.*]] = arith.constant -1 : i32
+! CHECK: %[[SHRUI:.*]] = arith.shrui %[[CN1]], %[[SUB]] : i32
+! CHECK: %[[SHRSI:.*]] = arith.shrsi %[[I_VAL]], %[[J_VAL]] : i32
+! CHECK: %[[AND:.*]] = arith.andi %[[SHRSI]], %[[SHRUI]] : i32
+! CHECK: %[[CMPI:.*]] = arith.cmpi eq, %[[K_VAL]], %[[C0]] : i32
+! CHECK: %[[SELECT:.*]] = arith.select %[[CMPI]], %[[C0]], %[[AND]] : i32
+! CHECK: hlfir.assign %[[SELECT]] to %[[RESULT]]#0 : i32, !fir.ref<i32>
+! CHECK: %[[RET:.*]] = fir.load %[[RESULT]]#0 : !fir.ref<i32>
+! CHECK: return %[[RET]] : i32
ibits_test = ibits(i, j, k)
end
More information about the flang-commits
mailing list