This is an archive of the discontinued LLVM Phabricator instance.

Differential D158098

[flang][openacc] Fix post deallocate suffix
ClosedPublic

Authored by clementval on Aug 16 2023, 10:12 AM.

Details

Reviewers
razvanlupusoru
vzakhari
Commits
rG0e7649698a2f: [flang][openacc] Fix post deallocate suffix
Summary

The wrong suffix was applied

Diff Detail

Event Timeline

clementval created this revision.Aug 16 2023, 10:12 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptAug 16 2023, 10:12 AM
Herald added a subscriber: mehdi_amini. · View Herald Transcript
clementval requested review of this revision.Aug 16 2023, 10:12 AM
Herald added a subscriber: jdoerfert. · View Herald TranscriptAug 16 2023, 10:12 AM
razvanlupusoru accepted this revision.Aug 16 2023, 10:38 AM

Nice catch! :)

This revision is now accepted and ready to land.Aug 16 2023, 10:38 AM
This revision was landed with ongoing or failed builds.Aug 16 2023, 11:09 AM
Closed by commit rG0e7649698a2f: [flang][openacc] Fix post deallocate suffix (authored by clementval). · Explain Why
This revision was automatically updated to reflect the committed changes.
clementval added a commit: rG0e7649698a2f: [flang][openacc] Fix post deallocate suffix.
Harbormaster completed remote builds in B252980: Diff 550796.Aug 16 2023, 11:19 AM

Revision Contents

PathSize
flang/
lib/
Lower/
2 lines
test/
Lower/
OpenACC/
4 lines

Diff 550815

flang/lib/Lower/OpenACC.cpp

Show First 20 Lines • Show All 2,848 Lines • ▼ Show 20 Lines beginOpValue.getDefiningOp()->setAttr(
/*preDealloc=*/builder.getSymbolRefAttr(fctName.str()), /*preDealloc=*/builder.getSymbolRefAttr(fctName.str()),
/*postDealloc=*/{})); /*postDealloc=*/{}));
} }
void Fortran::lower::attachDeclarePostDeallocAction( void Fortran::lower::attachDeclarePostDeallocAction(
AbstractConverter &converter, fir::FirOpBuilder &builder, AbstractConverter &converter, fir::FirOpBuilder &builder,
const Fortran::semantics::Symbol &sym) { const Fortran::semantics::Symbol &sym) {
std::stringstream fctName; std::stringstream fctName;
fctName << converter.mangleName(sym) << declarePostAllocSuffix.str(); fctName << converter.mangleName(sym) << declarePostDeallocSuffix.str();
mlir::Operation &op = builder.getInsertionBlock()->back(); mlir::Operation &op = builder.getInsertionBlock()->back();
op.setAttr(mlir::acc::getDeclareActionAttrName(), op.setAttr(mlir::acc::getDeclareActionAttrName(),
mlir::acc::DeclareActionAttr::get( mlir::acc::DeclareActionAttr::get(
builder.getContext(), builder.getContext(),
/*preAlloc=*/{}, /*postAlloc=*/{}, /*preDealloc=*/{}, /*preAlloc=*/{}, /*postAlloc=*/{}, /*preDealloc=*/{},
/*postDealloc=*/builder.getSymbolRefAttr(fctName.str()))); /*postDealloc=*/builder.getSymbolRefAttr(fctName.str())));
} }

flang/test/Lower/OpenACC/acc-declare.f90

