Skip to content

[flang][OpenMP] Fix handling of nested loop wrappers in LowerWorkshare #117275

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

Merged
merged 1 commit into from
Nov 26, 2024
Merged

[flang][OpenMP] Fix handling of nested loop wrappers in LowerWorkshare #117275

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
9 changes: 4 additions & 5 deletions flang/lib/Optimizer/OpenMP/LowerWorkshare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ static bool mustParallelizeOp(Operation *op) {
// omp.workshare.loop_wrapper {}
//
// Therefore, we skip if we encounter a nested omp.workshare.
if (isa<omp::WorkshareOp>(op))
if (isa<omp::WorkshareOp>(nested))
return WalkResult::skip();
if (isa<omp::WorkshareLoopWrapperOp>(op))
if (isa<omp::WorkshareLoopWrapperOp>(nested))
return WalkResult::interrupt();
return WalkResult::advance();
})
Expand Down Expand Up @@ -253,8 +253,7 @@ static void parallelizeRegion(Region &sourceRegion, Region &targetRegion,
// Either we have already remapped it
bool remapped = rootMapping.contains(opr);
// Or it is available because it dominates `sr`
bool dominates =
di.properlyDominates(opr.getDefiningOp(), &*sr.begin);
bool dominates = di.properlyDominates(opr, &*sr.begin);
return remapped || dominates;
})) {
// Safe to parallelize operations which have all operands available in
Expand Down Expand Up @@ -405,7 +404,7 @@ static void parallelizeRegion(Region &sourceRegion, Region &targetRegion,

if (sourceRegion.hasOneBlock()) {
handleOneBlock(sourceRegion.front());
} else {
} else if (!sourceRegion.empty()) {
auto &domTree = di.getDomTree(&sourceRegion);
for (auto node : llvm::breadth_first(domTree.getRootNode())) {
handleOneBlock(*node->getBlock());
Expand Down
22 changes: 22 additions & 0 deletions flang/test/Transforms/OpenMP/lower-workshare-nested.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// RUN: fir-opt --lower-workshare --allow-unregistered-dialect %s | FileCheck %s

// Checks that the nested loop_wrapper gets parallelized
func.func @wsfunc(%cond : i1) {
omp.workshare {
%c1 = arith.constant 1 : index
%c42 = arith.constant 42 : index
fir.if %cond {
omp.workshare.loop_wrapper {
omp.loop_nest (%arg1) : index = (%c1) to (%c42) inclusive step (%c1) {
"test.test1"() : () -> ()
omp.yield
}
}
}
omp.terminator
}
return
}

// CHECK: fir.if
// CHECK: omp.wsloop nowait
Loading