intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-26 21:53:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

[flang] lower assumed-rank TARGET to intent(in) POINTER (#96082)

Browse Source 
The only special thing to do is to use fir.rebox_assumed_rank when
reboxing the target to properly set the POINTER attribute inside the
descriptor.
This commit is contained in:
jeanPerier
2024-06-20 09:01:07 +02:00
committed by GitHub
parent e7d63ebaa2
commit fa08e97d03
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flang/lib/Lower/ConvertCall.cpp
View File

@@ -1597,9 +1597,6 @@ void prepareUserCallArguments(
if (dataTy.isAssumedRank()) {
dataTy =
dataTy.getBoxTypeWithNewShape(fir::getBase(actualExv).getType());
if (dataTy.isAssumedRank())
TODO(loc, "associating assumed-rank target to pointer assumed-rank "
"argument");
}
mlir::Value irBox = builder.createTemporary(loc, dataTy);
fir::MutableBoxValue ptrBox(irBox,

9
flang/lib/Optimizer/Builder/MutableBox.cpp
View File

@@ -527,7 +527,14 @@ void fir::factory::associateMutableBox(fir::FirOpBuilder &builder,
mlir::ValueRange newLbounds = lbounds.empty()
? mlir::ValueRange{arr.getLBounds()}
: mlir::ValueRange{lbounds};
if (box.isDescribedByVariables()) {
if (box.hasAssumedRank()) {
assert(arr.hasAssumedRank() &&
"expect both arr and box to be assumed-rank");
mlir::Value reboxed = builder.create<fir::ReboxAssumedRankOp>(
loc, box.getBoxTy(), arr.getAddr(),
fir::LowerBoundModifierAttribute::Preserve);
writer.updateWithIrBox(reboxed);
} else if (box.isDescribedByVariables()) {
// LHS is a contiguous pointer described by local variables. Open RHS
// fir.box to update the LHS.
auto rawAddr = builder.create<fir::BoxAddrOp>(loc, arr.getMemTy(),

18
flang/test/Lower/HLFIR/assumed-rank-calls.f90
View File

@@ -40,6 +40,24 @@ end subroutine
! CHECK: return
! CHECK: }
subroutine test_target_to_pointer(x)
real, target :: x(..)
interface
subroutine takes_target_as_pointer(x)
real, pointer, intent(in) :: x(..)
end subroutine
end interface
call takes_target_as_pointer(x)
end subroutine
! CHECK-LABEL: func.func @_QPtest_target_to_pointer(
! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<*:f32>> {fir.bindc_name = "x", fir.target}) {
! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.box<!fir.ptr<!fir.array<*:f32>>>
! CHECK: %[[VAL_2:.*]] = fir.dummy_scope : !fir.dscope
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_0]] dummy_scope %[[VAL_2]] {fortran_attrs = #fir.var_attrs<target>, uniq_name = "_QFtest_target_to_pointerEx"} : (!fir.box<!fir.array<*:f32>>, !fir.dscope) -> (!fir.box<!fir.array<*:f32>>, !fir.box<!fir.array<*:f32>>)
! CHECK: %[[VAL_4:.*]] = fir.rebox_assumed_rank %[[VAL_3]]#0 lbs preserve : (!fir.box<!fir.array<*:f32>>) -> !fir.box<!fir.ptr<!fir.array<*:f32>>>
! CHECK: fir.store %[[VAL_4]] to %[[VAL_1]] : !fir.ref<!fir.box<!fir.ptr<!fir.array<*:f32>>>>
! CHECK: fir.call @_QPtakes_target_as_pointer(%[[VAL_1]]) fastmath<contract> : (!fir.ref<!fir.box<!fir.ptr<!fir.array<*:f32>>>>) -> ()
subroutine test_poly_to_nonepoly(x)
type t
integer :: i