diff --git a/flang/test/Lower/OpenACC/acc-atomic-capture.f90 b/flang/test/Lower/OpenACC/acc-atomic-capture.f90 index d27a9f6160626..373683386fda9 100644 --- a/flang/test/Lower/OpenACC/acc-atomic-capture.f90 +++ b/flang/test/Lower/OpenACC/acc-atomic-capture.f90 @@ -1,16 +1,18 @@ -! RUN: %flang_fc1 -I nowhere -emit-fir -flang-deprecated-no-hlfir -fopenacc %s -o - | FileCheck %s +! RUN: %flang_fc1 -I nowhere -emit-hlfir -fopenacc %s -o - | FileCheck %s ! This test checks the lowering of atomic capture -program acc_atomic_capture_test +program acc_atomic_capture_test integer :: x, y !CHECK: %[[X:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFEx"} +!CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %0 {uniq_name = "_QFEx"} : (!fir.ref) -> (!fir.ref, !fir.ref) !CHECK: %[[Y:.*]] = fir.alloca i32 {bindc_name = "y", uniq_name = "_QFEy"} -!CHECK: %[[temp:.*]] = fir.load %[[X]] : !fir.ref +!CHECK: %[[Y_DECL:.*]]:2 = hlfir.declare %2 {uniq_name = "_QFEy"} : (!fir.ref) -> (!fir.ref, !fir.ref) +!CHECK: %[[temp:.*]] = fir.load %[[X_DECL]]#0 : !fir.ref !CHECK: acc.atomic.capture { -!CHECK: acc.atomic.read %[[X]] = %[[Y]] : !fir.ref -!CHECK: acc.atomic.update %[[Y]] : !fir.ref { +!CHECK: acc.atomic.read %[[X_DECL]]#1 = %[[Y_DECL]]#1 : !fir.ref +!CHECK: acc.atomic.update %[[Y_DECL]]#1 : !fir.ref { !CHECK: ^bb0(%[[ARG:.*]]: i32): !CHECK: %[[result:.*]] = arith.addi %[[temp]], %[[ARG]] : i32 !CHECK: acc.yield %[[result]] : i32 @@ -23,14 +25,14 @@ program acc_atomic_capture_test !$acc end atomic -!CHECK: %[[temp:.*]] = fir.load %[[X]] : !fir.ref +!CHECK: %[[temp:.*]] = fir.load %[[X_DECL]]#0 : !fir.ref !CHECK: acc.atomic.capture { -!CHECK: acc.atomic.update %[[Y]] : !fir.ref { +!CHECK: acc.atomic.update %[[Y_DECL]]#1 : !fir.ref { !CHECK: ^bb0(%[[ARG:.*]]: i32): !CHECK: %[[result:.*]] = arith.muli %[[temp]], %[[ARG]] : i32 !CHECK: acc.yield %[[result]] : i32 !CHECK: } -!CHECK: acc.atomic.read %[[X]] = %[[Y]] : !fir.ref +!CHECK: acc.atomic.read %[[X_DECL]]#1 = %[[Y_DECL]]#1 : !fir.ref !CHECK: } !$acc atomic capture @@ -40,13 +42,13 @@ program acc_atomic_capture_test !CHECK: %[[constant_20:.*]] = arith.constant 20 : i32 !CHECK: %[[constant_8:.*]] = arith.constant 8 : i32 -!CHECK: %[[temp:.*]] = fir.load %[[X]] : !fir.ref +!CHECK: %[[temp:.*]] = fir.load %[[X_DECL]]#0 : !fir.ref !CHECK: %[[result:.*]] = arith.subi %[[constant_8]], %[[temp]] : i32 -!CHECK: %[[result_noreassoc:.*]] = fir.no_reassoc %[[result]] : i32 +!CHECK: %[[result_noreassoc:.*]] = hlfir.no_reassoc %[[result]] : i32 !CHECK: %[[result:.*]] = arith.addi %[[constant_20]], %[[result_noreassoc]] : i32 !CHECK: acc.atomic.capture { -!CHECK: acc.atomic.read %[[X]] = %[[Y]] : !fir.ref -!CHECK: acc.atomic.write %[[Y]] = %[[result]] : !fir.ref, i32 +!CHECK: acc.atomic.read %[[X_DECL]]#1 = %[[Y_DECL]]#1 : !fir.ref +!CHECK: acc.atomic.write %[[Y_DECL]]#1 = %[[result]] : !fir.ref, i32 !CHECK: } !$acc atomic capture @@ -59,24 +61,19 @@ program acc_atomic_capture_test subroutine pointers_in_atomic_capture() !CHECK: %[[A:.*]] = fir.alloca !fir.box> {bindc_name = "a", uniq_name = "_QFpointers_in_atomic_captureEa"} -!CHECK: {{.*}} = fir.zero_bits !fir.ptr -!CHECK: {{.*}} = fir.embox {{.*}} : (!fir.ptr) -> !fir.box> -!CHECK: fir.store {{.*}} to %[[A]] : !fir.ref>> +!CHECK: %[[A_DECL:.*]]:2 = hlfir.declare %[[A]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFpointers_in_atomic_captureEa"} : (!fir.ref>>) -> (!fir.ref>>, !fir.ref>>) !CHECK: %[[B:.*]] = fir.alloca !fir.box> {bindc_name = "b", uniq_name = "_QFpointers_in_atomic_captureEb"} -!CHECK: {{.*}} = fir.zero_bits !fir.ptr -!CHECK: {{.*}} = fir.embox {{.*}} : (!fir.ptr) -> !fir.box> -!CHECK: fir.store {{.*}} to %[[B]] : !fir.ref>> +!CHECK: %[[B_DECL:.*]]:2 = hlfir.declare %[[B]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFpointers_in_atomic_captureEb"} : (!fir.ref>>) -> (!fir.ref>>, !fir.ref>>) !CHECK: %[[C:.*]] = fir.alloca i32 {bindc_name = "c", fir.target, uniq_name = "_QFpointers_in_atomic_captureEc"} +!CHECK: %[[C_DECL:.*]]:2 = hlfir.declare %[[C]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFpointers_in_atomic_captureEc"} : (!fir.ref) -> (!fir.ref, !fir.ref) !CHECK: %[[D:.*]] = fir.alloca i32 {bindc_name = "d", fir.target, uniq_name = "_QFpointers_in_atomic_captureEd"} -!CHECK: {{.*}} = fir.embox {{.*}} : (!fir.ref) -> !fir.box> -!CHECK: fir.store {{.*}} to %[[A]] : !fir.ref>> -!CHECK: {{.*}} = fir.embox {{.*}} : (!fir.ref) -> !fir.box> -!CHECK: fir.store {{.*}} to %[[B]] : !fir.ref>> -!CHECK: %[[loaded_A:.*]] = fir.load %[[A]] : !fir.ref>> +!CHECK: %[[D_DECL:.*]]:2 = hlfir.declare %[[D]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFpointers_in_atomic_captureEd"} : (!fir.ref) -> (!fir.ref, !fir.ref) + +!CHECK: %[[loaded_A:.*]] = fir.load %[[A_DECL]]#0 : !fir.ref>> !CHECK: %[[loaded_A_addr:.*]] = fir.box_addr %[[loaded_A]] : (!fir.box>) -> !fir.ptr -!CHECK: %[[loaded_B:.*]] = fir.load %[[B]] : !fir.ref>> +!CHECK: %[[loaded_B:.*]] = fir.load %[[B_DECL]]#0 : !fir.ref>> !CHECK: %[[loaded_B_addr:.*]] = fir.box_addr %[[loaded_B]] : (!fir.box>) -> !fir.ptr -!CHECK: %[[PRIVATE_LOADED_B:.*]] = fir.load %[[B]] : !fir.ref>> +!CHECK: %[[PRIVATE_LOADED_B:.*]] = fir.load %[[B_DECL]]#0 : !fir.ref>> !CHECK: %[[PRIVATE_LOADED_B_addr:.*]] = fir.box_addr %[[PRIVATE_LOADED_B]] : (!fir.box>) -> !fir.ptr !CHECK: %[[loaded_value:.*]] = fir.load %[[PRIVATE_LOADED_B_addr]] : !fir.ptr !CHECK: acc.atomic.capture { @@ -114,13 +111,15 @@ subroutine capture_with_convert_f32_to_i32() ! CHECK-LABEL: func.func @_QPcapture_with_convert_f32_to_i32() ! CHECK: %[[K:.*]] = fir.alloca i32 {bindc_name = "k", uniq_name = "_QFcapture_with_convert_f32_to_i32Ek"} +! CHECK: %[[K_DECL:.*]]:2 = hlfir.declare %[[K]] {uniq_name = "_QFcapture_with_convert_f32_to_i32Ek"} : (!fir.ref) -> (!fir.ref, !fir.ref) ! CHECK: %[[V:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFcapture_with_convert_f32_to_i32Ev"} +! CHECK: %[[V_DECL:.*]]:2 = hlfir.declare %[[V]] {uniq_name = "_QFcapture_with_convert_f32_to_i32Ev"} : (!fir.ref) -> (!fir.ref, !fir.ref) ! CHECK: %[[CST:.*]] = arith.constant 3.140000e+00 : f32 ! CHECK: %[[MUL:.*]] = arith.mulf %{{.*}}, %[[CST]] fastmath : f32 ! CHECK: %[[CONV:.*]] = fir.convert %[[MUL]] : (f32) -> i32 ! CHECK: acc.atomic.capture { -! CHECK: acc.atomic.read %[[V]] = %[[K]] : !fir.ref, i32 -! CHECK: acc.atomic.write %[[K]] = %[[CONV]] : !fir.ref, i32 +! CHECK: acc.atomic.read %[[V_DECL]]#1 = %[[K_DECL]]#1 : !fir.ref, i32 +! CHECK: acc.atomic.write %[[K_DECL]]#1 = %[[CONV]] : !fir.ref, i32 ! CHECK: } subroutine array_ref_in_atomic_capture1 @@ -131,12 +130,14 @@ subroutine array_ref_in_atomic_capture1 !$acc end atomic end subroutine array_ref_in_atomic_capture1 ! CHECK-LABEL: func.func @_QParray_ref_in_atomic_capture1() { -! CHECK: %[[VAL_0:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFarray_ref_in_atomic_capture1Ev"} -! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.array<10xi32> {bindc_name = "x", uniq_name = "_QFarray_ref_in_atomic_capture1Ex"} -! CHECK: %[[VAL_5:.*]] = fir.coordinate_of %[[VAL_1]], %{{.*}} : (!fir.ref>, i64) -> !fir.ref +! CHECK: %[[V:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFarray_ref_in_atomic_capture1Ev"} +! CHECK: %[[V_DECL:.*]]:2 = hlfir.declare %[[V]] {uniq_name = "_QFarray_ref_in_atomic_capture1Ev"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[X:.*]] = fir.alloca !fir.array<10xi32> {bindc_name = "x", uniq_name = "_QFarray_ref_in_atomic_capture1Ex"} +! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]](%{{.*}}) {uniq_name = "_QFarray_ref_in_atomic_capture1Ex"} : (!fir.ref>, !fir.shape<1>) -> (!fir.ref>, !fir.ref>) +! CHECK: %[[X_REF:.*]] = hlfir.designate %[[X_DECL]]#0 (%{{.*}}) : (!fir.ref>, index) -> !fir.ref ! CHECK: acc.atomic.capture { -! CHECK: acc.atomic.read %[[VAL_0]] = %[[VAL_5]] : !fir.ref, i32 -! CHECK: acc.atomic.update %[[VAL_5]] : !fir.ref { +! CHECK: acc.atomic.read %[[V_DECL]]#1 = %[[X_REF]] : !fir.ref, i32 +! CHECK: acc.atomic.update %[[X_REF]] : !fir.ref { ! CHECK: ^bb0(%[[VAL_7:.*]]: i32): ! CHECK: %[[VAL_8:.*]] = arith.addi %[[VAL_7]], %{{.*}} : i32 ! CHECK: acc.yield %[[VAL_8]] : i32 @@ -151,16 +152,18 @@ subroutine array_ref_in_atomic_capture2 !$acc end atomic end subroutine array_ref_in_atomic_capture2 ! CHECK-LABEL: func.func @_QParray_ref_in_atomic_capture2() { -! CHECK: %[[VAL_0:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFarray_ref_in_atomic_capture2Ev"} -! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.array<10xi32> {bindc_name = "x", uniq_name = "_QFarray_ref_in_atomic_capture2Ex"} -! CHECK: %[[VAL_5:.*]] = fir.coordinate_of %[[VAL_1]], %{{.*}} : (!fir.ref>, i64) -> !fir.ref +! CHECK: %[[V:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFarray_ref_in_atomic_capture2Ev"} +! CHECK: %[[V_DECL:.*]]:2 = hlfir.declare %[[V]] {uniq_name = "_QFarray_ref_in_atomic_capture2Ev"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[X:.*]] = fir.alloca !fir.array<10xi32> {bindc_name = "x", uniq_name = "_QFarray_ref_in_atomic_capture2Ex"} +! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]](%{{.*}}) {uniq_name = "_QFarray_ref_in_atomic_capture2Ex"} : (!fir.ref>, !fir.shape<1>) -> (!fir.ref>, !fir.ref>) +! CHECK: %[[X_REF:.*]] = hlfir.designate %[[X_DECL]]#0 (%{{.*}}) : (!fir.ref>, index) -> !fir.ref ! CHECK: acc.atomic.capture { -! CHECK: acc.atomic.update %[[VAL_5]] : !fir.ref { +! CHECK: acc.atomic.update %[[X_REF]] : !fir.ref { ! CHECK: ^bb0(%[[VAL_7:.*]]: i32): ! CHECK: %[[VAL_8:.*]] = arith.addi %[[VAL_7]], %{{.*}} : i32 ! CHECK: acc.yield %[[VAL_8]] : i32 ! CHECK: } -! CHECK: acc.atomic.read %[[VAL_0]] = %[[VAL_5]] : !fir.ref, i32 +! CHECK: acc.atomic.read %[[V_DECL]]#1 = %[[X_REF]] : !fir.ref, i32 ! CHECK: } subroutine comp_ref_in_atomic_capture1 @@ -175,13 +178,14 @@ subroutine comp_ref_in_atomic_capture1 !$acc end atomic end subroutine comp_ref_in_atomic_capture1 ! CHECK-LABEL: func.func @_QPcomp_ref_in_atomic_capture1() { -! CHECK: %[[VAL_0:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFcomp_ref_in_atomic_capture1Ev"} -! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.type<_QFcomp_ref_in_atomic_capture1Tt1{c:i32}> {bindc_name = "x", uniq_name = "_QFcomp_ref_in_atomic_capture1Ex"} -! CHECK: %[[VAL_2:.*]] = fir.field_index c, !fir.type<_QFcomp_ref_in_atomic_capture1Tt1{c:i32}> -! CHECK: %[[VAL_3:.*]] = fir.coordinate_of %[[VAL_1]], %[[VAL_2]] : (!fir.ref>, !fir.field) -> !fir.ref +! CHECK: %[[V:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFcomp_ref_in_atomic_capture1Ev"} +! CHECK: %[[V_DECL:.*]]:2 = hlfir.declare %[[V]] {uniq_name = "_QFcomp_ref_in_atomic_capture1Ev"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[X:.*]] = fir.alloca !fir.type<_QFcomp_ref_in_atomic_capture1Tt1{c:i32}> {bindc_name = "x", uniq_name = "_QFcomp_ref_in_atomic_capture1Ex"} +! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] {uniq_name = "_QFcomp_ref_in_atomic_capture1Ex"} : (!fir.ref>) -> (!fir.ref>, !fir.ref>) +! CHECK: %[[C:.*]] = hlfir.designate %[[X_DECL]]#0{"c"} : (!fir.ref>) -> !fir.ref ! CHECK: acc.atomic.capture { -! CHECK: acc.atomic.read %[[VAL_0]] = %[[VAL_3]] : !fir.ref, i32 -! CHECK: acc.atomic.update %[[VAL_3]] : !fir.ref { +! CHECK: acc.atomic.read %[[V_DECL]]#1 = %[[C]] : !fir.ref, i32 +! CHECK: acc.atomic.update %[[C]] : !fir.ref { ! CHECK: ^bb0(%[[VAL_5:.*]]: i32): ! CHECK: %[[VAL_6:.*]] = arith.addi %[[VAL_5]], %{{.*}} : i32 ! CHECK: acc.yield %[[VAL_6]] : i32 @@ -200,15 +204,16 @@ subroutine comp_ref_in_atomic_capture2 !$acc end atomic end subroutine comp_ref_in_atomic_capture2 ! CHECK-LABEL: func.func @_QPcomp_ref_in_atomic_capture2() { -! CHECK: %[[VAL_0:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFcomp_ref_in_atomic_capture2Ev"} -! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.type<_QFcomp_ref_in_atomic_capture2Tt1{c:i32}> {bindc_name = "x", uniq_name = "_QFcomp_ref_in_atomic_capture2Ex"} -! CHECK: %[[VAL_2:.*]] = fir.field_index c, !fir.type<_QFcomp_ref_in_atomic_capture2Tt1{c:i32}> -! CHECK: %[[VAL_3:.*]] = fir.coordinate_of %[[VAL_1]], %[[VAL_2]] : (!fir.ref>, !fir.field) -> !fir.ref +! CHECK: %[[V:.*]] = fir.alloca i32 {bindc_name = "v", uniq_name = "_QFcomp_ref_in_atomic_capture2Ev"} +! CHECK: %[[V_DECL:.*]]:2 = hlfir.declare %[[V]] {uniq_name = "_QFcomp_ref_in_atomic_capture2Ev"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[X:.*]] = fir.alloca !fir.type<_QFcomp_ref_in_atomic_capture2Tt1{c:i32}> {bindc_name = "x", uniq_name = "_QFcomp_ref_in_atomic_capture2Ex"} +! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] {uniq_name = "_QFcomp_ref_in_atomic_capture2Ex"} : (!fir.ref>) -> (!fir.ref>, !fir.ref>) +! CHECK: %[[C:.*]] = hlfir.designate %[[X_DECL]]#0{"c"} : (!fir.ref>) -> !fir.ref ! CHECK: acc.atomic.capture { -! CHECK: acc.atomic.update %[[VAL_3]] : !fir.ref { +! CHECK: acc.atomic.update %[[C]] : !fir.ref { ! CHECK: ^bb0(%[[VAL_5:.*]]: i32): ! CHECK: %[[VAL_6:.*]] = arith.addi %[[VAL_5]], %{{.*}} : i32 ! CHECK: acc.yield %[[VAL_6]] : i32 ! CHECK: } -! CHECK: acc.atomic.read %[[VAL_0]] = %[[VAL_3]] : !fir.ref, i32 +! CHECK: acc.atomic.read %[[V_DECL]]#1 = %[[C]] : !fir.ref, i32 ! CHECK: } diff --git a/flang/test/Lower/OpenACC/acc-atomic-read.f90 b/flang/test/Lower/OpenACC/acc-atomic-read.f90 index 985029d3b92d1..c1a97a9e5f74f 100644 --- a/flang/test/Lower/OpenACC/acc-atomic-read.f90 +++ b/flang/test/Lower/OpenACC/acc-atomic-read.f90 @@ -1,34 +1,26 @@ -! RUN: bbc -fopenacc -emit-fir -hlfir=false %s -o - | FileCheck %s +! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s ! This test checks the lowering of atomic read -!CHECK: func @_QQmain() attributes {fir.bindc_name = "acc_atomic_test"} { -!CHECK: %[[VAR_G:.*]] = fir.alloca f32 {bindc_name = "g", uniq_name = "_QFEg"} -!CHECK: %[[VAR_H:.*]] = fir.alloca f32 {bindc_name = "h", uniq_name = "_QFEh"} -!CHECK: acc.atomic.read %[[VAR_G]] = %[[VAR_H]] : !fir.ref, f32 -!CHECK: return -!CHECK: } - program acc_atomic_test - real g, h - !$acc atomic read - g = h + real g, h + !$acc atomic read + g = h end program acc_atomic_test +! CHECK: func @_QQmain() attributes {fir.bindc_name = "acc_atomic_test"} { +! CHECK: %[[VAR_G:.*]] = fir.alloca f32 {bindc_name = "g", uniq_name = "_QFEg"} +! CHECK: %[[G_DECL:.*]]:2 = hlfir.declare %[[VAR_G]] {uniq_name = "_QFEg"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[VAR_H:.*]] = fir.alloca f32 {bindc_name = "h", uniq_name = "_QFEh"} +! CHECK: %[[H_DECL:.*]]:2 = hlfir.declare %[[VAR_H]] {uniq_name = "_QFEh"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: acc.atomic.read %[[G_DECL]]#1 = %[[H_DECL]]#1 : !fir.ref, f32 +! CHECK: return +! CHECK: } + ! Test lowering atomic read for pointer variables. ! Please notice to use %[[VAL_4]] and %[[VAL_1]] for operands of atomic ! operation, instead of %[[VAL_3]] and %[[VAL_0]]. -!CHECK-LABEL: func.func @_QPatomic_read_pointer() { -! CHECK: %[[X:.*]] = fir.alloca !fir.box> {bindc_name = "x", uniq_name = "_QFatomic_read_pointerEx"} -! CHECK: %[[Y:.*]] = fir.alloca !fir.box> {bindc_name = "y", uniq_name = "_QFatomic_read_pointerEy"} -! CHECK: %[[LOAD_X:.*]] = fir.load %[[X]] : !fir.ref>> -! CHECK: %[[BOX_ADDR_X:.*]] = fir.box_addr %[[LOAD_X]] : (!fir.box>) -> !fir.ptr -! CHECK: %[[LOAD_Y:.*]] = fir.load %[[Y]] : !fir.ref>> -! CHECK: %[[BOX_ADDR_Y:.*]] = fir.box_addr %[[LOAD_Y]] : (!fir.box>) -> !fir.ptr -! CHECK: acc.atomic.read %[[BOX_ADDR_Y]] = %[[BOX_ADDR_X]] : !fir.ptr, i32 -! CHECK: } - subroutine atomic_read_pointer() integer, pointer :: x, y @@ -38,6 +30,18 @@ subroutine atomic_read_pointer() x = y end +! CHECK-LABEL: func.func @_QPatomic_read_pointer() { +! CHECK: %[[X:.*]] = fir.alloca !fir.box> {bindc_name = "x", uniq_name = "_QFatomic_read_pointerEx"} +! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFatomic_read_pointerEx"} : (!fir.ref>>) -> (!fir.ref>>, !fir.ref>>) +! CHECK: %[[Y:.*]] = fir.alloca !fir.box> {bindc_name = "y", uniq_name = "_QFatomic_read_pointerEy"} +! CHECK: %[[Y_DECL:.*]]:2 = hlfir.declare %[[Y]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFatomic_read_pointerEy"} : (!fir.ref>>) -> (!fir.ref>>, !fir.ref>>) +! CHECK: %[[LOAD_X:.*]] = fir.load %[[X_DECL]]#0 : !fir.ref>> +! CHECK: %[[BOX_ADDR_X:.*]] = fir.box_addr %[[LOAD_X]] : (!fir.box>) -> !fir.ptr +! CHECK: %[[LOAD_Y:.*]] = fir.load %[[Y_DECL]]#0 : !fir.ref>> +! CHECK: %[[BOX_ADDR_Y:.*]] = fir.box_addr %[[LOAD_Y]] : (!fir.box>) -> !fir.ptr +! CHECK: acc.atomic.read %[[BOX_ADDR_Y]] = %[[BOX_ADDR_X]] : !fir.ptr, i32 +! CHECK: } + subroutine atomic_read_with_convert() integer(4) :: x integer(8) :: y @@ -48,6 +52,8 @@ subroutine atomic_read_with_convert() ! CHECK-LABEL: func.func @_QPatomic_read_with_convert() { ! CHECK: %[[X:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFatomic_read_with_convertEx"} +! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] {uniq_name = "_QFatomic_read_with_convertEx"} : (!fir.ref) -> (!fir.ref, !fir.ref) ! CHECK: %[[Y:.*]] = fir.alloca i64 {bindc_name = "y", uniq_name = "_QFatomic_read_with_convertEy"} -! CHECK: %[[CONV:.*]] = fir.convert %[[X]] : (!fir.ref) -> !fir.ref -! CHECK: acc.atomic.read %[[Y]] = %[[CONV]] : !fir.ref, i32 +! CHECK: %[[Y_DECL:.*]]:2 = hlfir.declare %[[Y]] {uniq_name = "_QFatomic_read_with_convertEy"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[CONV:.*]] = fir.convert %[[X_DECL]]#1 : (!fir.ref) -> !fir.ref +! CHECK: acc.atomic.read %[[Y_DECL]]#1 = %[[CONV]] : !fir.ref, i32 diff --git a/flang/test/Lower/OpenACC/acc-atomic-update-array.f90 b/flang/test/Lower/OpenACC/acc-atomic-update-array.f90 index 9e8484dcc870e..e36c39c830ec6 100644 --- a/flang/test/Lower/OpenACC/acc-atomic-update-array.f90 +++ b/flang/test/Lower/OpenACC/acc-atomic-update-array.f90 @@ -1,5 +1,4 @@ -! RUN: bbc -fopenacc -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefixes=CHECK,FIR -! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s --check-prefixes=CHECK,HLFIR +! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s subroutine atomic_update_array1(r, n, x) implicit none @@ -21,12 +20,10 @@ subroutine atomic_update_array1(r, n, x) ! CHECK-LABEL: func.func @_QPatomic_update_array1( ! CHECK-SAME: %[[ARG0:.*]]: !fir.ref> {fir.bindc_name = "r"}, %[[ARG1:.*]]: !fir.ref {fir.bindc_name = "n"}, %[[ARG2:.*]]: !fir.ref {fir.bindc_name = "x"}) { -! HLFIR: %[[DECL_ARG2:.*]]:2 = hlfir.declare %[[ARG2]] {uniq_name = "_QFatomic_update_array1Ex"} : (!fir.ref) -> (!fir.ref, !fir.ref) -! HLFIR: %[[DECL_ARG0:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) {uniq_name = "_QFatomic_update_array1Er"} : (!fir.ref>, !fir.shape<1>) -> (!fir.box>, !fir.ref>) -! FIR: %[[ARRAY_REF:.*]] = fir.coordinate_of %[[ARG0]], %{{.*}} : (!fir.ref>, i64) -> !fir.ref -! HLFIR: %[[ARRAY_REF:.*]] = hlfir.designate %[[DECL_ARG0]]#0 (%{{.*}}) : (!fir.box>, i64) -> !fir.ref -! FIR: %[[LOAD_X:.*]] = fir.load %[[ARG2]] : !fir.ref -! HLFIR: %[[LOAD_X:.*]] = fir.load %[[DECL_ARG2]]#0 : !fir.ref +! CHECK: %[[DECL_ARG2:.*]]:2 = hlfir.declare %[[ARG2]] {uniq_name = "_QFatomic_update_array1Ex"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[DECL_ARG0:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) {uniq_name = "_QFatomic_update_array1Er"} : (!fir.ref>, !fir.shape<1>) -> (!fir.box>, !fir.ref>) +! CHECK: %[[ARRAY_REF:.*]] = hlfir.designate %[[DECL_ARG0]]#0 (%{{.*}}) : (!fir.box>, i64) -> !fir.ref +! CHECK: %[[LOAD_X:.*]] = fir.load %[[DECL_ARG2]]#0 : !fir.ref ! CHECK: acc.atomic.update %[[ARRAY_REF]] : !fir.ref { ! CHECK: ^bb0(%[[ARG:.*]]: f32): ! CHECK: %[[ATOMIC:.*]] = arith.addf %[[ARG]], %[[LOAD_X]] fastmath : f32 @@ -45,12 +42,10 @@ subroutine atomic_read_array1(r, n, x) ! CHECK-LABEL: func.func @_QPatomic_read_array1( ! CHECK-SAME: %[[ARG0:.*]]: !fir.ref> {fir.bindc_name = "r"}, %[[ARG1:.*]]: !fir.ref {fir.bindc_name = "n"}, %[[ARG2:.*]]: !fir.ref {fir.bindc_name = "x"}) { -! FIR: %[[ARRAY_REF:.*]] = fir.coordinate_of %[[ARG0]], %{{.*}} : (!fir.ref>, i64) -> !fir.ref -! FIR: acc.atomic.read %[[ARG2]] = %[[ARRAY_REF]] : !fir.ref, f32 -! HLFIR: %[[DECL_X:.*]]:2 = hlfir.declare %[[ARG2]] {uniq_name = "_QFatomic_read_array1Ex"} : (!fir.ref) -> (!fir.ref, !fir.ref) -! HLFIR: %[[DECL_R:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) {uniq_name = "_QFatomic_read_array1Er"} : (!fir.ref>, !fir.shape<1>) -> (!fir.box>, !fir.ref>) -! HLFIR: %[[DES:.*]] = hlfir.designate %[[DECL_R]]#0 (%{{.*}}) : (!fir.box>, i64) -> !fir.ref -! HLFIR: acc.atomic.read %[[DECL_X]]#1 = %[[DES]] : !fir.ref, f32 +! CHECK: %[[DECL_X:.*]]:2 = hlfir.declare %[[ARG2]] {uniq_name = "_QFatomic_read_array1Ex"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[DECL_R:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) {uniq_name = "_QFatomic_read_array1Er"} : (!fir.ref>, !fir.shape<1>) -> (!fir.box>, !fir.ref>) +! CHECK: %[[DES:.*]] = hlfir.designate %[[DECL_R]]#0 (%{{.*}}) : (!fir.box>, i64) -> !fir.ref +! CHECK: acc.atomic.read %[[DECL_X]]#1 = %[[DES]] : !fir.ref, f32 subroutine atomic_write_array1(r, n, x) implicit none @@ -63,14 +58,11 @@ subroutine atomic_write_array1(r, n, x) ! CHECK-LABEL: func.func @_QPatomic_write_array1( ! CHECK-SAME: %[[ARG0:.*]]: !fir.ref> {fir.bindc_name = "r"}, %[[ARG1:.*]]: !fir.ref {fir.bindc_name = "n"}, %[[ARG2:.*]]: !fir.ref {fir.bindc_name = "x"}) { -! FIR: %[[ARRAY_REF:.*]] = fir.coordinate_of %[[ARG0]], %{{.*}} : (!fir.ref>, i64) -> !fir.ref -! FIR: %[[LOAD:.*]] = fir.load %[[ARRAY_REF]] : !fir.ref -! FIR: acc.atomic.write %[[ARG2]] = %[[LOAD]] : !fir.ref, f32 -! HLFIR: %[[DECL_X:.*]]:2 = hlfir.declare %[[ARG2]] {uniq_name = "_QFatomic_write_array1Ex"} : (!fir.ref) -> (!fir.ref, !fir.ref) -! HLFIR: %[[DECL_R:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) {uniq_name = "_QFatomic_write_array1Er"} : (!fir.ref>, !fir.shape<1>) -> (!fir.box>, !fir.ref>) -! HLFIR: %[[DES:.*]] = hlfir.designate %[[DECL_R]]#0 (%{{.*}}) : (!fir.box>, i64) -> !fir.ref -! HLFIR: %[[LOAD:.*]] = fir.load %[[DES]] : !fir.ref -! HLFIR: acc.atomic.write %[[DECL_X]]#1 = %[[LOAD]] : !fir.ref, f32 +! CHECK: %[[DECL_X:.*]]:2 = hlfir.declare %[[ARG2]] {uniq_name = "_QFatomic_write_array1Ex"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[DECL_R:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) {uniq_name = "_QFatomic_write_array1Er"} : (!fir.ref>, !fir.shape<1>) -> (!fir.box>, !fir.ref>) +! CHECK: %[[DES:.*]] = hlfir.designate %[[DECL_R]]#0 (%{{.*}}) : (!fir.box>, i64) -> !fir.ref +! CHECK: %[[LOAD:.*]] = fir.load %[[DES]] : !fir.ref +! CHECK: acc.atomic.write %[[DECL_X]]#1 = %[[LOAD]] : !fir.ref, f32 subroutine atomic_capture_array1(r, n, x, y) implicit none @@ -85,19 +77,16 @@ subroutine atomic_capture_array1(r, n, x, y) ! CHECK-LABEL: func.func @_QPatomic_capture_array1( ! CHECK-SAME: %[[ARG0:.*]]: !fir.ref> {fir.bindc_name = "r"}, %[[ARG1:.*]]: !fir.ref {fir.bindc_name = "n"}, %[[ARG2:.*]]: !fir.ref {fir.bindc_name = "x"}, %[[ARG3:.*]]: !fir.ref {fir.bindc_name = "y"}) { -! HLFIR: %[[DECL_X:.*]]:2 = hlfir.declare %[[ARG2]] {uniq_name = "_QFatomic_capture_array1Ex"} : (!fir.ref) -> (!fir.ref, !fir.ref) -! HLFIR: %[[DECL_Y:.*]]:2 = hlfir.declare %[[ARG3]] {uniq_name = "_QFatomic_capture_array1Ey"} : (!fir.ref) -> (!fir.ref, !fir.ref) -! HLFIR: %[[DECL_R:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) {uniq_name = "_QFatomic_capture_array1Er"} : (!fir.ref>, !fir.shape<1>) -> (!fir.box>, !fir.ref>) -! HLFIR: %[[R_I:.*]] = hlfir.designate %[[DECL_R]]#0 (%{{.*}}) : (!fir.box>, i64) -> !fir.ref -! FIR: %[[R_I:.*]] = fir.coordinate_of %[[ARG0]], %{{.*}} : (!fir.ref>, i64) -> !fir.ref -! HLFIR: %[[LOAD:.*]] = fir.load %[[DECL_X]]#0 : !fir.ref -! FIR: %[[LOAD:.*]] = fir.load %[[ARG2]] : !fir.ref +! CHECK: %[[DECL_X:.*]]:2 = hlfir.declare %[[ARG2]] {uniq_name = "_QFatomic_capture_array1Ex"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[DECL_Y:.*]]:2 = hlfir.declare %[[ARG3]] {uniq_name = "_QFatomic_capture_array1Ey"} : (!fir.ref) -> (!fir.ref, !fir.ref) +! CHECK: %[[DECL_R:.*]]:2 = hlfir.declare %[[ARG0]](%{{.*}}) {uniq_name = "_QFatomic_capture_array1Er"} : (!fir.ref>, !fir.shape<1>) -> (!fir.box>, !fir.ref>) +! CHECK: %[[R_I:.*]] = hlfir.designate %[[DECL_R]]#0 (%{{.*}}) : (!fir.box>, i64) -> !fir.ref +! CHECK: %[[LOAD:.*]] = fir.load %[[DECL_X]]#0 : !fir.ref ! CHECK: acc.atomic.capture { ! CHECK: acc.atomic.update %[[R_I]] : !fir.ref { ! CHECK: ^bb0(%[[ARG:.*]]: f32): ! CHECK: %[[ADD:.*]] = arith.addf %[[ARG]], %[[LOAD]] fastmath : f32 ! CHECK: acc.yield %[[ADD]] : f32 ! CHECK: } -! HLFIR: acc.atomic.read %[[DECL_Y]]#1 = %[[R_I]] : !fir.ref, f32 -! FIR: acc.atomic.read %[[ARG3]] = %[[R_I]] : !fir.ref, f32 +! CHECK: acc.atomic.read %[[DECL_Y]]#1 = %[[R_I]] : !fir.ref, f32 ! CHECK: } diff --git a/flang/test/Lower/OpenACC/acc-atomic-update-hlfir.f90 b/flang/test/Lower/OpenACC/acc-atomic-update-hlfir.f90 index 7b51a9cceb0ee..3d5374aff41a0 100644 --- a/flang/test/Lower/OpenACC/acc-atomic-update-hlfir.f90 +++ b/flang/test/Lower/OpenACC/acc-atomic-update-hlfir.f90 @@ -1,6 +1,6 @@ ! This test checks lowering of atomic and atomic update constructs with HLFIR ! RUN: bbc -hlfir -fopenacc -emit-hlfir %s -o - | FileCheck %s -! RUN: %flang_fc1 -flang-experimental-hlfir -emit-hlfir -fopenacc %s -o - | FileCheck %s +! RUN: %flang_fc1 -emit-hlfir -fopenacc %s -o - | FileCheck %s !CHECK-LABEL: @_QPsb subroutine sb diff --git a/flang/test/Lower/OpenACC/acc-atomic-update.f90 b/flang/test/Lower/OpenACC/acc-atomic-update.f90 index f9c9e80652ad4..6571c9b1f0552 100644 --- a/flang/test/Lower/OpenACC/acc-atomic-update.f90 +++ b/flang/test/Lower/OpenACC/acc-atomic-update.f90 @@ -1,6 +1,6 @@ ! This test checks lowering of atomic and atomic update constructs -! RUN: bbc -fopenacc -emit-fir -hlfir=false %s -o - | FileCheck %s -! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -fopenacc %s -o - | FileCheck %s +! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s +! RUN: %flang_fc1 -fopenacc -emit-hlfir %s -o - | FileCheck %s program acc_atomic_update_test integer :: x, y, z @@ -12,16 +12,22 @@ program acc_atomic_update_test b=>d !CHECK: %[[A:.*]] = fir.alloca !fir.box> {bindc_name = "a", uniq_name = "_QFEa"} +!CHECK: %[[A_DECL:.*]]:2 = hlfir.declare %[[A]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFEa"} : (!fir.ref>>) -> (!fir.ref>>, !fir.ref>>) !CHECK: %[[B:.*]] = fir.alloca !fir.box> {bindc_name = "b", uniq_name = "_QFEb"} +!CHECK: %[[B_DECL:.*]]:2 = hlfir.declare %[[B]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFEb"} : (!fir.ref>>) -> (!fir.ref>>, !fir.ref>>) !CHECK: %[[C_ADDR:.*]] = fir.address_of(@_QFEc) : !fir.ref !CHECK: %[[D_ADDR:.*]] = fir.address_of(@_QFEd) : !fir.ref !CHECK: %[[I1:.*]] = fir.alloca i8 {bindc_name = "i1", uniq_name = "_QFEi1"} +!CHECK: %[[I1_DECL:.*]]:2 = hlfir.declare %[[I1]] {uniq_name = "_QFEi1"} : (!fir.ref) -> (!fir.ref, !fir.ref) !CHECK: %[[X:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFEx"} +!CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] {uniq_name = "_QFEx"} : (!fir.ref) -> (!fir.ref, !fir.ref) !CHECK: %[[Y:.*]] = fir.alloca i32 {bindc_name = "y", uniq_name = "_QFEy"} +!CHECK: %[[Y_DECL:.*]]:2 = hlfir.declare %[[Y]] {uniq_name = "_QFEy"} : (!fir.ref) -> (!fir.ref, !fir.ref) !CHECK: %[[Z:.*]] = fir.alloca i32 {bindc_name = "z", uniq_name = "_QFEz"} -!CHECK: %[[LOAD_A:.*]] = fir.load %[[A]] : !fir.ref>> +!CHECK: %[[Z_DECL:.*]]:2 = hlfir.declare %[[Z]] {uniq_name = "_QFEz"} : (!fir.ref) -> (!fir.ref, !fir.ref) +!CHECK: %[[LOAD_A:.*]] = fir.load %[[A_DECL]]#0 : !fir.ref>> !CHECK: %[[BOX_ADDR_A:.*]] = fir.box_addr %[[LOAD_A]] : (!fir.box>) -> !fir.ptr -!CHECK: %[[LOAD_B:.*]] = fir.load %[[B]] : !fir.ref>> +!CHECK: %[[LOAD_B:.*]] = fir.load %[[B_DECL]]#0 : !fir.ref>> !CHECK: %[[BOX_ADDR_B:.*]] = fir.box_addr %[[LOAD_B]] : (!fir.box>) -> !fir.ptr !CHECK: %[[LOAD_BOX_ADDR_B:.*]] = fir.load %[[BOX_ADDR_B]] : !fir.ptr !CHECK: acc.atomic.update %[[BOX_ADDR_A]] : !fir.ptr { @@ -34,13 +40,13 @@ program acc_atomic_update_test a = a + b !CHECK: {{.*}} = arith.constant 1 : i32 -!CHECK: acc.atomic.update %[[Y]] : !fir.ref { +!CHECK: acc.atomic.update %[[Y_DECL]]#1 : !fir.ref { !CHECK: ^bb0(%[[ARG:.*]]: i32): !CHECK: %[[RESULT:.*]] = arith.addi %[[ARG]], {{.*}} : i32 !CHECK: acc.yield %[[RESULT]] : i32 !CHECK: } -!CHECK: %[[LOADED_X:.*]] = fir.load %[[X]] : !fir.ref -!CHECK: acc.atomic.update %[[Z]] : !fir.ref { +!CHECK: %[[LOADED_X:.*]] = fir.load %[[X_DECL]]#0 : !fir.ref +!CHECK: acc.atomic.update %[[Z_DECL]]#1 : !fir.ref { !CHECK: ^bb0(%[[ARG:.*]]: i32): !CHECK: %[[RESULT:.*]] = arith.muli %[[LOADED_X]], %[[ARG]] : i32 !CHECK: acc.yield %[[RESULT]] : i32 @@ -51,7 +57,7 @@ program acc_atomic_update_test z = x * z !CHECK: %[[C1_VAL:.*]] = arith.constant 1 : i32 -!CHECK: acc.atomic.update %[[I1]] : !fir.ref { +!CHECK: acc.atomic.update %[[I1_DECL]]#1 : !fir.ref { !CHECK: ^bb0(%[[VAL:.*]]: i8): !CHECK: %[[CVT_VAL:.*]] = fir.convert %[[VAL]] : (i8) -> i32 !CHECK: %[[ADD_VAL:.*]] = arith.addi %[[CVT_VAL]], %[[C1_VAL]] : i32 diff --git a/flang/test/Lower/OpenACC/acc-atomic-write.f90 b/flang/test/Lower/OpenACC/acc-atomic-write.f90 index 7ec6f4e625c19..7d1551c85bc30 100644 --- a/flang/test/Lower/OpenACC/acc-atomic-write.f90 +++ b/flang/test/Lower/OpenACC/acc-atomic-write.f90 @@ -1,14 +1,16 @@ -! RUN: bbc -fopenacc -emit-fir -hlfir=false %s -o - | FileCheck %s +! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s ! This test checks the lowering of atomic write !CHECK: func @_QQmain() attributes {fir.bindc_name = "acc_atomic_write_test"} { !CHECK: %[[VAR_X:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFEx"} +!CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[VAR_X]] {uniq_name = "_QFEx"} : (!fir.ref) -> (!fir.ref, !fir.ref) !CHECK: %[[VAR_Y:.*]] = fir.alloca i32 {bindc_name = "y", uniq_name = "_QFEy"} +!CHECK: %[[Y_DECL:.*]]:2 = hlfir.declare %[[VAR_Y]] {uniq_name = "_QFEy"} : (!fir.ref) -> (!fir.ref, !fir.ref) !CHECK: %[[CONST_7:.*]] = arith.constant 7 : i32 -!CHECK: {{.*}} = fir.load %[[VAR_Y]] : !fir.ref +!CHECK: {{.*}} = fir.load %[[Y_DECL]]#0 : !fir.ref !CHECK: %[[VAR_7y:.*]] = arith.muli %[[CONST_7]], {{.*}} : i32 -!CHECK: acc.atomic.write %[[VAR_X]] = %[[VAR_7y]] : !fir.ref, i32 +!CHECK: acc.atomic.write %[[X_DECL]]#1 = %[[VAR_7y]] : !fir.ref, i32 !CHECK: return !CHECK: } @@ -24,14 +26,15 @@ end program acc_atomic_write_test !CHECK-LABEL: func.func @_QPatomic_write_pointer() { !CHECK: %[[X:.*]] = fir.alloca !fir.box> {bindc_name = "x", uniq_name = "_QFatomic_write_pointerEx"} +!CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X]] {fortran_attrs = #fir.var_attrs, uniq_name = "_QFatomic_write_pointerEx"} : (!fir.ref>>) -> (!fir.ref>>, !fir.ref>>) !CHECK: %[[C1:.*]] = arith.constant 1 : i32 -!CHECK: %[[LOAD_X:.*]] = fir.load %[[X]] : !fir.ref>> +!CHECK: %[[LOAD_X:.*]] = fir.load %[[X_DECL]]#0 : !fir.ref>> !CHECK: %[[BOX_ADDR_X:.*]] = fir.box_addr %[[LOAD_X]] : (!fir.box>) -> !fir.ptr !CHECK: acc.atomic.write %[[BOX_ADDR_X]] = %[[C1]] : !fir.ptr, i32 !CHECK: %[[C2:.*]] = arith.constant 2 : i32 -!CHECK: %[[LOAD_X:.*]] = fir.load %[[X]] : !fir.ref>> +!CHECK: %[[LOAD_X:.*]] = fir.load %[[X_DECL]]#0 : !fir.ref>> !CHECK: %[[BOX_ADDR_X:.*]] = fir.box_addr %[[LOAD_X]] : (!fir.box>) -> !fir.ptr -!CHECK: fir.store %[[C2]] to %[[BOX_ADDR_X]] : !fir.ptr +!CHECK: hlfir.assign %[[C2]] to %[[BOX_ADDR_X]] : i32, !fir.ptr subroutine atomic_write_pointer() integer, pointer :: x @@ -43,9 +46,10 @@ subroutine atomic_write_pointer() end subroutine !CHECK-LABEL: func.func @_QPatomic_write_typed_assign -!CHECK: %[[VAR:.*]] = fir.alloca f32 {bindc_name = "r2", uniq_name = "{{.*}}r2"} +!CHECK: %[[R2:.*]] = fir.alloca f32 {bindc_name = "r2", uniq_name = "{{.*}}r2"} +!CHECK: %[[R2_DECL:.*]]:2 = hlfir.declare %[[R2]] {uniq_name = "_QFatomic_write_typed_assignEr2"} : (!fir.ref) -> (!fir.ref, !fir.ref) !CHECK: %[[CST:.*]] = arith.constant 0.000000e+00 : f32 -!CHECK: acc.atomic.write %[[VAR]] = %[[CST]] : !fir.ref, f32 +!CHECK: acc.atomic.write %[[R2_DECL]]#1 = %[[CST]] : !fir.ref, f32 subroutine atomic_write_typed_assign real :: r2