-
Notifications
You must be signed in to change notification settings - Fork 14.5k
[mlir][flang][openmp] Rework parallel reduction operations #79308
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -621,10 +621,12 @@ class ClauseProcessor { | |
llvm::SmallVectorImpl<mlir::Location> *mapSymLocs = nullptr, | ||
llvm::SmallVectorImpl<const Fortran::semantics::Symbol *> | ||
*mapSymbols = nullptr) const; | ||
bool processReduction( | ||
mlir::Location currentLocation, | ||
llvm::SmallVectorImpl<mlir::Value> &reductionVars, | ||
llvm::SmallVectorImpl<mlir::Attribute> &reductionDeclSymbols) const; | ||
bool | ||
processReduction(mlir::Location currentLocation, | ||
llvm::SmallVectorImpl<mlir::Value> &reductionVars, | ||
llvm::SmallVectorImpl<mlir::Attribute> &reductionDeclSymbols, | ||
llvm::SmallVectorImpl<const Fortran::semantics::Symbol *> | ||
*reductionSymbols = nullptr) const; | ||
bool processSectionsReduction(mlir::Location currentLocation) const; | ||
bool processTo(llvm::SmallVectorImpl<DeclareTargetCapturePair> &result) const; | ||
bool | ||
|
@@ -1079,12 +1081,14 @@ class ReductionProcessor { | |
|
||
/// Creates a reduction declaration and associates it with an OpenMP block | ||
/// directive. | ||
static void addReductionDecl( | ||
mlir::Location currentLocation, | ||
Fortran::lower::AbstractConverter &converter, | ||
const Fortran::parser::OmpReductionClause &reduction, | ||
llvm::SmallVectorImpl<mlir::Value> &reductionVars, | ||
llvm::SmallVectorImpl<mlir::Attribute> &reductionDeclSymbols) { | ||
static void | ||
addReductionDecl(mlir::Location currentLocation, | ||
Fortran::lower::AbstractConverter &converter, | ||
const Fortran::parser::OmpReductionClause &reduction, | ||
llvm::SmallVectorImpl<mlir::Value> &reductionVars, | ||
llvm::SmallVectorImpl<mlir::Attribute> &reductionDeclSymbols, | ||
llvm::SmallVectorImpl<const Fortran::semantics::Symbol *> | ||
*reductionSymbols = nullptr) { | ||
fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder(); | ||
mlir::omp::ReductionDeclareOp decl; | ||
const auto &redOperator{ | ||
|
@@ -1114,6 +1118,8 @@ class ReductionProcessor { | |
if (const auto *name{ | ||
Fortran::parser::Unwrap<Fortran::parser::Name>(ompObject)}) { | ||
if (const Fortran::semantics::Symbol * symbol{name->symbol}) { | ||
if (reductionSymbols) | ||
reductionSymbols->push_back(symbol); | ||
mlir::Value symVal = converter.getSymbolAddress(*symbol); | ||
if (auto declOp = symVal.getDefiningOp<hlfir::DeclareOp>()) | ||
symVal = declOp.getBase(); | ||
|
@@ -1148,6 +1154,8 @@ class ReductionProcessor { | |
if (const auto *name{ | ||
Fortran::parser::Unwrap<Fortran::parser::Name>(ompObject)}) { | ||
if (const Fortran::semantics::Symbol * symbol{name->symbol}) { | ||
if (reductionSymbols) | ||
reductionSymbols->push_back(symbol); | ||
mlir::Value symVal = converter.getSymbolAddress(*symbol); | ||
if (auto declOp = symVal.getDefiningOp<hlfir::DeclareOp>()) | ||
symVal = declOp.getBase(); | ||
|
@@ -1948,13 +1956,16 @@ bool ClauseProcessor::processMap( | |
bool ClauseProcessor::processReduction( | ||
mlir::Location currentLocation, | ||
llvm::SmallVectorImpl<mlir::Value> &reductionVars, | ||
llvm::SmallVectorImpl<mlir::Attribute> &reductionDeclSymbols) const { | ||
llvm::SmallVectorImpl<mlir::Attribute> &reductionDeclSymbols, | ||
llvm::SmallVectorImpl<const Fortran::semantics::Symbol *> *reductionSymbols) | ||
const { | ||
return findRepeatableClause<ClauseTy::Reduction>( | ||
[&](const ClauseTy::Reduction *reductionClause, | ||
const Fortran::parser::CharBlock &) { | ||
ReductionProcessor rp; | ||
rp.addReductionDecl(currentLocation, converter, reductionClause->v, | ||
reductionVars, reductionDeclSymbols); | ||
reductionVars, reductionDeclSymbols, | ||
reductionSymbols); | ||
}); | ||
} | ||
|
||
|
@@ -2304,6 +2315,14 @@ struct OpWithBodyGenInfo { | |
return *this; | ||
} | ||
|
||
OpWithBodyGenInfo & | ||
setReductions(llvm::SmallVector<const Fortran::semantics::Symbol *> *value1, | ||
llvm::SmallVector<mlir::Type> *value2) { | ||
reductionSymbols = value1; | ||
reductionTypes = value2; | ||
return *this; | ||
} | ||
|
||
OpWithBodyGenInfo &setGenRegionEntryCb(GenOMPRegionEntryCBFn value) { | ||
genRegionEntryCB = value; | ||
return *this; | ||
|
@@ -2323,6 +2342,11 @@ struct OpWithBodyGenInfo { | |
const Fortran::parser::OmpClauseList *clauses = nullptr; | ||
/// [in] if provided, processes the construct's data-sharing attributes. | ||
DataSharingProcessor *dsp = nullptr; | ||
/// [in] if provided, list of reduction symbols | ||
llvm::SmallVector<const Fortran::semantics::Symbol *> *reductionSymbols = | ||
nullptr; | ||
/// [in] if provided, list of reduction types | ||
llvm::SmallVector<mlir::Type> *reductionTypes = nullptr; | ||
/// [in] if provided, emits the op's region entry. Otherwise, an emtpy block | ||
/// is created in the region. | ||
GenOMPRegionEntryCBFn genRegionEntryCB = nullptr; | ||
|
@@ -2567,6 +2591,7 @@ genParallelOp(Fortran::lower::AbstractConverter &converter, | |
llvm::SmallVector<mlir::Value> allocateOperands, allocatorOperands, | ||
reductionVars; | ||
llvm::SmallVector<mlir::Attribute> reductionDeclSymbols; | ||
llvm::SmallVector<const Fortran::semantics::Symbol *> reductionSymbols; | ||
|
||
ClauseProcessor cp(converter, clauseList); | ||
cp.processIf(Fortran::parser::OmpIfClause::DirectiveNameModifier::Parallel, | ||
|
@@ -2576,13 +2601,33 @@ genParallelOp(Fortran::lower::AbstractConverter &converter, | |
cp.processDefault(); | ||
cp.processAllocate(allocatorOperands, allocateOperands); | ||
if (!outerCombined) | ||
cp.processReduction(currentLocation, reductionVars, reductionDeclSymbols); | ||
cp.processReduction(currentLocation, reductionVars, reductionDeclSymbols, | ||
&reductionSymbols); | ||
|
||
llvm::SmallVector<mlir::Type> reductionTypes; | ||
reductionTypes.reserve(reductionVars.size()); | ||
llvm::transform(reductionVars, std::back_inserter(reductionTypes), | ||
[](mlir::Value v) { return v.getType(); }); | ||
|
||
auto reductionCallback = [&](mlir::Operation *op) { | ||
llvm::SmallVector<mlir::Location> locs(reductionVars.size(), | ||
currentLocation); | ||
auto block = converter.getFirOpBuilder().createBlock(&op->getRegion(0), {}, | ||
reductionTypes, locs); | ||
for (auto [arg, prv] : | ||
llvm::zip_equal(reductionSymbols, block->getArguments())) { | ||
converter.bindSymbol(*arg, prv); | ||
} | ||
return reductionSymbols; | ||
}; | ||
|
||
return genOpWithBody<mlir::omp::ParallelOp>( | ||
OpWithBodyGenInfo(converter, currentLocation, eval) | ||
.setGenNested(genNested) | ||
.setOuterCombined(outerCombined) | ||
.setClauses(&clauseList), | ||
.setClauses(&clauseList) | ||
.setReductions(&reductionSymbols, &reductionTypes) | ||
.setGenRegionEntryCb(reductionCallback), | ||
/*resultTypes=*/mlir::TypeRange(), ifClauseOperand, | ||
numThreadsClauseOperand, allocateOperands, allocatorOperands, | ||
reductionVars, | ||
|
@@ -3634,10 +3679,8 @@ genOMP(Fortran::lower::AbstractConverter &converter, | |
break; | ||
} | ||
|
||
if (singleDirective) { | ||
genOpenMPReduction(converter, beginClauseList); | ||
if (singleDirective) | ||
return; | ||
} | ||
|
||
// Codegen for combined directives | ||
bool combinedDirective = false; | ||
|
@@ -3673,7 +3716,6 @@ genOMP(Fortran::lower::AbstractConverter &converter, | |
")"); | ||
|
||
genNestedEvaluations(converter, eval); | ||
genOpenMPReduction(converter, beginClauseList); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is |
||
} | ||
|
||
static void | ||
|
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
! RUN: bbc -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s | ||
! RUN: %flang_fc1 -emit-hlfir -fopenmp -o - %s 2>&1 | FileCheck %s | ||
|
||
!CHECK: omp.reduction.declare @[[REDUCTION_DECLARE:[_a-z0-9]+]] : i32 init { | ||
!CHECK: ^bb0(%{{.*}}: i32): | ||
!CHECK: %[[I0:[_a-z0-9]+]] = arith.constant 0 : i32 | ||
!CHECK: omp.yield(%[[I0]] : i32) | ||
!CHECK: } combiner { | ||
!CHECK: ^bb0(%[[C0:[_a-z0-9]+]]: i32, %[[C1:[_a-z0-9]+]]: i32): | ||
!CHECK: %[[CR:[_a-z0-9]+]] = arith.addi %[[C0]], %[[C1]] : i32 | ||
!CHECK: omp.yield(%[[CR]] : i32) | ||
!CHECK: } | ||
!CHECK: func.func @_QQmain() attributes {fir.bindc_name = "mn"} { | ||
!CHECK: %[[RED_ACCUM_REF:[_a-z0-9]+]] = fir.alloca i32 {bindc_name = "i", uniq_name = "_QFEi"} | ||
!CHECK: %[[RED_ACCUM_DECL:[_a-z0-9]+]]:2 = hlfir.declare %[[RED_ACCUM_REF]] {uniq_name = "_QFEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>) | ||
!CHECK: %[[C0:[_a-z0-9]+]] = arith.constant 0 : i32 | ||
!CHECK: hlfir.assign %[[C0]] to %[[RED_ACCUM_DECL]]#0 : i32, !fir.ref<i32> | ||
!CHECK: omp.parallel reduction(@[[REDUCTION_DECLARE]] %[[RED_ACCUM_DECL]]#0 -> %[[PRIVATE_RED:[a-z0-9]+]] : !fir.ref<i32>) { | ||
!CHECK: %[[PRIVATE_DECL:[_a-z0-9]+]]:2 = hlfir.declare %[[PRIVATE_RED]] {uniq_name = "_QFEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>) | ||
!CHECK: %[[C1:[_a-z0-9]+]] = arith.constant 1 : i32 | ||
!CHECK: hlfir.assign %[[C1]] to %[[PRIVATE_DECL]]#0 : i32, !fir.ref<i32> | ||
!CHECK: omp.terminator | ||
!CHECK: } | ||
!CHECK: %[[RED_ACCUM_VAL:[_a-z0-9]+]] = fir.load %[[RED_ACCUM_DECL]]#0 : !fir.ref<i32> | ||
!CHECK: {{.*}} = fir.call @_FortranAioOutputInteger32(%{{.*}}, %[[RED_ACCUM_VAL]]) fastmath<contract> : (!fir.ref<i8>, i32) -> i1 | ||
!CHECK: return | ||
!CHECK: } | ||
|
||
program mn | ||
integer :: i | ||
i = 0 | ||
|
||
!$omp parallel reduction(+:i) | ||
i = 1 | ||
!$omp end parallel | ||
|
||
print *, i | ||
end program |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is
genOpenMPReduction
being removed here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If genOpenMPReduction is called her it replaces the normal operations (e.g.
arith.addi
) with anomp.reduction
operation that is no longer used/needed with the new reduction lowering. At some point when all operations have moved to the new reduction style, those operations should be removed entirely from the OpenMP dialect.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
However we have not changed processing for the
single
directive. So it should continue to use the old flow? Although, the lack of testing suggests it was never used.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
singleDirective=true
doesn't appear to mean thesingle
directive is the one being processed, but rather that a single directive is being processed as opposed to a nested one. The variable name is quite unclear!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regardless, of the directives processed by this function, only
parallel
andteams
can actually have reduction clauses on them, and I don't think Flang supportsteams
reductions yet?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, reduction for teams is not supported.