Revert "[CIR][NFC] Move LoweringPrepare into CIRGen (#1092)"

This reverts commit 4463352.
llvm · Nov 9, 2024 · 94289aa · 94289aa
1 parent f220fa7
commit 94289aa
Show file tree

Hide file tree

Showing 26 changed files with 48 additions and 69 deletions.
diff --git a/clang/include/clang/CIR/CIRGenerator.h b/clang/include/clang/CIR/CIRGenerator.h
@@ -98,7 +98,6 @@ class CIRGenerator : public clang::ASTConsumer {
   std::unique_ptr<mlir::MLIRContext> takeContext() {
     return std::move(mlirCtx);
   };
-  clang::CIRGen::CIRGenModule &getCGM() { return *CGM; }
 
   bool verifyModule();
 

diff --git a/clang/include/clang/CIR/CIRToCIRPasses.h b/clang/include/clang/CIR/CIRToCIRPasses.h
@@ -18,10 +18,7 @@
 
 namespace clang {
 class ASTContext;
-namespace CIRGen {
-class CIRGenModule;
-} // namespace CIRGen
-} // namespace clang
+}
 
 namespace mlir {
 class MLIRContext;
@@ -33,12 +30,12 @@ namespace cir {
 // Run set of cleanup/prepare/etc passes CIR <-> CIR.
 mlir::LogicalResult runCIRToCIRPasses(
     mlir::ModuleOp theModule, mlir::MLIRContext *mlirCtx,
-    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);
+    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
 

diff --git a/clang/include/clang/CIR/Dialect/Passes.h b/clang/include/clang/CIR/Dialect/Passes.h
@@ -17,11 +17,7 @@
 
 namespace clang {
 class ASTContext;
-namespace CIRGen {
-class CIRGenModule;
-} // namespace CIRGen
-} // namespace clang
-
+}
 namespace mlir {
 
 std::unique_ptr<Pass> createLifetimeCheckPass();
@@ -35,9 +31,7 @@ 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,
-                          clang::CIRGen::CIRGenModule &cgm);
+std::unique_ptr<Pass> createLoweringPreparePass(clang::ASTContext *astCtx);
 std::unique_ptr<Pass> createIdiomRecognizerPass();
 std::unique_ptr<Pass> createIdiomRecognizerPass(clang::ASTContext *astCtx);
 std::unique_ptr<Pass> createLibOptPass();

diff --git a/clang/include/clang/CIR/Dialect/Passes.td b/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

diff --git a/clang/lib/CIR/CodeGen/CIRPasses.cpp b/clang/lib/CIR/CodeGen/CIRPasses.cpp
@@ -13,7 +13,6 @@
 #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"
@@ -25,12 +24,12 @@
 namespace cir {
 mlir::LogicalResult runCIRToCIRPasses(
     mlir::ModuleOp theModule, mlir::MLIRContext *mlirCtx,
-    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) {
+    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) {
 
   llvm::TimeTraceScope scope("CIR To CIR Passes");
 
@@ -74,7 +73,7 @@ mlir::LogicalResult runCIRToCIRPasses(
   if (enableCIRSimplify)
     pm.addPass(mlir::createCIRSimplifyPass());
 
-  pm.addPass(mlir::createLoweringPreparePass(&astCtx, cgm));
+  pm.addPass(mlir::createLoweringPreparePass(&astCtx));
 
   if (flattenCIR || enableMem2Reg)
     mlir::populateCIRPreLoweringPasses(pm, enableCallConvLowering);

diff --git a/clang/lib/CIR/CodeGen/CMakeLists.txt b/clang/lib/CIR/CodeGen/CMakeLists.txt
@@ -44,7 +44,6 @@ add_clang_library(clangCIR
   CIRPasses.cpp
   CIRRecordLayoutBuilder.cpp
   ConstantInitBuilder.cpp
-  LoweringPrepare.cpp
   TargetInfo.cpp
 
   DEPENDS

diff --git a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/Block.h"
 #include "mlir/IR/Operation.h"
@@ -15,7 +16,6 @@
 #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;

diff --git a/clang/lib/CIR/Dialect/Transforms/CIRSimplify.cpp b/clang/lib/CIR/Dialect/Transforms/CIRSimplify.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/Block.h"
 #include "mlir/IR/Operation.h"
@@ -15,7 +16,6 @@
 #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;

diff --git a/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt b/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt
@@ -2,6 +2,7 @@ add_subdirectory(TargetLowering)
 
 add_clang_library(MLIRCIRTransforms
   LifetimeCheck.cpp
+  LoweringPrepare.cpp
   CIRCanonicalize.cpp
   CIRSimplify.cpp
   DropAST.cpp

diff --git a/clang/lib/CIR/Dialect/Transforms/DropAST.cpp b/clang/lib/CIR/Dialect/Transforms/DropAST.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"

diff --git a/clang/lib/CIR/Dialect/Transforms/FlattenCFG.cpp b/clang/lib/CIR/Dialect/Transforms/FlattenCFG.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;

diff --git a/clang/lib/CIR/Dialect/Transforms/GotoSolver.cpp b/clang/lib/CIR/Dialect/Transforms/GotoSolver.cpp
@@ -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>();
-}
+}
diff --git a/clang/lib/CIR/Dialect/Transforms/HoistAllocas.cpp b/clang/lib/CIR/Dialect/Transforms/HoistAllocas.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"
 
@@ -62,4 +62,4 @@ void HoistAllocasPass::runOnOperation() {
 
 std::unique_ptr<Pass> mlir::createHoistAllocasPass() {
   return std::make_unique<HoistAllocasPass>();
-}
+}
diff --git a/clang/lib/CIR/Dialect/Transforms/IdiomRecognizer.cpp b/clang/lib/CIR/Dialect/Transforms/IdiomRecognizer.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Region.h"
@@ -15,7 +16,6 @@
 #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"

diff --git a/clang/lib/CIR/Dialect/Transforms/LibOpt.cpp b/clang/lib/CIR/Dialect/Transforms/LibOpt.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "PassDetail.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Region.h"
@@ -15,7 +16,6 @@
 #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"

diff --git a/clang/lib/CIR/Dialect/Transforms/LifetimeCheck.cpp b/clang/lib/CIR/Dialect/Transforms/LifetimeCheck.cpp
@@ -6,14 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
+#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"

diff --git a/clang/lib/CIR/CodeGen/LoweringPrepare.cpp → ...IR/Dialect/Transforms/LoweringPrepare.cpp b/clang/lib/CIR/CodeGen/LoweringPrepare.cpp → ...IR/Dialect/Transforms/LoweringPrepare.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CIRGenModule.h"
-
+#include "LoweringPrepareCXXABI.h"
+#include "PassDetail.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Region.h"
 #include "clang/AST/ASTContext.h"
@@ -19,8 +19,6 @@
 #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"
@@ -123,7 +121,6 @@ struct LoweringPreparePass : public LoweringPrepareBase<LoweringPreparePass> {
 
   clang::ASTContext *astCtx;
   std::shared_ptr<cir::LoweringPrepareCXXABI> cxxABI;
-  clang::CIRGen::CIRGenModule *cgm;
 
   void setASTContext(clang::ASTContext *c) {
     astCtx = c;
@@ -150,8 +147,6 @@ struct LoweringPreparePass : public LoweringPrepareBase<LoweringPreparePass> {
     }
   }
 
-  void setCGM(clang::CIRGen::CIRGenModule &cgm) { this->cgm = &cgm; }
-
   /// Tracks current module.
   ModuleOp theModule;
 
@@ -1210,10 +1205,8 @@ std::unique_ptr<Pass> mlir::createLoweringPreparePass() {
 }
 
 std::unique_ptr<Pass>
-mlir::createLoweringPreparePass(clang::ASTContext *astCtx,
-                                clang::CIRGen::CIRGenModule &cgm) {
+mlir::createLoweringPreparePass(clang::ASTContext *astCtx) {
   auto pass = std::make_unique<LoweringPreparePass>();
   pass->setASTContext(astCtx);
-  pass->setCGM(cgm);
   return std::move(pass);
 }
diff --git a/...ialect/Transforms/LoweringPrepareCXXABI.h → ...ialect/Transforms/LoweringPrepareCXXABI.h b/...ialect/Transforms/LoweringPrepareCXXABI.h → ...ialect/Transforms/LoweringPrepareCXXABI.h
diff --git a/...Transforms/LoweringPrepareItaniumCXXABI.h → ...Transforms/LoweringPrepareItaniumCXXABI.h b/...Transforms/LoweringPrepareItaniumCXXABI.h → ...Transforms/LoweringPrepareItaniumCXXABI.h
diff --git a/...clang/CIR/Dialect/Transforms/PassDetail.h → ...g/lib/CIR/Dialect/Transforms/PassDetail.h b/...clang/CIR/Dialect/Transforms/PassDetail.h → ...g/lib/CIR/Dialect/Transforms/PassDetail.h
diff --git a/clang/lib/CIR/Dialect/Transforms/SCFPrepare.cpp b/clang/lib/CIR/Dialect/Transforms/SCFPrepare.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;

diff --git a/clang/lib/CIR/Dialect/Transforms/StdHelpers.h b/clang/lib/CIR/Dialect/Transforms/StdHelpers.h
@@ -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"

diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/Targets/LoweringPrepareAArch64CXXABI.cpp b/clang/lib/CIR/Dialect/Transforms/TargetLowering/Targets/LoweringPrepareAArch64CXXABI.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>

diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/Targets/LoweringPrepareItaniumCXXABI.cpp b/clang/lib/CIR/Dialect/Transforms/TargetLowering/Targets/LoweringPrepareItaniumCXXABI.cpp
@@ -14,7 +14,7 @@
 
 // TODO(cir): Refactor this to follow some level of codegen parity.
 
-#include "clang/CIR/Dialect/Transforms/LoweringPrepareItaniumCXXABI.h"
+#include "../LoweringPrepareItaniumCXXABI.h"
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Value.h"
 #include "mlir/IR/ValueRange.h"