This is an archive of the discontinued LLVM Phabricator instance.

Differential D156463

[flang][openacc] Lower acc declare device_resident for module variable
ClosedPublic

Authored by clementval on Jul 27 2023, 10:36 AM.

Details

Reviewers
razvanlupusoru
vzakhari
Commits
rGbbd214d997c7: [flang][openacc] Lower acc declare device_resident for module variable
Summary

This patch adds support to lower the device_resident clause on OpenACC
declare construct in module declaration.

Depends on D156457

Diff Detail

Event Timeline

clementval created this revision.Jul 27 2023, 10:36 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJul 27 2023, 10:36 AM
Herald added subscribers: sunshaoce, mehdi_amini. · View Herald Transcript
clementval requested review of this revision.Jul 27 2023, 10:36 AM
Herald added a subscriber: jdoerfert. · View Herald TranscriptJul 27 2023, 10:36 AM
clementval added a child revision: D156464: [flang][openacc] Lower acc declare link for module variable.Jul 27 2023, 10:56 AM
razvanlupusoru accepted this revision.Jul 27 2023, 11:54 AM

Looks great!

This revision is now accepted and ready to land.Jul 27 2023, 11:54 AM
This revision was landed with ongoing or failed builds.Jul 27 2023, 1:01 PM
Closed by commit rGbbd214d997c7: [flang][openacc] Lower acc declare device_resident for module variable (authored by clementval). · Explain Why
This revision was automatically updated to reflect the committed changes.
clementval added a commit: rGbbd214d997c7: [flang][openacc] Lower acc declare device_resident for module variable.
Harbormaster completed remote builds in B248634: Diff 544851.Jul 27 2023, 1:25 PM

Revision Contents

PathSize
flang/
lib/
Lower/
7 lines
test/
Lower/
OpenACC/
15 lines

Diff 544851

flang/lib/Lower/OpenACC.cpp

Show First 20 Lines • Show All 2,425 Lines • ▼ Show 20 Lines if (funcOp) {
} else if (const auto *copyinClause = } else if (const auto *copyinClause =
std::get_if<Fortran::parser::AccClause::Copyin>(&clause.u)) { std::get_if<Fortran::parser::AccClause::Copyin>(&clause.u)) {
genGlobalCtorsWithModifier<Fortran::parser::AccClause::Copyin, genGlobalCtorsWithModifier<Fortran::parser::AccClause::Copyin,
mlir::acc::CopyinOp, mlir::acc::CopyinOp>( mlir::acc::CopyinOp, mlir::acc::CopyinOp>(
converter, modBuilder, copyinClause, converter, modBuilder, copyinClause,
Fortran::parser::AccDataModifier::Modifier::ReadOnly, Fortran::parser::AccDataModifier::Modifier::ReadOnly,
mlir::acc::DataClause::acc_copyin, mlir::acc::DataClause::acc_copyin,
mlir::acc::DataClause::acc_copyin_readonly); mlir::acc::DataClause::acc_copyin_readonly);
} else if (const auto *deviceResidentClause =
std::get_if<Fortran::parser::AccClause::DeviceResident>(
&clause.u)) {
genGlobalCtors<mlir::acc::DeclareDeviceResidentOp,
mlir::acc::DeclareDeviceResidentOp>(
converter, modBuilder, deviceResidentClause->v,
mlir::acc::DataClause::acc_declare_device_resident);
} else { } else {
TODO(clauseLocation, "OpenACC declare clause"); TODO(clauseLocation, "OpenACC declare clause");
} }
} }
} }
return; return;
} }
llvm_unreachable("unsupported declarative directive"); llvm_unreachable("unsupported declarative directive");
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines
! CHECK-LABEL: acc.global_ctor @_QMacc_declare_copyin_testEdata1_acc_ctor { ! CHECK-LABEL: acc.global_ctor @_QMacc_declare_copyin_testEdata1_acc_ctor {
! CHECK: %[[GLOBAL_ADDR:.*]] = fir.address_of(@_QMacc_declare_copyin_testEdata1) {acc.declare = #acc.declare<dataClause = acc_copyin>} : !fir.ref<!fir.array<100000xf32>> ! CHECK: %[[GLOBAL_ADDR:.*]] = fir.address_of(@_QMacc_declare_copyin_testEdata1) {acc.declare = #acc.declare<dataClause = acc_copyin>} : !fir.ref<!fir.array<100000xf32>>
! CHECK: %[[COPYIN:.*]] = acc.copyin varPtr(%[[GLOBAL_ADDR]] : !fir.ref<!fir.array<100000xf32>>) -> !fir.ref<!fir.array<100000xf32>> {name = "data1"} ! CHECK: %[[COPYIN:.*]] = acc.copyin varPtr(%[[GLOBAL_ADDR]] : !fir.ref<!fir.array<100000xf32>>) -> !fir.ref<!fir.array<100000xf32>> {name = "data1"}
! CHECK: acc.declare_enter dataOperands(%[[COPYIN]] : !fir.ref<!fir.array<100000xf32>>) ! CHECK: acc.declare_enter dataOperands(%[[COPYIN]] : !fir.ref<!fir.array<100000xf32>>)
! CHECK: acc.terminator ! CHECK: acc.terminator
! CHECK: } ! CHECK: }
module acc_declare_device_resident_test
integer, parameter :: n = 5000
integer, dimension(n) :: data1
!$acc declare device_resident(data1)
end module
! CHECK-LABEL: fir.global @_QMacc_declare_device_resident_testEdata1 {acc.declare = #acc.declare<dataClause = acc_declare_device_resident>} : !fir.array<5000xi32>
! CHECK-LABEL: acc.global_ctor @_QMacc_declare_device_resident_testEdata1_acc_ctor {
! CHECK: %[[GLOBAL_ADDR:.*]] = fir.address_of(@_QMacc_declare_device_resident_testEdata1) {acc.declare = #acc.declare<dataClause = acc_declare_device_resident>} : !fir.ref<!fir.array<5000xi32>>
! CHECK: %[[DEVICERESIDENT:.*]] = acc.declare_device_resident varPtr(%0 : !fir.ref<!fir.array<5000xi32>>) -> !fir.ref<!fir.array<5000xi32>> {name = "data1"}
! CHECK: acc.declare_enter dataOperands(%[[DEVICERESIDENT]] : !fir.ref<!fir.array<5000xi32>>)
! CHECK: acc.terminator
! CHECK: }