Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Flang][OpenMP] Simplify privatization #150

Merged
merged 1 commit into from
Aug 29, 2024
Merged

[Flang][OpenMP] Simplify privatization #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions flang/lib/Lower/OpenMP/DataSharingProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,26 @@ void DataSharingProcessor::processStep1() {
collectPreDeterminedSymbols();
}

void DataSharingProcessor::processStep2() {
void DataSharingProcessor::processStep2(
mlir::omp::PrivateClauseOps *clauseOps) {
if (privatizationDone)
return;

privatize();
privatize(clauseOps);
insertBarrier();
privatizationDone = true;
}

void DataSharingProcessor::processStep3(mlir::Operation *op, bool isLoop) {
// 'sections' lastprivate is handled by genOMP()
// 'sections' lastprivate is handled by genOMP()
if (!mlir::isa<mlir::omp::SectionsOp>(op)) {
insPt = firOpBuilder.saveInsertionPoint();
copyLastPrivatize(op);
firOpBuilder.restoreInsertionPoint(insPt);
}

if (isLoop) {
// push deallocs out of the loop
// push deallocs out of the loop
firOpBuilder.setInsertionPointAfter(op);
insertDeallocs();
} else {
Expand Down Expand Up @@ -479,14 +480,14 @@ void DataSharingProcessor::collectPreDeterminedSymbols() {
preDeterminedSymbols);
}

void DataSharingProcessor::privatize() {
void DataSharingProcessor::privatize(mlir::omp::PrivateClauseOps *clauseOps) {
for (const semantics::Symbol *sym : allPrivatizedSymbols) {
if (const auto *commonDet =
sym->detailsIf<semantics::CommonBlockDetails>()) {
for (const auto &mem : commonDet->objects())
doPrivatize(&*mem);
doPrivatize(&*mem, clauseOps);
} else {
doPrivatize(sym);
doPrivatize(sym, clauseOps);
}
}
}
Expand All @@ -504,7 +505,8 @@ void DataSharingProcessor::copyLastPrivatize(mlir::Operation *op) {
}
}

void DataSharingProcessor::doPrivatize(const semantics::Symbol *sym) {
void DataSharingProcessor::doPrivatize(const semantics::Symbol *sym,
mlir::omp::PrivateClauseOps *clauseOps) {
if (!useDelayedPrivatization) {
cloneSymbol(sym);
copyFirstPrivateSymbol(sym);
Expand Down Expand Up @@ -615,11 +617,10 @@ void DataSharingProcessor::doPrivatize(const semantics::Symbol *sym) {
return result;
}();

privateClauseOps.privateSyms.push_back(
mlir::SymbolRefAttr::get(privatizerOp));
privateClauseOps.privateVars.push_back(hsb.getAddr());
delayedPrivSyms.push_back(sym);

if (clauseOps) {
clauseOps->privateSyms.push_back(mlir::SymbolRefAttr::get(privatizerOp));
clauseOps->privateVars.push_back(hsb.getAddr());
}
symToPrivatizer[sym] = privatizerOp;
}

Expand Down
19 changes: 7 additions & 12 deletions flang/lib/Lower/OpenMP/DataSharingProcessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ class DataSharingProcessor {
lower::SymMap *symTable;

OMPConstructSymbolVisitor visitor;
mlir::omp::PrivateClauseOps privateClauseOps;
llvm::SmallVector<const semantics::Symbol *> delayedPrivSyms;
bool privatizationDone = false;

bool needBarrier();
Expand All @@ -109,10 +107,9 @@ class DataSharingProcessor {
void collectDefaultSymbols();
void collectImplicitSymbols();
void collectPreDeterminedSymbols();
void privatize();
void defaultPrivatize();
void implicitPrivatize();
void doPrivatize(const semantics::Symbol *sym);
void privatize(mlir::omp::PrivateClauseOps *clauseOps);
void doPrivatize(const semantics::Symbol *sym,
mlir::omp::PrivateClauseOps *clauseOps);
void copyLastPrivatize(mlir::Operation *op);
void insertLastPrivateCompare(mlir::Operation *op);
void cloneSymbol(const semantics::Symbol *sym);
Expand Down Expand Up @@ -157,7 +154,7 @@ class DataSharingProcessor {
// before the operation is created since the bounds of the MLIR OpenMP
// operation can be privatised.
void processStep1();
void processStep2();
void processStep2(mlir::omp::PrivateClauseOps *clauseOps = nullptr);
void processStep3(mlir::Operation *op, bool isLoop);

void pushLoopIV(mlir::Value iv) { loopIVs.push_back(iv); }
Expand All @@ -167,12 +164,10 @@ class DataSharingProcessor {
return allPrivatizedSymbols;
}

const mlir::omp::PrivateClauseOps &getPrivateClauseOps() const {
return privateClauseOps;
}

llvm::ArrayRef<const semantics::Symbol *> getDelayedPrivSyms() const {
return delayedPrivSyms;
return useDelayedPrivatization
? allPrivatizedSymbols.getArrayRef()
: llvm::ArrayRef<const semantics::Symbol *>();
}
};

Expand Down
26 changes: 5 additions & 21 deletions flang/lib/Lower/OpenMP/OpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,11 +1946,7 @@ genParallelOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
lower::omp::isLastItemInQueue(item, queue),
/*useDelayedPrivatization=*/true, &symTable);
dsp.processStep1();
dsp.processStep2();

const auto &privateClauseOps = dsp.getPrivateClauseOps();
clauseOps.privateVars = privateClauseOps.privateVars;
clauseOps.privateSyms = privateClauseOps.privateSyms;
dsp.processStep2(&clauseOps);

auto genRegionEntryCB = [&](mlir::Operation *op) {
auto parallelOp = llvm::cast<mlir::omp::ParallelOp>(op);
Expand Down Expand Up @@ -2026,12 +2022,6 @@ static mlir::omp::ParallelOp genParallelCompositeOp(
DataSharingProcessor &dsp) {
fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();

if (enableDelayedPrivatization) {
const auto &privateClauseOps = dsp.getPrivateClauseOps();
clauseOps.privateVars = privateClauseOps.privateVars;
clauseOps.privateSyms = privateClauseOps.privateSyms;
}

// Create omp.parallel operation.
auto parallelOp = firOpBuilder.create<mlir::omp::ParallelOp>(loc, clauseOps);
parallelOp.setComposite(/*val=*/true);
Expand Down Expand Up @@ -2268,14 +2258,8 @@ genTargetOp(lower::AbstractConverter &converter, lower::SymMap &symTable,
lower::omp::isLastItemInQueue(item, queue),
enableDelayedPrivatizationStaging, &symTable);
dsp.processStep1();

if (enableDelayedPrivatizationStaging) {
dsp.processStep2();

const auto &privateClauseOps = dsp.getPrivateClauseOps();
clauseOps.privateVars = privateClauseOps.privateVars;
clauseOps.privateSyms = privateClauseOps.privateSyms;
}
if (enableDelayedPrivatizationStaging)
dsp.processStep2(&clauseOps);

// 5.8.1 Implicit Data-Mapping Attribute Rules
// The following code follows the implicit data-mapping rules to map all the
Expand Down Expand Up @@ -2711,7 +2695,7 @@ static void genCompositeDistributeParallelDo(
/*shouldCollectPreDeterminedSymbols=*/true,
/*useDelayedPrivatization=*/true, &symTable);
dsp.processStep1();
dsp.processStep2();
dsp.processStep2(enableDelayedPrivatization ? &parallelClauseOps : nullptr);

genParallelCompositeOp(converter, semaCtx, parallelItem->clauses, eval, loc,
parallelClauseOps, numThreadsClauseOps,
Expand Down Expand Up @@ -2791,7 +2775,7 @@ static void genCompositeDistributeParallelDoSimd(
/*shouldCollectPreDeterminedSymbols=*/true,
/*useDelayedPrivatization=*/true, &symTable);
dsp.processStep1();
dsp.processStep2();
dsp.processStep2(enableDelayedPrivatization ? &parallelClauseOps : nullptr);

genParallelCompositeOp(converter, semaCtx, parallelItem->clauses, eval, loc,
parallelClauseOps, numThreadsClauseOps,
Expand Down