[CIR][NFC] Move LoweringPrepare into CIRGen

Move LP into CIRGen and give it a handle on the CIRGenBuilderTy.

Pull Request: #1223

Author: lanza

clang/include/clang/CIR/CIRGenerator.h

@@ -98,6 +98,7 @@ class CIRGenerator : public clang::ASTConsumer {
   std::unique_ptr<mlir::MLIRContext> takeContext() {
     return std::move(mlirContext);
   };
+  clang::CIRGen::CIRGenModule &getCGM() { return *CGM; }
 
   bool verifyModule();
 

clang/include/clang/CIR/CIRToCIRPasses.h

@@ -18,7 +18,10 @@
 
 namespace clang {
 class ASTContext;
-}
+namespace CIRGen {
+class CIRGenModule;
+} // namespace CIRGen
+} // namespace clang
 
 namespace mlir {
 class MLIRContext;
@@ -30,12 +33,12 @@ namespace cir {
 // Run set of cleanup/prepare/etc passes CIR <-> CIR.
 mlir::LogicalResult runCIRToCIRPasses(
     mlir::ModuleOp theModule, mlir::MLIRContext *mlirCtx,
-    clang::ASTContext &astCtx, bool enableVerifier, bool enableLifetime,
-    llvm::StringRef lifetimeOpts, bool enableIdiomRecognizer,
-    llvm::StringRef idiomRecognizerOpts, bool enableLibOpt,
-    llvm::StringRef libOptOpts, std::string &passOptParsingFailure,
-    bool enableCIRSimplify, bool flattenCIR, bool emitMLIR,
-    bool enableCallConvLowering, bool enableMem2reg);
+    clang::CIRGen::CIRGenModule &cgm, clang::ASTContext &astCtx,
+    bool enableVerifier, bool enableLifetime, llvm::StringRef lifetimeOpts,
+    bool enableIdiomRecognizer, llvm::StringRef idiomRecognizerOpts,
+    bool enableLibOpt, llvm::StringRef libOptOpts,
+    std::string &passOptParsingFailure, bool enableCIRSimplify, bool flattenCIR,
+    bool emitMLIR, bool enableCallConvLowering, bool enableMem2reg);
 
 } // namespace cir
 

clang/include/clang/CIR/Dialect/Passes.h

