Skip to content

Commit debf818

Browse files
tblahtru
tblah
authored and
tru
committed
[flang][OpenMP] Initialize privatised derived type variables (#100417)
Fixes #91928 (cherry picked from commit 98e733e)
1 parent 511b8b0 commit debf818

File tree

4 files changed

+73
-11
lines changed

4 files changed

+73
-11
lines changed

‎flang/include/flang/Lower/ConvertVariable.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ using AggregateStoreMap = llvm::DenseMap<AggregateStoreKey, mlir::Value>;
6262
void instantiateVariable(AbstractConverter &, const pft::Variable &var,
6363
SymMap &symMap, AggregateStoreMap &storeMap);
6464

65+
/// Does this variable have a default initialization?
66+
bool hasDefaultInitialization(const Fortran::semantics::Symbol &sym);
67+
68+
/// Call default initialization runtime routine to initialize \p var.
69+
void defaultInitializeAtRuntime(Fortran::lower::AbstractConverter &converter,
70+
const Fortran::semantics::Symbol &sym,
71+
Fortran::lower::SymMap &symMap);
72+
6573
/// Create a fir::GlobalOp given a module variable definition. This is intended
6674
/// to be used when lowering a module definition, not when lowering variables
6775
/// used from a module. For used variables instantiateVariable must directly be

‎flang/lib/Lower/ConvertVariable.cpp‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ static mlir::Value genScalarValue(Fortran::lower::AbstractConverter &converter,
7272
}
7373

7474
/// Does this variable have a default initialization?
75-
static bool hasDefaultInitialization(const Fortran::semantics::Symbol &sym) {
75+
bool Fortran::lower::hasDefaultInitialization(
76+
const Fortran::semantics::Symbol &sym) {
7677
if (sym.has<Fortran::semantics::ObjectEntityDetails>() && sym.size())
7778
if (!Fortran::semantics::IsAllocatableOrPointer(sym))
7879
if (const Fortran::semantics::DeclTypeSpec *declTypeSpec = sym.GetType())
@@ -353,7 +354,7 @@ static mlir::Value genComponentDefaultInit(
353354
// global constructor since this has no runtime cost.
354355
componentValue = fir::factory::createUnallocatedBox(
355356
builder, loc, componentTy, std::nullopt);
356-
} else if (hasDefaultInitialization(component)) {
357+
} else if (Fortran::lower::hasDefaultInitialization(component)) {
357358
// Component type has default initialization.
358359
componentValue = genDefaultInitializerValue(converter, loc, component,
359360
componentTy, stmtCtx);
@@ -556,7 +557,7 @@ static fir::GlobalOp defineGlobal(Fortran::lower::AbstractConverter &converter,
556557
builder.createConvert(loc, symTy, fir::getBase(initVal));
557558
builder.create<fir::HasValueOp>(loc, castTo);
558559
});
559-
} else if (hasDefaultInitialization(sym)) {
560+
} else if (Fortran::lower::hasDefaultInitialization(sym)) {
560561
Fortran::lower::createGlobalInitialization(
561562
builder, global, [&](fir::FirOpBuilder &builder) {
562563
Fortran::lower::StatementContext stmtCtx(
@@ -752,17 +753,15 @@ mustBeDefaultInitializedAtRuntime(const Fortran::lower::pft::Variable &var) {
752753
return true;
753754
// Local variables (including function results), and intent(out) dummies must
754755
// be default initialized at runtime if their type has default initialization.
755-
return hasDefaultInitialization(sym);
756+
return Fortran::lower::hasDefaultInitialization(sym);
756757
}
757758

758759
/// Call default initialization runtime routine to initialize \p var.
759-
static void
760-
defaultInitializeAtRuntime(Fortran::lower::AbstractConverter &converter,
761-
const Fortran::lower::pft::Variable &var,
762-
Fortran::lower::SymMap &symMap) {
760+
void Fortran::lower::defaultInitializeAtRuntime(
761+
Fortran::lower::AbstractConverter &converter,
762+
const Fortran::semantics::Symbol &sym, Fortran::lower::SymMap &symMap) {
763763
fir::FirOpBuilder &builder = converter.getFirOpBuilder();
764764
mlir::Location loc = converter.getCurrentLocation();
765-
const Fortran::semantics::Symbol &sym = var.getSymbol();
766765
fir::ExtendedValue exv = converter.getSymbolExtendedValue(sym, &symMap);
767766
if (Fortran::semantics::IsOptional(sym)) {
768767
// 15.5.2.12 point 3, absent optional dummies are not initialized.
@@ -927,7 +926,8 @@ static void instantiateLocal(Fortran::lower::AbstractConverter &converter,
927926
if (needDummyIntentoutFinalization(var))
928927
finalizeAtRuntime(converter, var, symMap);
929928
if (mustBeDefaultInitializedAtRuntime(var))
930-
defaultInitializeAtRuntime(converter, var, symMap);
929+
Fortran::lower::defaultInitializeAtRuntime(converter, var.getSymbol(),
930+
symMap);
931931
if (Fortran::semantics::NeedCUDAAlloc(var.getSymbol())) {
932932
auto *builder = &converter.getFirOpBuilder();
933933
mlir::Location loc = converter.getCurrentLocation();
@@ -1168,7 +1168,8 @@ static void instantiateAlias(Fortran::lower::AbstractConverter &converter,
11681168
// do not try optimizing this to single default initializations of
11691169
// the equivalenced storages. Keep lowering simple.
11701170
if (mustBeDefaultInitializedAtRuntime(var))
1171-
defaultInitializeAtRuntime(converter, var, symMap);
1171+
Fortran::lower::defaultInitializeAtRuntime(converter, var.getSymbol(),
1172+
symMap);
11721173
}
11731174

11741175
//===--------------------------------------------------------------===//

‎flang/lib/Lower/OpenMP/DataSharingProcessor.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "DataSharingProcessor.h"
1414

1515
#include "Utils.h"
16+
#include "flang/Lower/ConvertVariable.h"
1617
#include "flang/Lower/PFTBuilder.h"
1718
#include "flang/Lower/SymbolMap.h"
1819
#include "flang/Optimizer/Builder/HLFIRTools.h"
@@ -117,6 +118,11 @@ void DataSharingProcessor::cloneSymbol(const semantics::Symbol *sym) {
117118
bool success = converter.createHostAssociateVarClone(*sym);
118119
(void)success;
119120
assert(success && "Privatization failed due to existing binding");
121+
122+
bool isFirstPrivate = sym->test(semantics::Symbol::Flag::OmpFirstPrivate);
123+
if (!isFirstPrivate &&
124+
Fortran::lower::hasDefaultInitialization(sym->GetUltimate()))
125+
Fortran::lower::defaultInitializeAtRuntime(converter, *sym, *symTable);
120126
}
121127

122128
void DataSharingProcessor::copyFirstPrivateSymbol(

‎flang/test/Lower/OpenMP/private-derived-type.f90‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -o - %s | FileCheck %s
2+
! RUN: bbc -emit-hlfir -fopenmp -o - %s | FileCheck %s
3+
4+
subroutine s4
5+
type y3
6+
integer,allocatable::x
7+
end type y3
8+
type(y3)::v
9+
!$omp parallel
10+
!$omp do private(v)
11+
do i=1,10
12+
v%x=1
13+
end do
14+
!$omp end do
15+
!$omp end parallel
16+
end subroutine s4
17+
18+
19+
! CHECK-LABEL: func.func @_QPs4() {
20+
! Example of how the lowering for regular derived type variables:
21+
! CHECK: %[[VAL_8:.*]] = fir.alloca !fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}> {bindc_name = "v", uniq_name = "_QFs4Ev"}
22+
! CHECK: %[[VAL_9:.*]]:2 = hlfir.declare %[[VAL_8]] {uniq_name = "_QFs4Ev"} : (!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> (!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>, !fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>)
23+
! CHECK: %[[VAL_10:.*]] = fir.embox %[[VAL_9]]#1 : (!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
24+
! CHECK: %[[VAL_11:.*]] = fir.address_of
25+
! CHECK: %[[VAL_12:.*]] = arith.constant 4 : i32
26+
! CHECK: %[[VAL_13:.*]] = fir.convert %[[VAL_10]] : (!fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<none>
27+
! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_11]] : (!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
28+
! CHECK: %[[VAL_15:.*]] = fir.call @_FortranAInitialize(%[[VAL_13]], %[[VAL_14]], %[[VAL_12]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> none
29+
! CHECK: omp.parallel {
30+
! CHECK: %[[VAL_23:.*]] = fir.alloca !fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}> {bindc_name = "v", pinned, uniq_name = "_QFs4Ev"}
31+
! CHECK: %[[VAL_24:.*]]:2 = hlfir.declare %[[VAL_23]] {uniq_name = "_QFs4Ev"} : (!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> (!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>, !fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>)
32+
! CHECK: %[[VAL_25:.*]] = fir.embox %[[VAL_24]]#1 : (!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
33+
! CHECK: %[[VAL_26:.*]] = fir.address_of
34+
! CHECK: %[[VAL_27:.*]] = arith.constant 4 : i32
35+
! CHECK: %[[VAL_28:.*]] = fir.convert %[[VAL_25]] : (!fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<none>
36+
! CHECK: %[[VAL_29:.*]] = fir.convert %[[VAL_26]] : (!fir.ref<!fir.char<1,{{.*}}>>) -> !fir.ref<i8>
37+
! Check we do call FortranAInitialize on the derived type
38+
! CHECK: %[[VAL_30:.*]] = fir.call @_FortranAInitialize(%[[VAL_28]], %[[VAL_29]], %[[VAL_27]]) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32) -> none
39+
! CHECK: omp.wsloop {
40+
! CHECK: omp.terminator
41+
! CHECK: }
42+
! CHECK: %[[VAL_39:.*]] = fir.embox %[[VAL_9]]#1 : (!fir.ref<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>
43+
! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_39]] : (!fir.box<!fir.type<_QFs4Ty3{x:!fir.box<!fir.heap<i32>>}>>) -> !fir.box<none>
44+
! Check the derived type is destroyed
45+
! CHECK: %[[VAL_41:.*]] = fir.call @_FortranADestroy(%[[VAL_40]]) fastmath<contract> : (!fir.box<none>) -> none
46+
! CHECK: return
47+
! CHECK: }

0 commit comments

Comments
 (0)