[flang][acc] Generate constructors and destructors for common blocks #137691
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-fir-hlfir @llvm/pr-subscribers-openacc Author: None (khaki3) ChangesFull diff: https://github.com/llvm/llvm-project/pull/137691.diff 2 Files Affected:
diff --git a/flang/lib/Lower/OpenACC.cpp b/flang/lib/Lower/OpenACC.cpp
index 418bf4ee3d15f..27e08d4b6f20e 100644
--- a/flang/lib/Lower/OpenACC.cpp
+++ b/flang/lib/Lower/OpenACC.cpp
@@ -3754,6 +3754,66 @@ static void genGlobalCtors(Fortran::lower::AbstractConverter &converter,
const Fortran::parser::AccObjectList &accObjectList,
mlir::acc::DataClause clause) {
fir::FirOpBuilder &builder = converter.getFirOpBuilder();
+ auto genCtros = [&](const mlir::Location operandLocation,
+ const Fortran::semantics::Symbol &symbol) {
+ std::string globalName = converter.mangleName(symbol);
+ fir::GlobalOp globalOp = builder.getNamedGlobal(globalName);
+ std::stringstream declareGlobalCtorName;
+ declareGlobalCtorName << globalName << "_acc_ctor";
+ std::stringstream declareGlobalDtorName;
+ declareGlobalDtorName << globalName << "_acc_dtor";
+ std::stringstream asFortran;
+ asFortran << symbol.name().ToString();
+
+ if (builder.getModule().lookupSymbol<mlir::acc::GlobalConstructorOp>(
+ declareGlobalCtorName.str()))
+ return;
+
+ if (!globalOp) {
+ if (Fortran::semantics::FindEquivalenceSet(symbol)) {
+ for (Fortran::semantics::EquivalenceObject eqObj :
+ *Fortran::semantics::FindEquivalenceSet(symbol)) {
+ std::string eqName = converter.mangleName(eqObj.symbol);
+ globalOp = builder.getNamedGlobal(eqName);
+ if (globalOp)
+ break;
+ }
+
+ if (!globalOp)
+ llvm::report_fatal_error("could not retrieve global symbol");
+ } else {
+ llvm::report_fatal_error("could not retrieve global symbol");
+ }
+ }
+
+ addDeclareAttr(builder, globalOp.getOperation(), clause);
+ auto crtPos = builder.saveInsertionPoint();
+ modBuilder.setInsertionPointAfter(globalOp);
+ if (mlir::isa<fir::BaseBoxType>(fir::unwrapRefType(globalOp.getType()))) {
+ createDeclareGlobalOp<mlir::acc::GlobalConstructorOp, mlir::acc::CopyinOp,
+ mlir::acc::DeclareEnterOp, ExitOp>(
+ modBuilder, builder, operandLocation, globalOp, clause,
+ declareGlobalCtorName.str(), /*implicit=*/true, asFortran);
+ createDeclareAllocFunc<EntryOp>(modBuilder, builder, operandLocation,
+ globalOp, clause);
+ if constexpr (!std::is_same_v<EntryOp, ExitOp>)
+ createDeclareDeallocFunc<ExitOp>(modBuilder, builder, operandLocation,
+ globalOp, clause);
+ } else {
+ createDeclareGlobalOp<mlir::acc::GlobalConstructorOp, EntryOp,
+ mlir::acc::DeclareEnterOp, ExitOp>(
+ modBuilder, builder, operandLocation, globalOp, clause,
+ declareGlobalCtorName.str(), /*implicit=*/false, asFortran);
+ }
+ if constexpr (!std::is_same_v<EntryOp, ExitOp>) {
+ createDeclareGlobalOp<mlir::acc::GlobalDestructorOp,
+ mlir::acc::GetDevicePtrOp, mlir::acc::DeclareExitOp,
+ ExitOp>(
+ modBuilder, builder, operandLocation, globalOp, clause,
+ declareGlobalDtorName.str(), /*implicit=*/false, asFortran);
+ }
+ builder.restoreInsertionPoint(crtPos);
+ };
for (const auto &accObject : accObjectList.v) {
mlir::Location operandLocation = genOperandLocation(converter, accObject);
Fortran::common::visit(
@@ -3762,76 +3822,20 @@ static void genGlobalCtors(Fortran::lower::AbstractConverter &converter,
if (const auto *name =
Fortran::semantics::getDesignatorNameIfDataRef(
designator)) {
- std::string globalName = converter.mangleName(*name->symbol);
- fir::GlobalOp globalOp = builder.getNamedGlobal(globalName);
- std::stringstream declareGlobalCtorName;
- declareGlobalCtorName << globalName << "_acc_ctor";
- std::stringstream declareGlobalDtorName;
- declareGlobalDtorName << globalName << "_acc_dtor";
- std::stringstream asFortran;
- asFortran << name->symbol->name().ToString();
-
- if (builder.getModule()
- .lookupSymbol<mlir::acc::GlobalConstructorOp>(
- declareGlobalCtorName.str()))
- return;
-
- if (!globalOp) {
- if (Fortran::semantics::FindEquivalenceSet(*name->symbol)) {
- for (Fortran::semantics::EquivalenceObject eqObj :
- *Fortran::semantics::FindEquivalenceSet(
- *name->symbol)) {
- std::string eqName = converter.mangleName(eqObj.symbol);
- globalOp = builder.getNamedGlobal(eqName);
- if (globalOp)
- break;
- }
-
- if (!globalOp)
- llvm::report_fatal_error(
- "could not retrieve global symbol");
- } else {
- llvm::report_fatal_error(
- "could not retrieve global symbol");
- }
- }
-
- addDeclareAttr(builder, globalOp.getOperation(), clause);
- auto crtPos = builder.saveInsertionPoint();
- modBuilder.setInsertionPointAfter(globalOp);
- if (mlir::isa<fir::BaseBoxType>(
- fir::unwrapRefType(globalOp.getType()))) {
- createDeclareGlobalOp<mlir::acc::GlobalConstructorOp,
- mlir::acc::CopyinOp,
- mlir::acc::DeclareEnterOp, ExitOp>(
- modBuilder, builder, operandLocation, globalOp, clause,
- declareGlobalCtorName.str(), /*implicit=*/true,
- asFortran);
- createDeclareAllocFunc<EntryOp>(
- modBuilder, builder, operandLocation, globalOp, clause);
- if constexpr (!std::is_same_v<EntryOp, ExitOp>)
- createDeclareDeallocFunc<ExitOp>(
- modBuilder, builder, operandLocation, globalOp, clause);
- } else {
- createDeclareGlobalOp<mlir::acc::GlobalConstructorOp, EntryOp,
- mlir::acc::DeclareEnterOp, ExitOp>(
- modBuilder, builder, operandLocation, globalOp, clause,
- declareGlobalCtorName.str(), /*implicit=*/false,
- asFortran);
- }
- if constexpr (!std::is_same_v<EntryOp, ExitOp>) {
- createDeclareGlobalOp<mlir::acc::GlobalDestructorOp,
- mlir::acc::GetDevicePtrOp,
- mlir::acc::DeclareExitOp, ExitOp>(
- modBuilder, builder, operandLocation, globalOp, clause,
- declareGlobalDtorName.str(), /*implicit=*/false,
- asFortran);
- }
- builder.restoreInsertionPoint(crtPos);
+ genCtros(operandLocation, *name->symbol);
}
},
[&](const Fortran::parser::Name &name) {
- TODO(operandLocation, "OpenACC Global Ctor from parser::Name");
+ if (const auto *symbol = name.symbol) {
+ if (const auto *commonBlockDetails =
+ symbol->detailsIf<
+ Fortran::semantics::CommonBlockDetails>()) {
+ genCtros(operandLocation, *symbol);
+ } else {
+ TODO(operandLocation,
+ "OpenACC Global Ctor from parser::Name");
+ }
+ }
}},
accObject.u);
}
diff --git a/flang/test/Lower/OpenACC/acc-declare-globals.f90 b/flang/test/Lower/OpenACC/acc-declare-globals.f90
index b64bbbcc0d12f..4556c5f4ddb1c 100644
--- a/flang/test/Lower/OpenACC/acc-declare-globals.f90
+++ b/flang/test/Lower/OpenACC/acc-declare-globals.f90
@@ -3,6 +3,39 @@
! RUN: bbc -fopenacc -emit-hlfir %s -o - | FileCheck %s
+module acc_declare_common_test
+! CHECK-LABEL: fir.global @numbers_ {acc.declare = #acc.declare<dataClause = acc_declare_device_resident>, alignment = 4 : i64} : tuple<f32, f32> {
+! CHECK: acc.global_ctor @numbers__acc_ctor
+! CHECK: acc.global_dtor @numbers__acc_dtor
+ REAL :: one = 1
+ REAL :: two = 2
+ COMMON /numbers/ one, two
+ !$acc declare device_resident(/numbers/)
+
+! CHECK-LABEL: fir.global @numbers_create_ {acc.declare = #acc.declare<dataClause = acc_create>, alignment = 4 : i64} : tuple<f32, f32> {
+! CHECK: acc.global_ctor @numbers_create__acc_ctor
+! CHECK: acc.global_dtor @numbers_create__acc_dtor
+ REAL :: one_create = 1
+ REAL :: two_create = 2
+ COMMON /numbers_create/ one_create, two_create
+ !$acc declare create(/numbers_create/)
+
+! CHECK-LABEL: fir.global @numbers_in_ {acc.declare = #acc.declare<dataClause = acc_copyin>, alignment = 4 : i64} : tuple<f32, f32> {
+! CHECK: acc.global_ctor @numbers_in__acc_ctor
+! CHECK: acc.global_dtor @numbers_in__acc_dtor
+ REAL :: one_in = 1
+ REAL :: two_in = 2
+ COMMON /numbers_in/ one_in, two_in
+ !$acc declare copyin(/numbers_in/)
+
+! CHECK-LABEL: fir.global @numbers_link_ {acc.declare = #acc.declare<dataClause = acc_declare_link>, alignment = 4 : i64} : tuple<f32, f32> {
+! CHECK: acc.global_ctor @numbers_link__acc_ctor
+ REAL :: one_link = 1
+ REAL :: two_link = 2
+ COMMON /numbers_link/ one_link, two_link
+ !$acc declare link(/numbers_link/)
+end module
+
module acc_declare_test
integer, parameter :: n = 100000
real, dimension(n) :: data1
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/53/builds/15547 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/157/builds/26538 Here is the relevant piece of the build log for the reference |
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
Fixes what llvm#137691 introduced.
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
Fixes what llvm#137691 introduced.
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
Fixes what llvm#137691 introduced.
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
May 6, 2025
Fixes what llvm/llvm-project#137691 introduced.
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
Fixes what llvm#137691 introduced.
Ankur-0429
pushed a commit
to Ankur-0429/llvm-project
that referenced
this pull request
May 9, 2025
Ankur-0429
pushed a commit
to Ankur-0429/llvm-project
that referenced
this pull request
May 9, 2025
Fixes what llvm#137691 introduced.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.