@@ -17,7 +17,11 @@
 
 namespace clang {
 class ASTContext;
-}
+namespace CIRGen {
+class CIRGenBuilderTy;
+} // namespace CIRGen
+} // namespace clang
+
 namespace mlir {
 
 std::unique_ptr<Pass> createLifetimeCheckPass();
@@ -31,7 +35,9 @@ std::unique_ptr<Pass> createCIRSimplifyPass();
 std::unique_ptr<Pass> createDropASTPass();
 std::unique_ptr<Pass> createSCFPreparePass();
 std::unique_ptr<Pass> createLoweringPreparePass();
-std::unique_ptr<Pass> createLoweringPreparePass(clang::ASTContext *astCtx);
+std::unique_ptr<Pass>
+createLoweringPreparePass(clang::ASTContext *astCtx,
+                          clang::CIRGen::CIRGenBuilderTy &builder);
 std::unique_ptr<Pass> createIdiomRecognizerPass();
 std::unique_ptr<Pass> createIdiomRecognizerPass(clang::ASTContext *astCtx);
 std::unique_ptr<Pass> createLibOptPass();

clang/include/clang/CIR/Dialect/Passes.td

@@ -109,7 +109,7 @@ def SCFPrepare : Pass<"cir-mlir-scf-prepare"> {
 
 def HoistAllocas : Pass<"cir-hoist-allocas"> {
   let summary = "Hoist allocas to the entry of the function";
-  let description = [{ 
+  let description = [{
     This pass hoist all non-dynamic allocas to the entry of the function.
     This is helpful for later code generation.
   }];
@@ -119,7 +119,7 @@ def HoistAllocas : Pass<"cir-hoist-allocas"> {
 
 def FlattenCFG : Pass<"cir-flatten-cfg"> {
   let summary = "Produces flatten cfg";
-  let description = [{ 
+  let description = [{
     This pass transforms CIR and inline all the nested regions. Thus,
     the next post condtions are met after the pass applied:
     - there is not any nested region in a function body

clang/lib/CIR/Dialect/Transforms/LoweringPrepareCXXABI.h clang/include/clang/CIR/Dialect/Transforms/LoweringPrepareCXXABI.h

@@ -13,6 +13,7 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/CIR/Dialect/Passes.h"
 
+#include "CIRGenModule.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
@@ -24,12 +25,12 @@
 namespace cir {
 mlir::LogicalResult runCIRToCIRPasses(
     mlir::ModuleOp theModule, mlir::MLIRContext *mlirContext,
-    clang::ASTContext &astContext, bool enableVerifier, bool enableLifetime,
-    llvm::StringRef lifetimeOpts, bool enableIdiomRecognizer,
-    llvm::StringRef idiomRecognizerOpts, bool enableLibOpt,
-    llvm::StringRef libOptOpts, std::string &passOptParsingFailure,
-    bool enableCIRSimplify, bool flattenCIR, bool emitMLIR,
-    bool enableCallConvLowering, bool enableMem2Reg) {
+    clang::CIRGen::CIRGenModule &cgm, clang::ASTContext &astContext,
+    bool enableVerifier, bool enableLifetime, llvm::StringRef lifetimeOpts,
+    bool enableIdiomRecognizer, llvm::StringRef idiomRecognizerOpts,
+    bool enableLibOpt, llvm::StringRef libOptOpts,
+    std::string &passOptParsingFailure, bool enableCIRSimplify, bool flattenCIR,
+    bool emitMLIR, bool enableCallConvLowering, bool enableMem2Reg) {
 
   llvm::TimeTraceScope scope("CIR To CIR Passes");
 
@@ -73,7 +74,7 @@ mlir::LogicalResult runCIRToCIRPasses(
   if (enableCIRSimplify)
     pm.addPass(mlir::createCIRSimplifyPass());
 
-  pm.addPass(mlir::createLoweringPreparePass(&astContext));
+  pm.addPass(mlir::createLoweringPreparePass(&astContext, cgm.getBuilder()));
 
   if (flattenCIR || enableMem2Reg)
     mlir::populateCIRPreLoweringPasses(pm, enableCallConvLowering);

clang/lib/CIR/Dialect/Transforms/LoweringPrepareItaniumCXXABI.h clang/include/clang/CIR/Dialect/Transforms/LoweringPrepareItaniumCXXABI.h

@@ -44,6 +44,7 @@ add_clang_library(clangCIR
   CIRPasses.cpp
   CIRRecordLayoutBuilder.cpp
   ConstantInitBuilder.cpp
+  LoweringPrepare.cpp
   TargetInfo.cpp
 
   DEPENDS

clang/lib/CIR/Dialect/Transforms/PassDetail.h clang/include/clang/CIR/Dialect/Transforms/PassDetail.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "LoweringPrepareCXXABI.h"
-#include "PassDetail.h"
+#include "CIRGenModule.h"
+
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Region.h"
 #include "clang/AST/ASTContext.h"
@@ -19,6 +19,8 @@
 #include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/LoweringPrepareCXXABI.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 #include "clang/CIR/Interfaces/ASTAttrInterfaces.h"
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/SmallVector.h"
@@ -121,6 +123,7 @@ struct LoweringPreparePass : public LoweringPrepareBase<LoweringPreparePass> {
 
   clang::ASTContext *astCtx;
   std::shared_ptr<cir::LoweringPrepareCXXABI> cxxABI;
+  clang::CIRGen::CIRGenBuilderTy *builder;
 
   void setASTContext(clang::ASTContext *c) {
     astCtx = c;
@@ -154,6 +157,10 @@ struct LoweringPreparePass : public LoweringPrepareBase<LoweringPreparePass> {
     }
   }
 
+  void setBuilder(clang::CIRGen::CIRGenBuilderTy &builder) {
+    this->builder = &builder;
+  }
+
   /// Tracks current module.
   ModuleOp theModule;
 
@@ -1210,10 +1217,11 @@ void LoweringPreparePass::runOnOperation() {
 std::unique_ptr<Pass> mlir::createLoweringPreparePass() {
   return std::make_unique<LoweringPreparePass>();
 }
-
 std::unique_ptr<Pass>
-mlir::createLoweringPreparePass(clang::ASTContext *astCtx) {
+mlir::createLoweringPreparePass(clang::ASTContext *astCtx,
+                                clang::CIRGen::CIRGenBuilderTy &builder) {
   auto pass = std::make_unique<LoweringPreparePass>();
+  pass->setBuilder(builder);
   pass->setASTContext(astCtx);
   return std::move(pass);
 }

clang/lib/CIR/CodeGen/CIRPasses.cpp

@@ -6,7 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/Block.h"
 #include "mlir/IR/Operation.h"
@@ -16,6 +15,7 @@
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 
 using namespace mlir;
 using namespace cir;

clang/lib/CIR/CodeGen/CMakeLists.txt

@@ -6,7 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/Block.h"
 #include "mlir/IR/Operation.h"
@@ -16,6 +15,7 @@
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 #include "llvm/ADT/SmallVector.h"
 
 using namespace mlir;

clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp clang/lib/CIR/CodeGen/LoweringPrepare.cpp

@@ -2,7 +2,6 @@ add_subdirectory(TargetLowering)
 
 add_clang_library(MLIRCIRTransforms
   LifetimeCheck.cpp
-  LoweringPrepare.cpp
   CIRCanonicalize.cpp
   CIRSimplify.cpp
   DropAST.cpp

clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp

@@ -8,10 +8,10 @@
 
 #include "clang/CIR/Dialect/Passes.h"
 
-#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 
 #include "llvm/ADT/SetOperations.h"
 #include "llvm/ADT/SmallSet.h"

clang/lib/CIR/Dialect/Transforms/CIRSimplify.cpp

@@ -10,14 +10,14 @@
 // function region.
 //
 //===----------------------------------------------------------------------===//
-#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 
 using namespace mlir;
 using namespace cir;

clang/lib/CIR/Dialect/Transforms/CMakeLists.txt

@@ -1,11 +1,11 @@
-#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 
 #include "llvm/Support/TimeProfiler.h"
 
@@ -54,4 +54,4 @@ void GotoSolverPass::runOnOperation() {
 
 std::unique_ptr<Pass> mlir::createGotoSolverPass() {
   return std::make_unique<GotoSolverPass>();
-}
+}

clang/lib/CIR/Dialect/Transforms/DropAST.cpp

@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 
 #include "llvm/Support/TimeProfiler.h"
 
@@ -72,4 +72,4 @@ void HoistAllocasPass::runOnOperation() {
 
 std::unique_ptr<Pass> mlir::createHoistAllocasPass() {
   return std::make_unique<HoistAllocasPass>();
-}
+}

clang/lib/CIR/Dialect/Transforms/FlattenCFG.cpp

@@ -6,7 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Region.h"
@@ -16,6 +15,7 @@
 #include "clang/CIR/Dialect/Builder/CIRBaseBuilder.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 #include "clang/CIR/Interfaces/ASTAttrInterfaces.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"

clang/lib/CIR/Dialect/Transforms/GotoSolver.cpp

@@ -6,7 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Region.h"
@@ -16,6 +15,7 @@
 #include "clang/CIR/Dialect/Builder/CIRBaseBuilder.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 #include "clang/CIR/Interfaces/ASTAttrInterfaces.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"

clang/lib/CIR/Dialect/Transforms/HoistAllocas.cpp

@@ -6,15 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetail.h"
-
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Attr.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/CIR/Dialect/IR/CIRAttrs.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 
 #include "clang/CIR/Interfaces/CIRLoopOpInterface.h"
 #include "llvm/ADT/SetOperations.h"

clang/lib/CIR/Dialect/Transforms/IdiomRecognizer.cpp

@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetail.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 
 using namespace mlir;
 using namespace cir;

clang/lib/CIR/Dialect/Transforms/LibOpt.cpp

@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetail.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Region.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/Basic/Module.h"
 #include "clang/CIR/Dialect/Builder/CIRBaseBuilder.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/Passes.h"
+#include "clang/CIR/Dialect/Transforms/PassDetail.h"
 #include "clang/CIR/Interfaces/ASTAttrInterfaces.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"

clang/lib/CIR/Dialect/Transforms/LifetimeCheck.cpp

@@ -20,10 +20,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "../LoweringPrepareCXXABI.h"
 #include "CIRCXXABI.h"
 #include "LowerModule.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
+#include "clang/CIR/Dialect/Transforms/LoweringPrepareCXXABI.h"
 #include "llvm/Support/ErrorHandling.h"
 
 namespace cir {

clang/lib/CIR/Dialect/Transforms/SCFPrepare.cpp

@@ -14,10 +14,10 @@
 
 // TODO(cir): Refactor this to follow some level of codegen parity.
 
-#include "../LoweringPrepareItaniumCXXABI.h"
 #include "clang/AST/CharUnits.h"
 #include "clang/CIR/Dialect/IR/CIRDataLayout.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
+#include "clang/CIR/Dialect/Transforms/LoweringPrepareItaniumCXXABI.h"
 #include "clang/CIR/MissingFeatures.h"
 
 #include <assert.h>