[mlir][LLVM] erase call mappings in forgetMapping() #84955
Merged
+39
−0
Conversation
This file contains 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
tblah
requested review from
DavidTruby,
ergawy,
ftynse,
kiranchandramohan and
Leporacanthicus
|
@llvm/pr-subscribers-flang-openmp @llvm/pr-subscribers-mlir Author: Tom Eccles (tblah) ChangesIt looks like the mappings for call instructions were forgotten here. This fixes a bug in OpenMP when in-lining a region containing call operations multiple times. OpenMP array reductions 4/6 Full diff: https://github.com/llvm/llvm-project/pull/84955.diff 1 Files Affected:
diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
index c00628a420a000..995544238e4a3c 100644
--- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
@@ -716,6 +716,8 @@ void ModuleTranslation::forgetMapping(Region ®ion) {
branchMapping.erase(&op);
if (isa<LLVM::GlobalOp>(op))
globalsMapping.erase(&op);
+ if (isa<LLVM::CallOp>(op))
+ callMapping.erase(&op);
llvm::append_range(
toProcess,
llvm::map_range(op.getRegions(), [](Region &r) { return &r; }));
|
|
@llvm/pr-subscribers-mlir-llvm Author: Tom Eccles (tblah) ChangesIt looks like the mappings for call instructions were forgotten here. This fixes a bug in OpenMP when in-lining a region containing call operations multiple times. OpenMP array reductions 4/6 Full diff: https://github.com/llvm/llvm-project/pull/84955.diff 1 Files Affected:
diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
index c00628a420a000..995544238e4a3c 100644
--- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
@@ -716,6 +716,8 @@ void ModuleTranslation::forgetMapping(Region ®ion) {
branchMapping.erase(&op);
if (isa<LLVM::GlobalOp>(op))
globalsMapping.erase(&op);
+ if (isa<LLVM::CallOp>(op))
+ callMapping.erase(&op);
llvm::append_range(
toProcess,
llvm::map_range(op.getRegions(), [](Region &r) { return &r; }));
|
kiranchandramohan
approved these changes
Mar 12, 2024
This was referenced Mar 12, 2024
Dinistro
approved these changes
Mar 12, 2024
|
We need a test here |
joker-eph
reviewed
Mar 15, 2024
Comment on lines
18
to
23
| atomic { | ||
| ^bb2(%arg2: !llvm.ptr, %arg3: !llvm.ptr): | ||
| %2 = llvm.load %arg3 : !llvm.ptr -> f32 | ||
| llvm.atomicrmw fadd %arg2, %2 monotonic : !llvm.ptr, f32 | ||
| omp.yield | ||
| } |
There was a problem hiding this comment.
Can the atomic region be removed?
| %c1 = llvm.mlir.constant(1 : i32) : i32 | ||
| %0 = llvm.alloca %c1 x i32 : (i32) -> !llvm.ptr | ||
| omp.parallel { | ||
| omp.wsloop reduction(@add_f32 %0 -> %prv : !llvm.ptr) |
There was a problem hiding this comment.
Can the reduction be moved to omp.parallel? And the omp.wsloop removed?
tblah
force-pushed
the
users/tblah/omp_array_reduction_4
branch
from
f2a649a
to
02550e1
Compare
|
Sorry about the force push. Github wasn't showing the new commit (02550e1). It is just a rebase onto the target branch. |
tblah
force-pushed
the
users/tblah/omp_array_reduction_3
branch
2 times, most recently
from
83ad738
to
4eef5d2
Compare
tblah
added a commit
that referenced
this pull request
Mar 20, 2024
OpenMP reduction declare operations can contain FIR code which needs to be lowered to LLVM. With array reductions, these regions can contain more complicated operations which need PreCGRewriting. A similar extra case was already needed for fir::GlobalOp. OpenMP array reductions 3/6 Previous PR: #84953 Next PR: #84955
It looks like the mappings for call instructions were forgotten here. This fixes a bug in OpenMP when inlining a region containing call operations multiple times.
tblah
force-pushed
the
users/tblah/omp_array_reduction_4
branch
from
02550e1
to
a726997
Compare
chencha3
pushed a commit
to chencha3/llvm-project
that referenced
this pull request
Mar 23, 2024
…84954) OpenMP reduction declare operations can contain FIR code which needs to be lowered to LLVM. With array reductions, these regions can contain more complicated operations which need PreCGRewriting. A similar extra case was already needed for fir::GlobalOp. OpenMP array reductions 3/6 Previous PR: llvm#84953 Next PR: llvm#84955
chencha3
pushed a commit
to chencha3/llvm-project
that referenced
this pull request
Mar 23, 2024
It looks like the mappings for call instructions were forgotten here. This fixes a bug in OpenMP when in-lining a region containing call operations multiple times. OpenMP array reductions 4/6 Previous PR: llvm#84954 Next PR: llvm#84957
chencha3
pushed a commit
to chencha3/llvm-project
that referenced
this pull request
Mar 23, 2024
…code (llvm#84957) Moving extractSequenceType to FIRType.h so that this can also be used from OpenMP. OpenMP array reductions 5/6 Previous PR: llvm#84955 Next PR: llvm#84958
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
It looks like the mappings for call instructions were forgotten here. This fixes a bug in OpenMP when in-lining a region containing call operations multiple times.
OpenMP array reductions 4/6
Previous PR: #84954
Next PR: #84957