[flang-commits] [flang] [flang][mlir] Add flang to mlir lowering for groupprivate (PR #180934)
via flang-commits
flang-commits at lists.llvm.org
Thu May 14 04:15:53 PDT 2026
https://github.com/skc7 updated https://github.com/llvm/llvm-project/pull/180934
>From 1639e350bf7192d496629461b49b8cf49eb7bbd8 Mon Sep 17 00:00:00 2001
From: skc7 <Krishna.Sankisa at amd.com>
Date: Wed, 11 Feb 2026 18:24:52 +0530
Subject: [PATCH 1/5] [flang][mlir] Add flang to mlir lowering for groupprivate
---
flang/include/flang/Lower/OpenMP.h | 1 +
flang/lib/Lower/OpenMP/OpenMP.cpp | 126 +++++++++++-
flang/test/Lower/OpenMP/Todo/groupprivate.f90 | 9 -
flang/test/Lower/OpenMP/groupprivate.f90 | 186 ++++++++++++++++++
4 files changed, 311 insertions(+), 11 deletions(-)
delete mode 100644 flang/test/Lower/OpenMP/Todo/groupprivate.f90
create mode 100644 flang/test/Lower/OpenMP/groupprivate.f90
diff --git a/flang/include/flang/Lower/OpenMP.h b/flang/include/flang/Lower/OpenMP.h
index 852a120c3782c..0cc2c6287aac7 100644
--- a/flang/include/flang/Lower/OpenMP.h
+++ b/flang/include/flang/Lower/OpenMP.h
@@ -81,6 +81,7 @@ void genOpenMPSymbolProperties(AbstractConverter &converter,
const pft::Variable &var);
void genThreadprivateOp(AbstractConverter &, const pft::Variable &);
+void genGroupprivateOp(AbstractConverter &, const pft::Variable &);
void genDeclareTargetIntGlobal(AbstractConverter &, const pft::Variable &);
bool isOpenMPTargetConstruct(const parser::OpenMPConstruct &);
bool isOpenMPDeviceDeclareTarget(Fortran::lower::AbstractConverter &,
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index da44717c8b6ed..129d69fd9eaf9 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -693,6 +693,89 @@ static void threadPrivatizeVars(lower::AbstractConverter &converter,
}
}
+static void groupprivatizeVars(lower::AbstractConverter &converter,
+ lower::pft::Evaluation &eval) {
+ fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
+ mlir::Location currentLocation = converter.getCurrentLocation();
+ mlir::OpBuilder::InsertionGuard guard(firOpBuilder);
+ firOpBuilder.setInsertionPointToStart(firOpBuilder.getAllocaBlock());
+
+ auto module = converter.getModuleOp();
+
+ // Create a groupprivate operation for the symbol.
+ // TODO: Extract device_type from the groupprivate directive.
+ auto genGroupprivateOp = [&](const semantics::Symbol &sym) -> mlir::Value {
+ std::string globalName = converter.mangleName(sym);
+ fir::GlobalOp global = module.lookupSymbol<fir::GlobalOp>(globalName);
+ if (!global) {
+ return mlir::Value();
+ }
+
+ mlir::omp::DeclareTargetDeviceType deviceTypeEnum =
+ mlir::omp::DeclareTargetDeviceType::any;
+ mlir::omp::DeclareTargetDeviceTypeAttr deviceTypeAttr =
+ mlir::omp::DeclareTargetDeviceTypeAttr::get(firOpBuilder.getContext(),
+ deviceTypeEnum);
+
+ // omp.groupprivate takes a flat symbol reference and returns
+ // the address of the per-team copy of the global variable.
+ return mlir::omp::GroupprivateOp::create(
+ firOpBuilder, currentLocation, global.resultType(), global.getSymbol(),
+ deviceTypeAttr);
+ };
+
+ llvm::SetVector<const semantics::Symbol *> groupprivateSyms;
+ converter.collectSymbolSet(eval, groupprivateSyms,
+ semantics::Symbol::Flag::OmpGroupPrivate,
+ /*collectSymbols=*/true,
+ /*collectHostAssociatedSymbols=*/true);
+ std::set<semantics::SourceName> groupprivateSymNames;
+
+ // For a COMMON block, the GroupprivateOp is generated for the block itself
+ // instead of its members.
+ llvm::SetVector<const semantics::Symbol *> commonSyms;
+
+ for (std::size_t i = 0; i < groupprivateSyms.size(); i++) {
+ const semantics::Symbol *sym = groupprivateSyms[i];
+ mlir::Value symGroupprivateValue;
+ // The variable may be used more than once, and each reference has one
+ // symbol with the same name. Only do once for references of one variable.
+ if (groupprivateSymNames.find(sym->name()) != groupprivateSymNames.end())
+ continue;
+ groupprivateSymNames.insert(sym->name());
+
+ if (const semantics::Symbol *common =
+ semantics::FindCommonBlockContaining(sym->GetUltimate())) {
+ // Handle common block members: create groupprivate op for the entire
+ // common block, then compute member offset.
+ mlir::Value commonGroupprivateValue;
+ if (commonSyms.contains(common)) {
+ commonGroupprivateValue = converter.getSymbolAddress(*common);
+ } else {
+ commonGroupprivateValue = genGroupprivateOp(*common);
+ if (!commonGroupprivateValue)
+ continue;
+ converter.bindSymbol(*common, commonGroupprivateValue);
+ commonSyms.insert(common);
+ }
+ symGroupprivateValue = lower::genCommonBlockMember(
+ converter, currentLocation, sym->GetUltimate(),
+ commonGroupprivateValue, common->size());
+ } else {
+ symGroupprivateValue = genGroupprivateOp(*sym);
+ }
+
+ if (!symGroupprivateValue) {
+ continue;
+ }
+
+ fir::ExtendedValue sexv = converter.getSymbolExtendedValue(*sym);
+ fir::ExtendedValue symGroupprivateExv =
+ getExtendedValue(sexv, symGroupprivateValue);
+ converter.bindSymbol(*sym, symGroupprivateExv);
+ }
+}
+
static mlir::Operation *setLoopVar(lower::AbstractConverter &converter,
mlir::Location loc, mlir::Value indexVal,
const semantics::Symbol *sym) {
@@ -1248,6 +1331,10 @@ static void createBodyOfOp(mlir::Operation &op, const OpWithBodyGenInfo &info,
}
}
+ if (info.dir == llvm::omp::Directive::OMPD_teams) {
+ groupprivatizeVars(info.converter, info.eval);
+ }
+
if (!info.genSkeletonOnly) {
if (ConstructQueue::const_iterator next = std::next(item);
next != queue.end()) {
@@ -2918,6 +3005,11 @@ genTargetOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
!symbolsWithDynamicSubstring.contains(&sym.GetUltimate()))
return;
+ // Skip groupprivate symbols - they don't need to be mapped because
+ // groupprivate creates its own LDS storage.
+ if (sym.GetUltimate().test(semantics::Symbol::Flag::OmpGroupPrivate))
+ return;
+
if (!isDuplicateMappedSymbol(sym, dsp.getAllSymbolsToPrivatize(),
hasDeviceAddrSyms, mapSyms, isDevicePtrSyms)) {
if (const auto *details =
@@ -4433,8 +4525,9 @@ genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
- const parser::OmpGroupprivateDirective &directive) {
- TODO(converter.getCurrentLocation(), "GROUPPRIVATE");
+ const parser::OpenMPGroupprivate &directive) {
+ // The groupprivate directive is lowered when the variable is referenced
+ // inside target/teams regions.
}
static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
@@ -4848,6 +4941,9 @@ void Fortran::lower::genOpenMPSymbolProperties(
if (sym.test(semantics::Symbol::Flag::OmpDeclareTarget))
lower::genDeclareTargetIntGlobal(converter, var);
+
+ if (sym.test(semantics::Symbol::Flag::OmpGroupPrivate))
+ lower::genGroupprivateOp(converter, var);
}
void Fortran::lower::genThreadprivateOp(lower::AbstractConverter &converter,
@@ -4916,6 +5012,32 @@ void Fortran::lower::genThreadprivateOp(lower::AbstractConverter &converter,
converter.bindSymbol(sym, symThreadprivateExv);
}
+void Fortran::lower::genGroupprivateOp(lower::AbstractConverter &converter,
+ const lower::pft::Variable &var) {
+ const semantics::Symbol &sym = var.getSymbol();
+
+ // For common block members, the groupprivate op is generated for the entire
+ // common block in groupprivatizeVars, not for individual members here.
+ // The common block already has a global, so nothing to do here.
+ if (semantics::FindCommonBlockContaining(sym.GetUltimate()))
+ return;
+
+ // Handle non-global variables: local variables with the SAVE attribute can
+ // appear in a groupprivate directive. Promote them to fir.global so that
+ // omp.groupprivate can reference them by symbol name.
+ if (!var.isGlobal()) {
+ fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
+ mlir::Location currentLocation = converter.getCurrentLocation();
+ auto module = converter.getModuleOp();
+ std::string globalName = converter.mangleName(sym);
+ if (!module.lookupSymbol<fir::GlobalOp>(globalName))
+ globalInitialization(converter, firOpBuilder, sym, var, currentLocation);
+ }
+
+ // The actual omp.groupprivate operation is created by groupprivatizeVars
+ // when entering a teams region.
+}
+
// This function replicates threadprivate's behaviour of generating
// an internal fir.GlobalOp for non-global variables in the main program
// that have the implicit SAVE attribute, to simplifiy LLVM-IR and MLIR
diff --git a/flang/test/Lower/OpenMP/Todo/groupprivate.f90 b/flang/test/Lower/OpenMP/Todo/groupprivate.f90
deleted file mode 100644
index 9ad9b9382760c..0000000000000
--- a/flang/test/Lower/OpenMP/Todo/groupprivate.f90
+++ /dev/null
@@ -1,9 +0,0 @@
-!RUN: %not_todo_cmd %flang_fc1 -emit-hlfir -fopenmp -fopenmp-version=60 -o - %s 2>&1 | FileCheck %s
-
-!CHECK: not yet implemented: GROUPPRIVATE
-
-module m
-implicit none
-integer :: x
-!$omp groupprivate(x)
-end module
diff --git a/flang/test/Lower/OpenMP/groupprivate.f90 b/flang/test/Lower/OpenMP/groupprivate.f90
new file mode 100644
index 0000000000000..9d3809b2a2999
--- /dev/null
+++ b/flang/test/Lower/OpenMP/groupprivate.f90
@@ -0,0 +1,186 @@
+!RUN: %flang_fc1 -emit-hlfir -fopenmp -fopenmp-version=60 %s -o - | FileCheck %s
+
+! Test lowering of groupprivate directive to omp.groupprivate.
+
+! CHECK-DAG: fir.global common @blk_
+! CHECK-DAG: fir.global common @blka_
+! CHECK-DAG: fir.global common @blkb_
+
+! Test 1: Basic groupprivate with single module variable.
+module m
+ implicit none
+ integer, save :: x
+ !$omp groupprivate(x)
+end module
+
+! CHECK-LABEL: func.func @_QPtest_groupprivate
+! CHECK: omp.target
+! CHECK: omp.teams
+! CHECK: %{{.*}} = omp.groupprivate @_QMmEx device_type (any) : !fir.ref<i32>
+subroutine test_groupprivate()
+ use m
+
+ !$omp target
+ !$omp teams
+ x = 10
+ !$omp end teams
+ !$omp end target
+end subroutine
+
+! Test 2: Groupprivate with common block.
+module m2
+ implicit none
+ integer :: cb_x, cb_y
+ real :: cb_z
+ common /blk/ cb_x, cb_y, cb_z
+ !$omp groupprivate(/blk/)
+end module
+
+! CHECK-LABEL: func.func @_QPtest_common_block_groupprivate
+! CHECK: omp.target
+! CHECK: omp.teams
+! CHECK: %{{.*}} = omp.groupprivate @blk_ device_type (any) : !fir.ref<!fir.array<12xi8>>
+! CHECK: fir.coordinate_of
+! CHECK: fir.convert
+subroutine test_common_block_groupprivate()
+ use m2
+
+ !$omp target
+ !$omp teams
+ cb_x = 1
+ cb_y = 2
+ cb_z = 3.0
+ !$omp end teams
+ !$omp end target
+end subroutine
+
+! Test 3: Local SAVE variable promoted to fir.global by globalInitialization.
+! CHECK-LABEL: func.func @_QPtest_local_save_groupprivate
+! CHECK: omp.teams
+! CHECK: %{{.*}} = omp.groupprivate @_QFtest_local_save_groupprivateElocal_x device_type (any) : !fir.ref<i32>
+subroutine test_local_save_groupprivate()
+ integer, save :: local_x
+ !$omp groupprivate(local_x)
+
+ !$omp teams
+ local_x = 42
+ !$omp end teams
+end subroutine
+
+! Test 4: Multiple groupprivate variables in same teams region.
+module m_multi
+ implicit none
+ integer, save :: gp_a
+ integer, save :: gp_b
+ real, save :: gp_c
+ !$omp groupprivate(gp_a, gp_b, gp_c)
+end module
+
+! CHECK-LABEL: func.func @_QPtest_multiple_groupprivate
+! CHECK: omp.target
+! CHECK: omp.teams
+! CHECK-DAG: omp.groupprivate @_QMm_multiEgp_a
+! CHECK-DAG: omp.groupprivate @_QMm_multiEgp_b
+! CHECK-DAG: omp.groupprivate @_QMm_multiEgp_c
+subroutine test_multiple_groupprivate()
+ use m_multi
+
+ !$omp target
+ !$omp teams
+ gp_a = 1
+ gp_b = 2
+ gp_c = 3.0
+ !$omp end teams
+ !$omp end target
+end subroutine
+
+! Test 5: Same variable referenced multiple times produces only one op.
+! CHECK-LABEL: func.func @_QPtest_repeated_ref_groupprivate
+! CHECK: omp.teams
+! CHECK: omp.groupprivate @_QMmEx
+! CHECK-NOT: omp.groupprivate @_QMmEx
+! CHECK: omp.terminator
+subroutine test_repeated_ref_groupprivate()
+ use m
+
+ !$omp target
+ !$omp teams
+ x = 10
+ x = x + 5
+ x = x * 2
+ !$omp end teams
+ !$omp end target
+end subroutine
+
+! Test 6: Standalone teams (no enclosing target) still triggers groupprivate.
+! CHECK-LABEL: func.func @_QPtest_standalone_teams_groupprivate
+! CHECK-NOT: omp.target
+! CHECK: omp.teams
+! CHECK: %{{.*}} = omp.groupprivate @_QMmEx device_type (any) : !fir.ref<i32>
+subroutine test_standalone_teams_groupprivate()
+ use m
+
+ !$omp teams
+ x = 100
+ !$omp end teams
+end subroutine
+
+! Test 7: Groupprivate variable is not added to target's implicit map_entries.
+! CHECK-LABEL: func.func @_QPtest_target_skip_map_groupprivate
+! CHECK-NOT: omp.map.info {{.*}}@_QMmEx
+! CHECK: omp.target
+! CHECK: omp.teams
+! CHECK: omp.groupprivate @_QMmEx
+subroutine test_target_skip_map_groupprivate()
+ use m
+
+ !$omp target
+ !$omp teams
+ x = 200
+ !$omp end teams
+ !$omp end target
+end subroutine
+
+! Test 8: Groupprivate works with various element types (scalar, array, real).
+module m_types
+ implicit none
+ real(8), save :: gp_r8
+ integer, save :: gp_iarr(4)
+ !$omp groupprivate(gp_r8, gp_iarr)
+end module
+
+! CHECK-LABEL: func.func @_QPtest_types_groupprivate
+! CHECK: omp.teams
+! CHECK-DAG: omp.groupprivate @_QMm_typesEgp_r8 device_type (any) : !fir.ref<f64>
+! CHECK-DAG: omp.groupprivate @_QMm_typesEgp_iarr device_type (any) : !fir.ref<!fir.array<4xi32>>
+subroutine test_types_groupprivate()
+ use m_types
+
+ !$omp teams
+ gp_r8 = 1.0d0
+ gp_iarr(1) = 99
+ !$omp end teams
+end subroutine
+
+! Test 9: Multiple distinct common blocks each get their own omp.groupprivate.
+module m_blocks
+ implicit none
+ integer :: a1, a2
+ integer :: b1, b2
+ common /blka/ a1, a2
+ common /blkb/ b1, b2
+ !$omp groupprivate(/blka/, /blkb/)
+end module
+
+! CHECK-LABEL: func.func @_QPtest_multi_common_groupprivate
+! CHECK: omp.teams
+! CHECK-DAG: omp.groupprivate @blka_ device_type (any)
+! CHECK-DAG: omp.groupprivate @blkb_ device_type (any)
+subroutine test_multi_common_groupprivate()
+ use m_blocks
+
+ !$omp teams
+ a1 = 1
+ b1 = 2
+ !$omp end teams
+end subroutine
>From 05413e181231bb26a928eaf05c4162a00e5bd6de Mon Sep 17 00:00:00 2001
From: skc7 <Krishna.Sankisa at amd.com>
Date: Mon, 4 May 2026 15:26:33 +0530
Subject: [PATCH 2/5] support device_type groupprivate lowering
---
flang/include/flang/Lower/AbstractConverter.h | 11 ++++++++
flang/include/flang/Lower/OpenMP.h | 11 ++++++++
flang/lib/Lower/Bridge.cpp | 11 ++++++++
flang/lib/Lower/OpenMP/OpenMP.cpp | 25 ++++++++++++++++---
flang/test/Lower/OpenMP/groupprivate.f90 | 22 ++++++++++++++++
5 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/flang/include/flang/Lower/AbstractConverter.h b/flang/include/flang/Lower/AbstractConverter.h
index 1b19807bff0cf..db3ad4411508c 100644
--- a/flang/include/flang/Lower/AbstractConverter.h
+++ b/flang/include/flang/Lower/AbstractConverter.h
@@ -77,6 +77,10 @@ class StatementContext;
using ExprToValueMap = llvm::DenseMap<const SomeExpr *, mlir::Value>;
+/// Forward declaration only; the full definition lives in
+/// `flang/Lower/OpenMP.h`.
+struct OMPGroupprivateDeviceTypeInfo;
+
//===----------------------------------------------------------------------===//
// AbstractConverter interface
//===----------------------------------------------------------------------===//
@@ -401,6 +405,13 @@ class AbstractConverter {
virtual mlir::StateStack &getStateStack() = 0;
+ /// Return the per-converter table recording the device_type clause
+ /// associated with each groupprivate symbol. Used to communicate state from
+ /// the lowering of a `!$omp groupprivate` directive to the later creation of
+ /// `omp.groupprivate` operations inside teams regions. The returned object
+ /// is fully defined in `flang/Lower/OpenMP.h`.
+ virtual OMPGroupprivateDeviceTypeInfo &getOMPGroupprivateDeviceTypeInfo() = 0;
+
private:
/// Options controlling lowering behavior.
const Fortran::lower::LoweringOptions &loweringOptions;
diff --git a/flang/include/flang/Lower/OpenMP.h b/flang/include/flang/Lower/OpenMP.h
index 0cc2c6287aac7..992546024fc50 100644
--- a/flang/include/flang/Lower/OpenMP.h
+++ b/flang/include/flang/Lower/OpenMP.h
@@ -13,6 +13,7 @@
#ifndef FORTRAN_LOWER_OPENMP_H
#define FORTRAN_LOWER_OPENMP_H
+#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
#include <cinttypes>
@@ -61,6 +62,16 @@ struct OMPDeferredDeclareTargetInfo {
const Fortran::semantics::Symbol &sym;
};
+/// Per-converter table that records the `device_type` modifier associated with
+/// each groupprivate symbol on the `!$omp groupprivate` directive that
+/// declared it. Populated when the directive is lowered and consumed when
+/// `omp.groupprivate` operations are emitted inside teams regions.
+struct OMPGroupprivateDeviceTypeInfo {
+ llvm::DenseMap<const Fortran::semantics::Symbol *,
+ mlir::omp::DeclareTargetDeviceType>
+ map;
+};
+
// Generate the OpenMP terminator for Operation at Location.
mlir::Operation *genOpenMPTerminator(fir::FirOpBuilder &, mlir::Operation *,
mlir::Location);
diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp
index 01482c1cb90b5..d148829a6d78b 100644
--- a/flang/lib/Lower/Bridge.cpp
+++ b/flang/lib/Lower/Bridge.cpp
@@ -1430,6 +1430,11 @@ class FirConverter : public Fortran::lower::AbstractConverter {
mlir::StateStack &getStateStack() override { return stateStack; }
+ Fortran::lower::OMPGroupprivateDeviceTypeInfo &
+ getOMPGroupprivateDeviceTypeInfo() override {
+ return ompGroupprivateDeviceTypeInfo;
+ }
+
/// Add the symbol to the local map and return `true`. If the symbol is
/// already in the map and \p forced is `false`, the map is not updated.
/// Instead the value `false` is returned.
@@ -7016,6 +7021,12 @@ class FirConverter : public Fortran::lower::AbstractConverter {
llvm::SmallVector<Fortran::lower::OMPDeferredDeclareTargetInfo>
ompDeferredDeclareTarget;
+ /// Per-converter table recording the `device_type` clause for each symbol
+ /// declared in a `!$omp groupprivate` directive. Populated when the
+ /// directive is lowered and consumed when `omp.groupprivate` ops are emitted
+ /// inside teams regions.
+ Fortran::lower::OMPGroupprivateDeviceTypeInfo ompGroupprivateDeviceTypeInfo;
+
const Fortran::lower::ExprToValueMap *exprValueOverrides{nullptr};
/// Stack of derived type under construction to avoid infinite loops when
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index 129d69fd9eaf9..96dbe1a1d953d 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -703,7 +703,6 @@ static void groupprivatizeVars(lower::AbstractConverter &converter,
auto module = converter.getModuleOp();
// Create a groupprivate operation for the symbol.
- // TODO: Extract device_type from the groupprivate directive.
auto genGroupprivateOp = [&](const semantics::Symbol &sym) -> mlir::Value {
std::string globalName = converter.mangleName(sym);
fir::GlobalOp global = module.lookupSymbol<fir::GlobalOp>(globalName);
@@ -711,8 +710,15 @@ static void groupprivatizeVars(lower::AbstractConverter &converter,
return mlir::Value();
}
+ // Look up the device_type recorded when the !$omp groupprivate directive
+ // was lowered. Default to 'any' if no explicit device_type was given.
mlir::omp::DeclareTargetDeviceType deviceTypeEnum =
mlir::omp::DeclareTargetDeviceType::any;
+ const auto &deviceTypeMap =
+ converter.getOMPGroupprivateDeviceTypeInfo().map;
+ auto it = deviceTypeMap.find(&sym.GetUltimate());
+ if (it != deviceTypeMap.end())
+ deviceTypeEnum = it->second;
mlir::omp::DeclareTargetDeviceTypeAttr deviceTypeAttr =
mlir::omp::DeclareTargetDeviceTypeAttr::get(firOpBuilder.getContext(),
deviceTypeEnum);
@@ -4526,8 +4532,21 @@ static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
const parser::OpenMPGroupprivate &directive) {
- // The groupprivate directive is lowered when the variable is referenced
- // inside target/teams regions.
+ // The omp.groupprivate operation itself is created lazily when the symbol
+ // is referenced inside a teams region (see groupprivatizeVars). Here we
+ // only extract the device_type clause (if any) and record it per-symbol so
+ // that the later op-creation can emit it on omp.groupprivate.
+ ObjectList objects = makeObjects(directive.v.Arguments(), semaCtx);
+ List<Clause> clauses = makeClauses(directive.v.Clauses(), semaCtx);
+ ClauseProcessor cp(converter, semaCtx, clauses);
+ mlir::omp::DeviceTypeClauseOps deviceTypeOps;
+ cp.processDeviceType(deviceTypeOps);
+
+ auto &deviceTypeMap = converter.getOMPGroupprivateDeviceTypeInfo().map;
+ for (const Object &obj : objects) {
+ if (const semantics::Symbol *sym = obj.sym())
+ deviceTypeMap[&sym->GetUltimate()] = deviceTypeOps.deviceType;
+ }
}
static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
diff --git a/flang/test/Lower/OpenMP/groupprivate.f90 b/flang/test/Lower/OpenMP/groupprivate.f90
index 9d3809b2a2999..b7bb4407fad30 100644
--- a/flang/test/Lower/OpenMP/groupprivate.f90
+++ b/flang/test/Lower/OpenMP/groupprivate.f90
@@ -184,3 +184,25 @@ subroutine test_multi_common_groupprivate()
b1 = 2
!$omp end teams
end subroutine
+
+! Test 10: device_type(host) and device_type(nohost) clauses are honored.
+module m_dt
+ implicit none
+ integer, save :: gp_h
+ integer, save :: gp_nh
+ !$omp groupprivate(gp_h) device_type(host)
+ !$omp groupprivate(gp_nh) device_type(nohost)
+end module
+
+! CHECK-LABEL: func.func @_QPtest_device_type_groupprivate
+! CHECK: omp.teams
+! CHECK-DAG: omp.groupprivate @_QMm_dtEgp_h device_type (host) : !fir.ref<i32>
+! CHECK-DAG: omp.groupprivate @_QMm_dtEgp_nh device_type (nohost) : !fir.ref<i32>
+subroutine test_device_type_groupprivate()
+ use m_dt
+
+ !$omp teams
+ gp_h = 1
+ gp_nh = 2
+ !$omp end teams
+end subroutine
>From ad339178a26b1ac2f06cb8707ef9fd492a2f9ac5 Mon Sep 17 00:00:00 2001
From: skc7 <Krishna.Sankisa at amd.com>
Date: Thu, 7 May 2026 11:43:18 +0530
Subject: [PATCH 3/5] [flang][OpenMP] Replace OMPGroupprivateDeviceTypeInfo
struct with a using alias
---
flang/include/flang/Lower/AbstractConverter.h | 8 ++------
flang/include/flang/Lower/OpenMP.h | 8 +++-----
flang/lib/Lower/OpenMP/OpenMP.cpp | 5 ++---
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/flang/include/flang/Lower/AbstractConverter.h b/flang/include/flang/Lower/AbstractConverter.h
index db3ad4411508c..08b446af8c1b9 100644
--- a/flang/include/flang/Lower/AbstractConverter.h
+++ b/flang/include/flang/Lower/AbstractConverter.h
@@ -14,6 +14,7 @@
#define FORTRAN_LOWER_ABSTRACTCONVERTER_H
#include "flang/Lower/LoweringOptions.h"
+#include "flang/Lower/OpenMP.h"
#include "flang/Lower/PFTDefs.h"
#include "flang/Lower/StatementContext.h"
#include "flang/Lower/Support/Utils.h"
@@ -77,10 +78,6 @@ class StatementContext;
using ExprToValueMap = llvm::DenseMap<const SomeExpr *, mlir::Value>;
-/// Forward declaration only; the full definition lives in
-/// `flang/Lower/OpenMP.h`.
-struct OMPGroupprivateDeviceTypeInfo;
-
//===----------------------------------------------------------------------===//
// AbstractConverter interface
//===----------------------------------------------------------------------===//
@@ -408,8 +405,7 @@ class AbstractConverter {
/// Return the per-converter table recording the device_type clause
/// associated with each groupprivate symbol. Used to communicate state from
/// the lowering of a `!$omp groupprivate` directive to the later creation of
- /// `omp.groupprivate` operations inside teams regions. The returned object
- /// is fully defined in `flang/Lower/OpenMP.h`.
+ /// `omp.groupprivate` operations inside teams regions.
virtual OMPGroupprivateDeviceTypeInfo &getOMPGroupprivateDeviceTypeInfo() = 0;
private:
diff --git a/flang/include/flang/Lower/OpenMP.h b/flang/include/flang/Lower/OpenMP.h
index 992546024fc50..da1e7d55fbf15 100644
--- a/flang/include/flang/Lower/OpenMP.h
+++ b/flang/include/flang/Lower/OpenMP.h
@@ -66,11 +66,9 @@ struct OMPDeferredDeclareTargetInfo {
/// each groupprivate symbol on the `!$omp groupprivate` directive that
/// declared it. Populated when the directive is lowered and consumed when
/// `omp.groupprivate` operations are emitted inside teams regions.
-struct OMPGroupprivateDeviceTypeInfo {
- llvm::DenseMap<const Fortran::semantics::Symbol *,
- mlir::omp::DeclareTargetDeviceType>
- map;
-};
+using OMPGroupprivateDeviceTypeInfo =
+ llvm::DenseMap<const Fortran::semantics::Symbol *,
+ mlir::omp::DeclareTargetDeviceType>;
// Generate the OpenMP terminator for Operation at Location.
mlir::Operation *genOpenMPTerminator(fir::FirOpBuilder &, mlir::Operation *,
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index 96dbe1a1d953d..24538398940a3 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -714,8 +714,7 @@ static void groupprivatizeVars(lower::AbstractConverter &converter,
// was lowered. Default to 'any' if no explicit device_type was given.
mlir::omp::DeclareTargetDeviceType deviceTypeEnum =
mlir::omp::DeclareTargetDeviceType::any;
- const auto &deviceTypeMap =
- converter.getOMPGroupprivateDeviceTypeInfo().map;
+ const auto &deviceTypeMap = converter.getOMPGroupprivateDeviceTypeInfo();
auto it = deviceTypeMap.find(&sym.GetUltimate());
if (it != deviceTypeMap.end())
deviceTypeEnum = it->second;
@@ -4542,7 +4541,7 @@ static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
mlir::omp::DeviceTypeClauseOps deviceTypeOps;
cp.processDeviceType(deviceTypeOps);
- auto &deviceTypeMap = converter.getOMPGroupprivateDeviceTypeInfo().map;
+ auto &deviceTypeMap = converter.getOMPGroupprivateDeviceTypeInfo();
for (const Object &obj : objects) {
if (const semantics::Symbol *sym = obj.sym())
deviceTypeMap[&sym->GetUltimate()] = deviceTypeOps.deviceType;
>From 9fb099e938f3379b839871e4afa4d9c465489877 Mon Sep 17 00:00:00 2001
From: skc7 <Krishna.Sankisa at amd.com>
Date: Wed, 13 May 2026 15:39:16 +0530
Subject: [PATCH 4/5] NFCcode changes
---
flang/include/flang/Lower/OpenMP.h | 2 +-
flang/lib/Lower/OpenMP/OpenMP.cpp | 58 +++++++++++++++---------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/flang/include/flang/Lower/OpenMP.h b/flang/include/flang/Lower/OpenMP.h
index da1e7d55fbf15..6d858202d04fa 100644
--- a/flang/include/flang/Lower/OpenMP.h
+++ b/flang/include/flang/Lower/OpenMP.h
@@ -89,8 +89,8 @@ void genOpenMPDeclarativeConstruct(AbstractConverter &,
void genOpenMPSymbolProperties(AbstractConverter &converter,
const pft::Variable &var);
-void genThreadprivateOp(AbstractConverter &, const pft::Variable &);
void genGroupprivateOp(AbstractConverter &, const pft::Variable &);
+void genThreadprivateOp(AbstractConverter &, const pft::Variable &);
void genDeclareTargetIntGlobal(AbstractConverter &, const pft::Variable &);
bool isOpenMPTargetConstruct(const parser::OpenMPConstruct &);
bool isOpenMPDeviceDeclareTarget(Fortran::lower::AbstractConverter &,
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index 24538398940a3..5b73f09e7e1f1 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -4530,7 +4530,7 @@ genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
- const parser::OpenMPGroupprivate &directive) {
+ const parser::OmpGroupprivateDirective &directive) {
// The omp.groupprivate operation itself is created lazily when the symbol
// is referenced inside a teams region (see groupprivatizeVars). Here we
// only extract the device_type clause (if any) and record it per-symbol so
@@ -4954,14 +4954,40 @@ void Fortran::lower::genOpenMPSymbolProperties(
assert(var.hasSymbol() && "Expecting Symbol");
const semantics::Symbol &sym = var.getSymbol();
+ if (sym.test(semantics::Symbol::Flag::OmpGroupPrivate))
+ lower::genGroupprivateOp(converter, var);
+
if (sym.test(semantics::Symbol::Flag::OmpThreadprivate))
lower::genThreadprivateOp(converter, var);
if (sym.test(semantics::Symbol::Flag::OmpDeclareTarget))
lower::genDeclareTargetIntGlobal(converter, var);
+}
- if (sym.test(semantics::Symbol::Flag::OmpGroupPrivate))
- lower::genGroupprivateOp(converter, var);
+void Fortran::lower::genGroupprivateOp(lower::AbstractConverter &converter,
+ const lower::pft::Variable &var) {
+ const semantics::Symbol &sym = var.getSymbol();
+
+ // For common block members, the groupprivate op is generated for the entire
+ // common block in groupprivatizeVars, not for individual members here.
+ // The common block already has a global, so nothing to do here.
+ if (semantics::FindCommonBlockContaining(sym.GetUltimate()))
+ return;
+
+ // Handle non-global variables: local variables with the SAVE attribute can
+ // appear in a groupprivate directive. Promote them to fir.global so that
+ // omp.groupprivate can reference them by symbol name.
+ if (!var.isGlobal()) {
+ fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
+ mlir::Location currentLocation = converter.getCurrentLocation();
+ auto module = converter.getModuleOp();
+ std::string globalName = converter.mangleName(sym);
+ if (!module.lookupSymbol<fir::GlobalOp>(globalName))
+ globalInitialization(converter, firOpBuilder, sym, var, currentLocation);
+ }
+
+ // The actual omp.groupprivate operation is created by groupprivatizeVars
+ // when entering a teams region.
}
void Fortran::lower::genThreadprivateOp(lower::AbstractConverter &converter,
@@ -5030,32 +5056,6 @@ void Fortran::lower::genThreadprivateOp(lower::AbstractConverter &converter,
converter.bindSymbol(sym, symThreadprivateExv);
}
-void Fortran::lower::genGroupprivateOp(lower::AbstractConverter &converter,
- const lower::pft::Variable &var) {
- const semantics::Symbol &sym = var.getSymbol();
-
- // For common block members, the groupprivate op is generated for the entire
- // common block in groupprivatizeVars, not for individual members here.
- // The common block already has a global, so nothing to do here.
- if (semantics::FindCommonBlockContaining(sym.GetUltimate()))
- return;
-
- // Handle non-global variables: local variables with the SAVE attribute can
- // appear in a groupprivate directive. Promote them to fir.global so that
- // omp.groupprivate can reference them by symbol name.
- if (!var.isGlobal()) {
- fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
- mlir::Location currentLocation = converter.getCurrentLocation();
- auto module = converter.getModuleOp();
- std::string globalName = converter.mangleName(sym);
- if (!module.lookupSymbol<fir::GlobalOp>(globalName))
- globalInitialization(converter, firOpBuilder, sym, var, currentLocation);
- }
-
- // The actual omp.groupprivate operation is created by groupprivatizeVars
- // when entering a teams region.
-}
-
// This function replicates threadprivate's behaviour of generating
// an internal fir.GlobalOp for non-global variables in the main program
// that have the implicit SAVE attribute, to simplifiy LLVM-IR and MLIR
>From 34c6c43062024e814c413c3bd164767705874b69 Mon Sep 17 00:00:00 2001
From: skc7 <Krishna.Sankisa at amd.com>
Date: Thu, 14 May 2026 16:43:41 +0530
Subject: [PATCH 5/5] [flang][OpenMP] Propagate groupprivate device_type via
.mod files
---
flang/include/flang/Lower/AbstractConverter.h | 6 -
flang/include/flang/Lower/OpenMP.h | 8 -
flang/include/flang/Semantics/semantics.h | 21 +++
flang/lib/Lower/Bridge.cpp | 11 --
flang/lib/Lower/OpenMP/OpenMP.cpp | 53 ++++---
flang/lib/Semantics/mod-file.cpp | 48 +++++-
flang/lib/Semantics/resolve-directives.cpp | 33 ++++
flang/lib/Semantics/semantics.cpp | 14 ++
.../Lower/OpenMP/groupprivate-modfile.f90 | 36 +++++
flang/test/Lower/OpenMP/groupprivate.f90 | 142 +++++++++++++-----
10 files changed, 286 insertions(+), 86 deletions(-)
create mode 100644 flang/test/Lower/OpenMP/groupprivate-modfile.f90
diff --git a/flang/include/flang/Lower/AbstractConverter.h b/flang/include/flang/Lower/AbstractConverter.h
index 08b446af8c1b9..dba1ffb541e54 100644
--- a/flang/include/flang/Lower/AbstractConverter.h
+++ b/flang/include/flang/Lower/AbstractConverter.h
@@ -402,12 +402,6 @@ class AbstractConverter {
virtual mlir::StateStack &getStateStack() = 0;
- /// Return the per-converter table recording the device_type clause
- /// associated with each groupprivate symbol. Used to communicate state from
- /// the lowering of a `!$omp groupprivate` directive to the later creation of
- /// `omp.groupprivate` operations inside teams regions.
- virtual OMPGroupprivateDeviceTypeInfo &getOMPGroupprivateDeviceTypeInfo() = 0;
-
private:
/// Options controlling lowering behavior.
const Fortran::lower::LoweringOptions &loweringOptions;
diff --git a/flang/include/flang/Lower/OpenMP.h b/flang/include/flang/Lower/OpenMP.h
index 6d858202d04fa..271fe72032f2b 100644
--- a/flang/include/flang/Lower/OpenMP.h
+++ b/flang/include/flang/Lower/OpenMP.h
@@ -62,14 +62,6 @@ struct OMPDeferredDeclareTargetInfo {
const Fortran::semantics::Symbol &sym;
};
-/// Per-converter table that records the `device_type` modifier associated with
-/// each groupprivate symbol on the `!$omp groupprivate` directive that
-/// declared it. Populated when the directive is lowered and consumed when
-/// `omp.groupprivate` operations are emitted inside teams regions.
-using OMPGroupprivateDeviceTypeInfo =
- llvm::DenseMap<const Fortran::semantics::Symbol *,
- mlir::omp::DeclareTargetDeviceType>;
-
// Generate the OpenMP terminator for Operation at Location.
mlir::Operation *genOpenMPTerminator(fir::FirOpBuilder &, mlir::Operation *,
mlir::Location);
diff --git a/flang/include/flang/Semantics/semantics.h b/flang/include/flang/Semantics/semantics.h
index 0abfd150cefe0..c660e07f81609 100644
--- a/flang/include/flang/Semantics/semantics.h
+++ b/flang/include/flang/Semantics/semantics.h
@@ -20,6 +20,7 @@
#include "flang/Support/Fortran-features.h"
#include "flang/Support/LangOptions.h"
#include <iosfwd>
+#include <optional>
#include <set>
#include <string>
#include <vector>
@@ -56,6 +57,11 @@ class Symbol;
class CommonBlockMap;
using CommonBlockList = std::vector<std::pair<SymbolRef, std::size_t>>;
+// `device_type` modifier values that can appear on `!$omp groupprivate`.
+// Kept as a semantics-layer enum so this header does not depend on MLIR.
+// The lowering layer converts to mlir::omp::DeclareTargetDeviceType.
+enum class OmpGroupprivateDeviceType { Any, Host, Nohost };
+
using ConstructNode = std::variant<const parser::AssociateConstruct *,
const parser::BlockConstruct *, const parser::CaseConstruct *,
const parser::ChangeTeamConstruct *, const parser::CriticalConstruct *,
@@ -336,6 +342,19 @@ class SemanticsContext {
void NoteUsedSymbols(const UnorderedSymbolSet &);
bool IsSymbolUsed(const Symbol &) const;
+ // Record the `device_type` modifier observed on a `!$omp groupprivate`
+ // directive declaring \p symbol. Called during semantic analysis so the
+ // value is available before any OpenMP lowering, removing the dependency on
+ // lowering order between the directive's owning unit and any teams region
+ // that references the symbol.
+ void SetOmpGroupprivateDeviceType(const Symbol &, OmpGroupprivateDeviceType);
+ // Look up the recorded `device_type` modifier for \p symbol. Returns
+ // std::nullopt for symbols not flagged as groupprivate (or flagged before
+ // this mechanism was populated), in which case the caller should default to
+ // OmpGroupprivateDeviceType::Any per the OpenMP spec.
+ std::optional<OmpGroupprivateDeviceType> GetOmpGroupprivateDeviceType(
+ const Symbol &) const;
+
void DumpSymbols(llvm::raw_ostream &);
// Top-level ProgramTrees are owned by the SemanticsContext for persistence.
@@ -396,6 +415,8 @@ class SemanticsContext {
UnorderedSymbolSet isDefined_;
UnorderedSymbolSet isUsed_;
std::list<ProgramTree> programTrees_;
+ std::map<SymbolRef, OmpGroupprivateDeviceType, SymbolAddressCompare>
+ ompGroupprivateDeviceTypes_;
};
class Semantics {
diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp
index d148829a6d78b..01482c1cb90b5 100644
--- a/flang/lib/Lower/Bridge.cpp
+++ b/flang/lib/Lower/Bridge.cpp
@@ -1430,11 +1430,6 @@ class FirConverter : public Fortran::lower::AbstractConverter {
mlir::StateStack &getStateStack() override { return stateStack; }
- Fortran::lower::OMPGroupprivateDeviceTypeInfo &
- getOMPGroupprivateDeviceTypeInfo() override {
- return ompGroupprivateDeviceTypeInfo;
- }
-
/// Add the symbol to the local map and return `true`. If the symbol is
/// already in the map and \p forced is `false`, the map is not updated.
/// Instead the value `false` is returned.
@@ -7021,12 +7016,6 @@ class FirConverter : public Fortran::lower::AbstractConverter {
llvm::SmallVector<Fortran::lower::OMPDeferredDeclareTargetInfo>
ompDeferredDeclareTarget;
- /// Per-converter table recording the `device_type` clause for each symbol
- /// declared in a `!$omp groupprivate` directive. Populated when the
- /// directive is lowered and consumed when `omp.groupprivate` ops are emitted
- /// inside teams regions.
- Fortran::lower::OMPGroupprivateDeviceTypeInfo ompGroupprivateDeviceTypeInfo;
-
const Fortran::lower::ExprToValueMap *exprValueOverrides{nullptr};
/// Stack of derived type under construction to avoid infinite loops when
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index 5b73f09e7e1f1..f423ab57082fb 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -693,7 +693,24 @@ static void threadPrivatizeVars(lower::AbstractConverter &converter,
}
}
+// Translate a semantics-layer groupprivate device_type to the MLIR enum used
+// by omp.groupprivate. Kept here (rather than in semantics) to avoid making
+// the semantics layer depend on MLIR.
+static mlir::omp::DeclareTargetDeviceType
+toMLIRDeclareTargetDeviceType(semantics::OmpGroupprivateDeviceType deviceType) {
+ switch (deviceType) {
+ case semantics::OmpGroupprivateDeviceType::Any:
+ return mlir::omp::DeclareTargetDeviceType::any;
+ case semantics::OmpGroupprivateDeviceType::Host:
+ return mlir::omp::DeclareTargetDeviceType::host;
+ case semantics::OmpGroupprivateDeviceType::Nohost:
+ return mlir::omp::DeclareTargetDeviceType::nohost;
+ }
+ llvm_unreachable("invalid OmpGroupprivateDeviceType");
+}
+
static void groupprivatizeVars(lower::AbstractConverter &converter,
+ semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval) {
fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
mlir::Location currentLocation = converter.getCurrentLocation();
@@ -710,14 +727,16 @@ static void groupprivatizeVars(lower::AbstractConverter &converter,
return mlir::Value();
}
- // Look up the device_type recorded when the !$omp groupprivate directive
- // was lowered. Default to 'any' if no explicit device_type was given.
+ // The device_type modifier was recorded on the symbol during semantic
+ // analysis. Default to 'any' when the directive omitted a device_type
+ // clause (per OpenMP spec) or the symbol was flagged before this
+ // mechanism became available (e.g. a stale module file).
mlir::omp::DeclareTargetDeviceType deviceTypeEnum =
mlir::omp::DeclareTargetDeviceType::any;
- const auto &deviceTypeMap = converter.getOMPGroupprivateDeviceTypeInfo();
- auto it = deviceTypeMap.find(&sym.GetUltimate());
- if (it != deviceTypeMap.end())
- deviceTypeEnum = it->second;
+ if (auto recorded =
+ semaCtx.GetOmpGroupprivateDeviceType(sym.GetUltimate())) {
+ deviceTypeEnum = toMLIRDeclareTargetDeviceType(*recorded);
+ }
mlir::omp::DeclareTargetDeviceTypeAttr deviceTypeAttr =
mlir::omp::DeclareTargetDeviceTypeAttr::get(firOpBuilder.getContext(),
deviceTypeEnum);
@@ -1337,7 +1356,7 @@ static void createBodyOfOp(mlir::Operation &op, const OpWithBodyGenInfo &info,
}
if (info.dir == llvm::omp::Directive::OMPD_teams) {
- groupprivatizeVars(info.converter, info.eval);
+ groupprivatizeVars(info.converter, info.semaCtx, info.eval);
}
if (!info.genSkeletonOnly) {
@@ -4531,21 +4550,11 @@ static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
const parser::OmpGroupprivateDirective &directive) {
- // The omp.groupprivate operation itself is created lazily when the symbol
- // is referenced inside a teams region (see groupprivatizeVars). Here we
- // only extract the device_type clause (if any) and record it per-symbol so
- // that the later op-creation can emit it on omp.groupprivate.
- ObjectList objects = makeObjects(directive.v.Arguments(), semaCtx);
- List<Clause> clauses = makeClauses(directive.v.Clauses(), semaCtx);
- ClauseProcessor cp(converter, semaCtx, clauses);
- mlir::omp::DeviceTypeClauseOps deviceTypeOps;
- cp.processDeviceType(deviceTypeOps);
-
- auto &deviceTypeMap = converter.getOMPGroupprivateDeviceTypeInfo();
- for (const Object &obj : objects) {
- if (const semantics::Symbol *sym = obj.sym())
- deviceTypeMap[&sym->GetUltimate()] = deviceTypeOps.deviceType;
- }
+ // The OmpGroupPrivate symbol flag and any device_type modifier are
+ // recorded during semantic analysis (see OmpAttributeVisitor::Pre on
+ // OmpGroupprivateDirective). The omp.groupprivate operation itself is
+ // materialised on first use inside a teams region by groupprivatizeVars,
+ // so this declarative directive has no remaining lowering work to do.
}
static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
diff --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp
index 974e88caebc9f..ca563b13cee61 100644
--- a/flang/lib/Semantics/mod-file.cpp
+++ b/flang/lib/Semantics/mod-file.cpp
@@ -60,6 +60,8 @@ static void PutShapeSpec(llvm::raw_ostream &, const ShapeSpec &);
static void PutShape(
llvm::raw_ostream &, const ArraySpec &, char open, char close);
static void PutMapper(llvm::raw_ostream &, const Symbol &, SemanticsContext &);
+static void PutOmpGroupprivateDirective(
+ llvm::raw_ostream &, const Symbol &, SemanticsContext &);
static llvm::raw_ostream &PutAttr(llvm::raw_ostream &, Attr);
static llvm::raw_ostream &PutType(llvm::raw_ostream &, const DeclTypeSpec &);
@@ -572,6 +574,10 @@ void ModFileWriter::PutSymbol(
x.isExplicitBindName(), ""s);
decls_ << "::/" << symbol.name() << "/\n";
}
+ // Common-block symbols are processed by this branch (not the
+ // generic catch-all below), so emit any per-symbol OpenMP
+ // directives - e.g. `!$omp groupprivate(/blk/)` - here too.
+ PutOmpGroupprivateDirective(decls_, symbol, context_);
},
[](const HostAssocDetails &) {},
[](const MiscDetails &) {},
@@ -1249,15 +1255,53 @@ void PutOpenACCDirective(llvm::raw_ostream &os, const Symbol &symbol) {
}
}
-void PutOpenMPDirective(llvm::raw_ostream &os, const Symbol &symbol) {
+// Re-emit `!$omp groupprivate` for symbols flagged during the module's own
+// semantic analysis, including the device_type modifier if one was recorded
+// (otherwise omit it so the default `any` semantics apply). This lets a TU
+// that `use`s this module recover the directive's information from the .mod
+// file rather than the original source - mirroring how `requires` is
+// propagated. Handles both ordinary variables and common-block names (which
+// must be wrapped in slashes when reparsed).
+static void PutOmpGroupprivateDirective(
+ llvm::raw_ostream &os, const Symbol &symbol, SemanticsContext &context) {
+ if (!symbol.test(Symbol::Flag::OmpGroupPrivate)) {
+ return;
+ }
+ os << "!$omp groupprivate(";
+ if (symbol.detailsIf<CommonBlockDetails>()) {
+ os << '/' << symbol.name() << '/';
+ } else {
+ os << symbol.name();
+ }
+ os << ")";
+ if (auto deviceType{
+ context.GetOmpGroupprivateDeviceType(symbol.GetUltimate())}) {
+ switch (*deviceType) {
+ case OmpGroupprivateDeviceType::Any:
+ // Default - emit nothing.
+ break;
+ case OmpGroupprivateDeviceType::Host:
+ os << " device_type(host)";
+ break;
+ case OmpGroupprivateDeviceType::Nohost:
+ os << " device_type(nohost)";
+ break;
+ }
+ }
+ os << "\n";
+}
+
+void PutOpenMPDirective(
+ llvm::raw_ostream &os, const Symbol &symbol, SemanticsContext &context) {
if (symbol.test(Symbol::Flag::OmpThreadprivate)) {
os << "!$omp threadprivate(" << symbol.name() << ")\n";
}
+ PutOmpGroupprivateDirective(os, symbol, context);
}
void ModFileWriter::PutDirective(llvm::raw_ostream &os, const Symbol &symbol) {
PutOpenACCDirective(os, symbol);
- PutOpenMPDirective(os, symbol);
+ PutOpenMPDirective(os, symbol, context_);
}
struct Temp {
diff --git a/flang/lib/Semantics/resolve-directives.cpp b/flang/lib/Semantics/resolve-directives.cpp
index 7ae867e19f276..702ca82ebe3f2 100644
--- a/flang/lib/Semantics/resolve-directives.cpp
+++ b/flang/lib/Semantics/resolve-directives.cpp
@@ -2149,6 +2149,39 @@ bool OmpAttributeVisitor::Pre(const parser::OmpGroupprivateDirective &x) {
ResolveOmpObject(*object, Symbol::Flag::OmpGroupPrivate);
}
}
+
+ // OpenMP 6.0 allows an optional device_type clause on the groupprivate
+ // directive. Decode it once here (defaulting to `any` per the spec) so the
+ // value can be attached to every object listed by the directive.
+ OmpGroupprivateDeviceType deviceType{OmpGroupprivateDeviceType::Any};
+ for (const parser::OmpClause &clause : x.v.Clauses().v) {
+ if (const auto *dt{std::get_if<parser::OmpClause::DeviceType>(&clause.u)}) {
+ switch (dt->v.v) {
+ case parser::OmpDeviceTypeClause::DeviceTypeDescription::Any:
+ deviceType = OmpGroupprivateDeviceType::Any;
+ break;
+ case parser::OmpDeviceTypeClause::DeviceTypeDescription::Host:
+ deviceType = OmpGroupprivateDeviceType::Host;
+ break;
+ case parser::OmpDeviceTypeClause::DeviceTypeDescription::Nohost:
+ deviceType = OmpGroupprivateDeviceType::Nohost;
+ break;
+ }
+ break;
+ }
+ }
+
+ // Record device_type against the ultimate symbol of each resolved object so
+ // it is reachable during lowering regardless of the order in which the
+ // owning unit and its referencing teams regions are lowered within this TU.
+ for (const parser::OmpArgument &arg : x.v.Arguments().v) {
+ if (const parser::OmpObject * object{parser::omp::GetArgumentObject(arg)}) {
+ if (const Symbol * sym{omp::GetObjectSymbol(*object)}) {
+ context_.SetOmpGroupprivateDeviceType(sym->GetUltimate(), deviceType);
+ }
+ }
+ }
+
return true;
}
diff --git a/flang/lib/Semantics/semantics.cpp b/flang/lib/Semantics/semantics.cpp
index 8bca853f01a24..ea3204aa02502 100644
--- a/flang/lib/Semantics/semantics.cpp
+++ b/flang/lib/Semantics/semantics.cpp
@@ -440,6 +440,20 @@ void SemanticsContext::CheckError(const Symbol &symbol) {
}
}
+void SemanticsContext::SetOmpGroupprivateDeviceType(
+ const Symbol &symbol, OmpGroupprivateDeviceType deviceType) {
+ ompGroupprivateDeviceTypes_.insert_or_assign(SymbolRef{symbol}, deviceType);
+}
+
+std::optional<OmpGroupprivateDeviceType>
+SemanticsContext::GetOmpGroupprivateDeviceType(const Symbol &symbol) const {
+ auto it{ompGroupprivateDeviceTypes_.find(SymbolRef{symbol})};
+ if (it == ompGroupprivateDeviceTypes_.end()) {
+ return std::nullopt;
+ }
+ return it->second;
+}
+
bool SemanticsContext::ScopeIndexComparator::operator()(
parser::CharBlock x, parser::CharBlock y) const {
return x.begin() < y.begin() ||
diff --git a/flang/test/Lower/OpenMP/groupprivate-modfile.f90 b/flang/test/Lower/OpenMP/groupprivate-modfile.f90
new file mode 100644
index 0000000000000..cc30d7c8ddb46
--- /dev/null
+++ b/flang/test/Lower/OpenMP/groupprivate-modfile.f90
@@ -0,0 +1,36 @@
+! Cross-TU propagation of `groupprivate` and its device_type via .mod files.
+
+! RUN: rm -rf %t && split-file %s %t
+! RUN: %flang_fc1 -emit-hlfir -fopenmp -fopenmp-version=60 -module-dir %t %t/m.f90 -o - > /dev/null
+! RUN: %flang_fc1 -emit-hlfir -fopenmp -fopenmp-version=60 -J %t %t/use.f90 -o - | FileCheck %s
+
+! First RUN builds gp_mod.mod.
+! Second RUN lowers a consumer that only USE-associates the module
+! and checks that the omp.groupprivate op picks up device_type recovered
+! from the .mod file rather than the original source.
+
+!--- m.f90
+module gp_mod
+ implicit none
+ integer, save :: gp_x
+ !$omp groupprivate(gp_x) device_type(host)
+end module gp_mod
+
+!--- use.f90
+program use_gp_mod
+ use gp_mod
+ implicit none
+ !$omp teams
+ gp_x = 42
+ !$omp end teams
+end program use_gp_mod
+
+! CHECK-LABEL: func.func @_QQmain
+! CHECK: fir.address_of(@_QMgp_modEgp_x) : !fir.ref<i32>
+! CHECK: omp.teams {
+! CHECK: %[[GP:.*]] = omp.groupprivate @_QMgp_modEgp_x device_type (host) : !fir.ref<i32>
+! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[GP]] {uniq_name = "_QMgp_modEgp_x"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[C42:.*]] = arith.constant 42 : i32
+! CHECK: hlfir.assign %[[C42]] to %[[DECL]]#0 : i32, !fir.ref<i32>
+! CHECK: omp.terminator
+! CHECK: }
diff --git a/flang/test/Lower/OpenMP/groupprivate.f90 b/flang/test/Lower/OpenMP/groupprivate.f90
index b7bb4407fad30..f84f3f2782a69 100644
--- a/flang/test/Lower/OpenMP/groupprivate.f90
+++ b/flang/test/Lower/OpenMP/groupprivate.f90
@@ -14,9 +14,12 @@ module m
end module
! CHECK-LABEL: func.func @_QPtest_groupprivate
-! CHECK: omp.target
-! CHECK: omp.teams
-! CHECK: %{{.*}} = omp.groupprivate @_QMmEx device_type (any) : !fir.ref<i32>
+! CHECK: omp.target {
+! CHECK: omp.teams {
+! CHECK: %[[GP:.*]] = omp.groupprivate @_QMmEx device_type (any) : !fir.ref<i32>
+! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[GP]] {uniq_name = "_QMmEx"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[C10:.*]] = arith.constant 10 : i32
+! CHECK: hlfir.assign %[[C10]] to %[[DECL]]#0 : i32, !fir.ref<i32>
subroutine test_groupprivate()
use m
@@ -37,11 +40,15 @@ module m2
end module
! CHECK-LABEL: func.func @_QPtest_common_block_groupprivate
-! CHECK: omp.target
-! CHECK: omp.teams
-! CHECK: %{{.*}} = omp.groupprivate @blk_ device_type (any) : !fir.ref<!fir.array<12xi8>>
-! CHECK: fir.coordinate_of
-! CHECK: fir.convert
+! CHECK: omp.target {
+! CHECK: omp.teams {
+! CHECK: %[[GP:.*]] = omp.groupprivate @blk_ device_type (any) : !fir.ref<!fir.array<12xi8>>
+! CHECK: %[[DECL_X:.*]]:2 = hlfir.declare %{{.*}} storage(%[[GP]][0]) {uniq_name = "_QMm2Ecb_x"}
+! CHECK: %[[DECL_Y:.*]]:2 = hlfir.declare %{{.*}} storage(%[[GP]][4]) {uniq_name = "_QMm2Ecb_y"}
+! CHECK: %[[DECL_Z:.*]]:2 = hlfir.declare %{{.*}} storage(%[[GP]][8]) {uniq_name = "_QMm2Ecb_z"}
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_X]]#0 : i32, !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_Y]]#0 : i32, !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_Z]]#0 : f32, !fir.ref<f32>
subroutine test_common_block_groupprivate()
use m2
@@ -56,8 +63,11 @@ subroutine test_common_block_groupprivate()
! Test 3: Local SAVE variable promoted to fir.global by globalInitialization.
! CHECK-LABEL: func.func @_QPtest_local_save_groupprivate
-! CHECK: omp.teams
-! CHECK: %{{.*}} = omp.groupprivate @_QFtest_local_save_groupprivateElocal_x device_type (any) : !fir.ref<i32>
+! CHECK: omp.teams {
+! CHECK: %[[GP:.*]] = omp.groupprivate @_QFtest_local_save_groupprivateElocal_x device_type (any) : !fir.ref<i32>
+! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[GP]] {uniq_name = "_QFtest_local_save_groupprivateElocal_x"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[C42:.*]] = arith.constant 42 : i32
+! CHECK: hlfir.assign %[[C42]] to %[[DECL]]#0 : i32, !fir.ref<i32>
subroutine test_local_save_groupprivate()
integer, save :: local_x
!$omp groupprivate(local_x)
@@ -77,11 +87,17 @@ module m_multi
end module
! CHECK-LABEL: func.func @_QPtest_multiple_groupprivate
-! CHECK: omp.target
-! CHECK: omp.teams
-! CHECK-DAG: omp.groupprivate @_QMm_multiEgp_a
-! CHECK-DAG: omp.groupprivate @_QMm_multiEgp_b
-! CHECK-DAG: omp.groupprivate @_QMm_multiEgp_c
+! CHECK: omp.target {
+! CHECK: omp.teams {
+! CHECK: %[[GP_A:.*]] = omp.groupprivate @_QMm_multiEgp_a device_type (any) : !fir.ref<i32>
+! CHECK: %[[DECL_A:.*]]:2 = hlfir.declare %[[GP_A]] {uniq_name = "_QMm_multiEgp_a"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[GP_B:.*]] = omp.groupprivate @_QMm_multiEgp_b device_type (any) : !fir.ref<i32>
+! CHECK: %[[DECL_B:.*]]:2 = hlfir.declare %[[GP_B]] {uniq_name = "_QMm_multiEgp_b"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[GP_C:.*]] = omp.groupprivate @_QMm_multiEgp_c device_type (any) : !fir.ref<f32>
+! CHECK: %[[DECL_C:.*]]:2 = hlfir.declare %[[GP_C]] {uniq_name = "_QMm_multiEgp_c"} : (!fir.ref<f32>) -> (!fir.ref<f32>, !fir.ref<f32>)
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_A]]#0 : i32, !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_B]]#0 : i32, !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_C]]#0 : f32, !fir.ref<f32>
subroutine test_multiple_groupprivate()
use m_multi
@@ -94,12 +110,19 @@ subroutine test_multiple_groupprivate()
!$omp end target
end subroutine
-! Test 5: Same variable referenced multiple times produces only one op.
+! Test 5: Same variable referenced multiple times produces only one op, and
+! every reference accesses the per-team copy via the same hlfir.declare.
! CHECK-LABEL: func.func @_QPtest_repeated_ref_groupprivate
-! CHECK: omp.teams
-! CHECK: omp.groupprivate @_QMmEx
-! CHECK-NOT: omp.groupprivate @_QMmEx
-! CHECK: omp.terminator
+! CHECK: omp.teams {
+! CHECK: %[[GP:.*]] = omp.groupprivate @_QMmEx device_type (any) : !fir.ref<i32>
+! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[GP]] {uniq_name = "_QMmEx"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK-NOT: omp.groupprivate @_QMmEx
+! CHECK: hlfir.assign %{{.*}} to %[[DECL]]#0 : i32, !fir.ref<i32>
+! CHECK: %{{.*}} = fir.load %[[DECL]]#0 : !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[DECL]]#0 : i32, !fir.ref<i32>
+! CHECK: %{{.*}} = fir.load %[[DECL]]#0 : !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[DECL]]#0 : i32, !fir.ref<i32>
+! CHECK: omp.terminator
subroutine test_repeated_ref_groupprivate()
use m
@@ -114,9 +137,12 @@ subroutine test_repeated_ref_groupprivate()
! Test 6: Standalone teams (no enclosing target) still triggers groupprivate.
! CHECK-LABEL: func.func @_QPtest_standalone_teams_groupprivate
-! CHECK-NOT: omp.target
-! CHECK: omp.teams
-! CHECK: %{{.*}} = omp.groupprivate @_QMmEx device_type (any) : !fir.ref<i32>
+! CHECK-NOT: omp.target
+! CHECK: omp.teams {
+! CHECK: %[[GP:.*]] = omp.groupprivate @_QMmEx device_type (any) : !fir.ref<i32>
+! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[GP]] {uniq_name = "_QMmEx"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[C100:.*]] = arith.constant 100 : i32
+! CHECK: hlfir.assign %[[C100]] to %[[DECL]]#0 : i32, !fir.ref<i32>
subroutine test_standalone_teams_groupprivate()
use m
@@ -125,12 +151,17 @@ subroutine test_standalone_teams_groupprivate()
!$omp end teams
end subroutine
-! Test 7: Groupprivate variable is not added to target's implicit map_entries.
+! Test 7: Groupprivate variable is not added to target's implicit map_entries,
+! and the access inside the teams region goes through the omp.groupprivate
+! result rather than the original host global.
! CHECK-LABEL: func.func @_QPtest_target_skip_map_groupprivate
-! CHECK-NOT: omp.map.info {{.*}}@_QMmEx
-! CHECK: omp.target
-! CHECK: omp.teams
-! CHECK: omp.groupprivate @_QMmEx
+! CHECK-NOT: omp.map.info
+! CHECK: omp.target {
+! CHECK: omp.teams {
+! CHECK: %[[GP:.*]] = omp.groupprivate @_QMmEx device_type (any) : !fir.ref<i32>
+! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[GP]] {uniq_name = "_QMmEx"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[C200:.*]] = arith.constant 200 : i32
+! CHECK: hlfir.assign %[[C200]] to %[[DECL]]#0 : i32, !fir.ref<i32>
subroutine test_target_skip_map_groupprivate()
use m
@@ -150,9 +181,15 @@ module m_types
end module
! CHECK-LABEL: func.func @_QPtest_types_groupprivate
-! CHECK: omp.teams
-! CHECK-DAG: omp.groupprivate @_QMm_typesEgp_r8 device_type (any) : !fir.ref<f64>
-! CHECK-DAG: omp.groupprivate @_QMm_typesEgp_iarr device_type (any) : !fir.ref<!fir.array<4xi32>>
+! CHECK: omp.teams {
+! CHECK: %[[GP_R8:.*]] = omp.groupprivate @_QMm_typesEgp_r8 device_type (any) : !fir.ref<f64>
+! CHECK: %[[DECL_R8:.*]]:2 = hlfir.declare %[[GP_R8]] {uniq_name = "_QMm_typesEgp_r8"} : (!fir.ref<f64>) -> (!fir.ref<f64>, !fir.ref<f64>)
+! CHECK: %[[GP_IARR:.*]] = omp.groupprivate @_QMm_typesEgp_iarr device_type (any) : !fir.ref<!fir.array<4xi32>>
+! CHECK: %[[SHAPE:.*]] = fir.shape %{{.*}} : (index) -> !fir.shape<1>
+! CHECK: %[[DECL_IARR:.*]]:2 = hlfir.declare %[[GP_IARR]](%[[SHAPE]]) {uniq_name = "_QMm_typesEgp_iarr"}
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_R8]]#0 : f64, !fir.ref<f64>
+! CHECK: %[[ELT:.*]] = hlfir.designate %[[DECL_IARR]]#0 (%{{.*}}) : (!fir.ref<!fir.array<4xi32>>, index) -> !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[ELT]] : i32, !fir.ref<i32>
subroutine test_types_groupprivate()
use m_types
@@ -173,9 +210,13 @@ module m_blocks
end module
! CHECK-LABEL: func.func @_QPtest_multi_common_groupprivate
-! CHECK: omp.teams
-! CHECK-DAG: omp.groupprivate @blka_ device_type (any)
-! CHECK-DAG: omp.groupprivate @blkb_ device_type (any)
+! CHECK: omp.teams {
+! CHECK: %[[GP_A:.*]] = omp.groupprivate @blka_ device_type (any) : !fir.ref<!fir.array<8xi8>>
+! CHECK: %[[DECL_A1:.*]]:2 = hlfir.declare %{{.*}} storage(%[[GP_A]][0]) {uniq_name = "_QMm_blocksEa1"}
+! CHECK: %[[GP_B:.*]] = omp.groupprivate @blkb_ device_type (any) : !fir.ref<!fir.array<8xi8>>
+! CHECK: %[[DECL_B1:.*]]:2 = hlfir.declare %{{.*}} storage(%[[GP_B]][0]) {uniq_name = "_QMm_blocksEb1"}
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_A1]]#0 : i32, !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_B1]]#0 : i32, !fir.ref<i32>
subroutine test_multi_common_groupprivate()
use m_blocks
@@ -195,9 +236,13 @@ module m_dt
end module
! CHECK-LABEL: func.func @_QPtest_device_type_groupprivate
-! CHECK: omp.teams
-! CHECK-DAG: omp.groupprivate @_QMm_dtEgp_h device_type (host) : !fir.ref<i32>
-! CHECK-DAG: omp.groupprivate @_QMm_dtEgp_nh device_type (nohost) : !fir.ref<i32>
+! CHECK: omp.teams {
+! CHECK: %[[GP_H:.*]] = omp.groupprivate @_QMm_dtEgp_h device_type (host) : !fir.ref<i32>
+! CHECK: %[[DECL_H:.*]]:2 = hlfir.declare %[[GP_H]] {uniq_name = "_QMm_dtEgp_h"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[GP_NH:.*]] = omp.groupprivate @_QMm_dtEgp_nh device_type (nohost) : !fir.ref<i32>
+! CHECK: %[[DECL_NH:.*]]:2 = hlfir.declare %[[GP_NH]] {uniq_name = "_QMm_dtEgp_nh"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_H]]#0 : i32, !fir.ref<i32>
+! CHECK: hlfir.assign %{{.*}} to %[[DECL_NH]]#0 : i32, !fir.ref<i32>
subroutine test_device_type_groupprivate()
use m_dt
@@ -206,3 +251,26 @@ subroutine test_device_type_groupprivate()
gp_nh = 2
!$omp end teams
end subroutine
+
+! Test 11: The module owning the !$omp groupprivate directive
+! is declared AFTER a subroutine that already
+! references the variable inside a teams region.
+! CHECK-LABEL: func.func @_QPtest_module_after_subroutine_groupprivate
+! CHECK: omp.teams {
+! CHECK: %[[GP:.*]] = omp.groupprivate @_QMm_lateEgp_late device_type (host) : !fir.ref<i32>
+! CHECK: %[[DECL:.*]]:2 = hlfir.declare %[[GP]] {uniq_name = "_QMm_lateEgp_late"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[C7:.*]] = arith.constant 7 : i32
+! CHECK: hlfir.assign %[[C7]] to %[[DECL]]#0 : i32, !fir.ref<i32>
+subroutine test_module_after_subroutine_groupprivate()
+ use m_late
+
+ !$omp teams
+ gp_late = 7
+ !$omp end teams
+end subroutine
+
+module m_late
+ implicit none
+ integer, save :: gp_late
+ !$omp groupprivate(gp_late) device_type(host)
+end module
More information about the flang-commits
mailing list