[PATCH] D111539: [fir] Clean up InitFIR.h
Valentin Clement via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 11 05:39:26 PDT 2021
clementval created this revision.
clementval added reviewers: jeanPerier, svedanayagam, sscalpone, kiranchandramohan, jdoerfert, schweitz, pmccormick, mehdi_amini, rovka, AlexisPerry.
Herald added a reviewer: awarzynski.
Herald added a project: Flang.
clementval requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Clean up InitFIR.h file.
This patch is part of the upstreaming effort from fir-dev branch.
Co-authored-by: Eric Schweitz <eschweitz at nvidia.com>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D111539
Files:
flang/include/flang/Optimizer/Support/InitFIR.h
flang/tools/fir-opt/fir-opt.cpp
Index: flang/tools/fir-opt/fir-opt.cpp
===================================================================
--- flang/tools/fir-opt/fir-opt.cpp
+++ flang/tools/fir-opt/fir-opt.cpp
@@ -12,6 +12,7 @@
//===----------------------------------------------------------------------===//
#include "mlir/Support/MlirOptMain.h"
+#include "flang/Optimizer/CodeGen/CodeGen.h"
#include "flang/Optimizer/Support/InitFIR.h"
#include "flang/Optimizer/Transforms/Passes.h"
@@ -19,6 +20,7 @@
int main(int argc, char **argv) {
fir::support::registerMLIRPassesForFortranTools();
+ fir::registerOptCodeGenPasses();
fir::registerOptTransformPasses();
DialectRegistry registry;
fir::support::registerDialects(registry);
Index: flang/include/flang/Optimizer/Support/InitFIR.h
===================================================================
--- flang/include/flang/Optimizer/Support/InitFIR.h
+++ flang/include/flang/Optimizer/Support/InitFIR.h
@@ -21,17 +21,18 @@
#include "mlir/Pass/PassRegistry.h"
#include "mlir/Transforms/LocationSnapshot.h"
#include "mlir/Transforms/Passes.h"
-#include "flang/Optimizer/CodeGen/CodeGen.h"
namespace fir::support {
-// The definitive list of dialects used by flang.
-#define FLANG_DIALECT_LIST \
- mlir::AffineDialect, FIROpsDialect, FIRCodeGenDialect, \
- mlir::LLVM::LLVMDialect, mlir::acc::OpenACCDialect, \
+#define FLANG_NONCODEGEN_DIALECT_LIST \
+ mlir::AffineDialect, FIROpsDialect, mlir::acc::OpenACCDialect, \
mlir::omp::OpenMPDialect, mlir::scf::SCFDialect, \
mlir::StandardOpsDialect, mlir::vector::VectorDialect
+// The definitive list of dialects used by flang.
+#define FLANG_DIALECT_LIST \
+ FLANG_NONCODEGEN_DIALECT_LIST, FIRCodeGenDialect, mlir::LLVM::LLVMDialect
+
/// Register all the dialects used by flang.
inline void registerDialects(mlir::DialectRegistry ®istry) {
registry.insert<FLANG_DIALECT_LIST>();
@@ -70,9 +71,6 @@
mlir::registerAffineDataCopyGenerationPass();
mlir::registerConvertAffineToStandardPass();
-
- // Flang passes
- fir::registerOptCodeGenPasses();
}
} // namespace fir::support
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D111539.378637.patch
Type: text/x-patch
Size: 2342 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211011/b886c891/attachment.bin>
More information about the llvm-commits
mailing list