commit 63bd4735e637bbaa9181645d79fe740042936e84
author Tom Eccles <tom.eccles@arm.com> Wed Mar 20 09:52:04 2024 +0000
committer Copybara-Service <copybara-worker@google.com> Wed Mar 20 02:52:48 2024 -0700
tree fdd7680cd6e340153dec751187a1999423776641
parent 698cde2652b074badfffd85f8ccf7d86c2f6018e

[flang][CodeGen] Run PreCGRewrite on omp reduction declare ops (#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: https://github.com/llvm/llvm-project/pull/84953
Next PR: https://github.com/llvm/llvm-project/pull/84955

GitOrigin-RevId: 1f63a56cede85bcd5f4fea3663bd3a47b801a396

lib/Optimizer/CodeGen/PreCGRewrite.cpp

diff --git a/lib/Optimizer/CodeGen/PreCGRewrite.cpp b/lib/Optimizer/CodeGen/PreCGRewrite.cpp
index 9d48a2f..665bf09 100644
--- a/lib/Optimizer/CodeGen/PreCGRewrite.cpp
+++ b/lib/Optimizer/CodeGen/PreCGRewrite.cpp
@@ -283,7 +283,9 @@
 
 class CodeGenRewrite : public fir::impl::CodeGenRewriteBase<CodeGenRewrite> {
 public:
-  void runOn(mlir::Operation *op, mlir::Region &region) {
+  void runOnOperation() override final {
+    mlir::ModuleOp mod = getOperation();
+
     auto &context = getContext();
     mlir::ConversionTarget target(context);
     target.addLegalDialect<mlir::arith::ArithDialect, fir::FIROpsDialect,
@@ -300,7 +302,7 @@
     mlir::RewritePatternSet patterns(&context);
     fir::populatePreCGRewritePatterns(patterns);
     if (mlir::failed(
-            mlir::applyPartialConversion(op, target, std::move(patterns)))) {
+            mlir::applyPartialConversion(mod, target, std::move(patterns)))) {
       mlir::emitError(mlir::UnknownLoc::get(&context),
                       "error in running the pre-codegen conversions");
       signalPassFailure();
@@ -308,16 +310,7 @@
     }
     // Erase any residual (fir.shape, fir.slice...).
     mlir::IRRewriter rewriter(&context);
-    (void)mlir::runRegionDCE(rewriter, op->getRegions());
-  }
-
-  void runOnOperation() override final {
-    // Call runOn on all top level regions that may contain emboxOp/arrayCoorOp.
-    auto mod = getOperation();
-    for (auto func : mod.getOps<mlir::func::FuncOp>())
-      runOn(func, func.getBody());
-    for (auto global : mod.getOps<fir::GlobalOp>())
-      runOn(global, global.getRegion());
+    (void)mlir::runRegionDCE(rewriter, mod->getRegions());
   }
 };