Show First 20 Lines • Show All 273 Lines • ▼ Show 20 Lines
! CHECK: %{{.*}} = fir.allocmem !fir.array<?xi32>, %{{.*}} {fir.must_be_heap = true, uniq_name = "_QMacc_declareFacc_declare_allocateEa.alloc"} ! CHECK: %{{.*}} = fir.allocmem !fir.array<?xi32>, %{{.*}} {fir.must_be_heap = true, uniq_name = "_QMacc_declareFacc_declare_allocateEa.alloc"}
! CHECK: fir.store %{{.*}} to %{{.*}} {acc.declare_action = #acc.declare_action<postAlloc = @_QMacc_declareFacc_declare_allocateEa_acc_declare_update_desc_post_alloc>} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>> ! CHECK: fir.store %{{.*}} to %{{.*}} {acc.declare_action = #acc.declare_action<postAlloc = @_QMacc_declareFacc_declare_allocateEa_acc_declare_update_desc_post_alloc>} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
deallocate(a) deallocate(a)
! CHECK: %{{.*}} = fir.box_addr %{{.*}} {acc.declare_action = #acc.declare_action<preDealloc = @_QMacc_declareFacc_declare_allocateEa_acc_declare_update_desc_pre_dealloc>} : (!fir.box<!fir.heap<!fir.array<?xi32>>>) -> !fir.heap<!fir.array<?xi32>> ! CHECK: %{{.*}} = fir.box_addr %{{.*}} {acc.declare_action = #acc.declare_action<preDealloc = @_QMacc_declareFacc_declare_allocateEa_acc_declare_update_desc_pre_dealloc>} : (!fir.box<!fir.heap<!fir.array<?xi32>>>) -> !fir.heap<!fir.array<?xi32>>
! CHECK: fir.freemem %{{.*}} : !fir.heap<!fir.array<?xi32>> ! CHECK: fir.freemem %{{.*}} : !fir.heap<!fir.array<?xi32>>
! CHECK: fir.store %{{.*}} to %{{.*}} {acc.declare_action = #acc.declare_action<postDealloc = @_QMacc_declareFacc_declare_allocateEa_acc_declare_update_desc_post_alloc>} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>> ! CHECK: fir.store %{{.*}} to %{{.*}} {acc.declare_action = #acc.declare_action<postDealloc = @_QMacc_declareFacc_declare_allocateEa_acc_declare_update_desc_post_dealloc>} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
end subroutine end subroutine
end module end module
module acc_declare_allocatable_test module acc_declare_allocatable_test
integer, allocatable :: data1(:) integer, allocatable :: data1(:)
!$acc declare create(data1) !$acc declare create(data1)
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines subroutine init()
allocate(data1(100)) allocate(data1(100))
! CHECK: fir.store %{{.*}} to %{{.*}} {acc.declare_action = #acc.declare_action<postAlloc = @_QMacc_declare_allocatable_testEdata1_acc_declare_update_desc_post_alloc>} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>> ! CHECK: fir.store %{{.*}} to %{{.*}} {acc.declare_action = #acc.declare_action<postAlloc = @_QMacc_declare_allocatable_testEdata1_acc_declare_update_desc_post_alloc>} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
end subroutine end subroutine
subroutine finalize() subroutine finalize()
use acc_declare_allocatable_test use acc_declare_allocatable_test
deallocate(data1) deallocate(data1)
! CHECK: %{{.*}} = fir.box_addr %{{.*}} {acc.declare_action = #acc.declare_action<preDealloc = @_QMacc_declare_allocatable_testEdata1_acc_declare_update_desc_pre_dealloc>} : (!fir.box<!fir.heap<!fir.array<?xi32>>>) -> !fir.heap<!fir.array<?xi32>> ! CHECK: %{{.*}} = fir.box_addr %{{.*}} {acc.declare_action = #acc.declare_action<preDealloc = @_QMacc_declare_allocatable_testEdata1_acc_declare_update_desc_pre_dealloc>} : (!fir.box<!fir.heap<!fir.array<?xi32>>>) -> !fir.heap<!fir.array<?xi32>>
! CHECK: fir.store %{{.*}} to %{{.*}} {acc.declare_action = #acc.declare_action<postDealloc = @_QMacc_declare_allocatable_testEdata1_acc_declare_update_desc_post_alloc>} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>> ! CHECK: fir.store %{{.*}} to %{{.*}} {acc.declare_action = #acc.declare_action<postDealloc = @_QMacc_declare_allocatable_testEdata1_acc_declare_update_desc_post_dealloc>} : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
end subroutine end subroutine
end module end module