[flang][CodeGen][NFC] Reduce PreCGRewrite pass boilerplate#94329
Merged
[flang][CodeGen][NFC] Reduce PreCGRewrite pass boilerplate#94329
Conversation
The pass constructor can be generated automatically by tablegen. This pass is module-level and runs on all instances of target operations inside of it and so does not need any modification to support alternative top-level operations.
Member
|
@llvm/pr-subscribers-flang-codegen @llvm/pr-subscribers-flang-fir-hlfir Author: Tom Eccles (tblah) ChangesThe pass constructor can be generated automatically by tablegen. This pass is module-level and runs on all instances of target operations inside of it and so does not need any modification to support alternative top-level operations. Full diff: https://github.com/llvm/llvm-project/pull/94329.diff 4 Files Affected:
diff --git a/flang/include/flang/Optimizer/CodeGen/CGPasses.td b/flang/include/flang/Optimizer/CodeGen/CGPasses.td
index d23f07a5c8f11..df042187b2a71 100644
--- a/flang/include/flang/Optimizer/CodeGen/CGPasses.td
+++ b/flang/include/flang/Optimizer/CodeGen/CGPasses.td
@@ -43,7 +43,6 @@ def CodeGenRewrite : Pass<"cg-rewrite", "mlir::ModuleOp"> {
let description = [{
Fuse specific subgraphs into single Ops for code generation.
}];
- let constructor = "::fir::createFirCodeGenRewritePass()";
let dependentDialects = [
"fir::FIROpsDialect", "fir::FIRCodeGenDialect"
];
diff --git a/flang/include/flang/Optimizer/CodeGen/CodeGen.h b/flang/include/flang/Optimizer/CodeGen/CodeGen.h
index b2773abbd8411..3063bf1c0e020 100644
--- a/flang/include/flang/Optimizer/CodeGen/CodeGen.h
+++ b/flang/include/flang/Optimizer/CodeGen/CodeGen.h
@@ -28,11 +28,6 @@ struct NameUniquer;
#define GEN_PASS_DECL_BOXEDPROCEDUREPASS
#include "flang/Optimizer/CodeGen/CGPasses.h.inc"
-/// Prerequiste pass for code gen. Perform intermediate rewrites to perform
-/// the code gen (to LLVM-IR dialect) conversion.
-std::unique_ptr<mlir::Pass> createFirCodeGenRewritePass(
- CodeGenRewriteOptions Options = CodeGenRewriteOptions{});
-
/// FirTargetRewritePass options.
struct TargetRewriteOptions {
bool noCharacterConversion{};
diff --git a/flang/include/flang/Tools/CLOptions.inc b/flang/include/flang/Tools/CLOptions.inc
index cca3344da02a1..fb3ec75d4078a 100644
--- a/flang/include/flang/Tools/CLOptions.inc
+++ b/flang/include/flang/Tools/CLOptions.inc
@@ -178,7 +178,7 @@ inline void addCodeGenRewritePass(mlir::PassManager &pm, bool preserveDeclare) {
fir::CodeGenRewriteOptions options;
options.preserveDeclare = preserveDeclare;
addPassConditionally(pm, disableCodeGenRewrite,
- [&]() { return fir::createFirCodeGenRewritePass(options); });
+ [&]() { return fir::createCodeGenRewrite(options); });
}
inline void addTargetRewritePass(mlir::PassManager &pm) {
diff --git a/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp b/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
index c54a7457db761..6a0cd5ef4b34e 100644
--- a/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
+++ b/flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp
@@ -327,7 +327,8 @@ class DummyScopeOpConversion
class CodeGenRewrite : public fir::impl::CodeGenRewriteBase<CodeGenRewrite> {
public:
- CodeGenRewrite(fir::CodeGenRewriteOptions opts) : Base(opts) {}
+ using CodeGenRewriteBase<CodeGenRewrite>::CodeGenRewriteBase;
+
void runOnOperation() override final {
mlir::ModuleOp mod = getOperation();
@@ -361,11 +362,6 @@ class CodeGenRewrite : public fir::impl::CodeGenRewriteBase<CodeGenRewrite> {
} // namespace
-std::unique_ptr<mlir::Pass>
-fir::createFirCodeGenRewritePass(fir::CodeGenRewriteOptions Options) {
- return std::make_unique<CodeGenRewrite>(Options);
-}
-
void fir::populatePreCGRewritePatterns(mlir::RewritePatternSet &patterns,
bool preserveDeclare) {
patterns.insert<EmboxConversion, ArrayCoorConversion, ReboxConversion,
|
Contributor
|
FYI, the windows failure seems related to #93718, I commented there. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
The pass constructor can be generated automatically by tablegen.
This pass is module-level and runs on all instances of target operations inside of it and so does not need any modification to support alternative top-level operations.