[NFCI][Calyx] Refactor TableGen Pass includes (#7182)

llvm · Jun 14, 2024 · 2554a14 · 2554a14
1 parent 0e22c2b
commit 2554a14
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 45 deletions.
diff --git a/include/circt/Dialect/Calyx/CalyxPasses.h b/include/circt/Dialect/Calyx/CalyxPasses.h
@@ -16,6 +16,7 @@
 #include "circt/Dialect/Comb/CombOps.h"
 #include "circt/Dialect/HW/HWOps.h"
 #include "circt/Support/LLVM.h"
+#include "mlir/Pass/Pass.h"
 #include <memory>
 
 namespace circt {

diff --git a/lib/Dialect/Calyx/Transforms/ClkResetInsertion.cpp b/lib/Dialect/Calyx/Transforms/ClkResetInsertion.cpp
@@ -11,7 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetails.h"
 #include "circt/Dialect/Calyx/CalyxOps.h"
 #include "circt/Dialect/Calyx/CalyxPasses.h"
 #include "circt/Support/LLVM.h"
@@ -20,6 +19,14 @@
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
+namespace circt {
+namespace calyx {
+#define GEN_PASS_DEF_CLKINSERTION
+#define GEN_PASS_DEF_RESETINSERTION
+#include "circt/Dialect/Calyx/CalyxPasses.h.inc"
+} // namespace calyx
+} // namespace circt
+
 using namespace circt;
 using namespace calyx;
 using namespace mlir;
@@ -43,13 +50,15 @@ static void doPortPassthrough(ComponentOp comp, Value fromPort,
   }
 }
 
-struct ClkInsertionPass : public ClkInsertionBase<ClkInsertionPass> {
+struct ClkInsertionPass
+    : public circt::calyx::impl::ClkInsertionBase<ClkInsertionPass> {
   void runOnOperation() override {
     doPortPassthrough(getOperation(), getOperation().getClkPort(), "clk");
   }
 };
 
-struct ResetInsertionPass : public ResetInsertionBase<ResetInsertionPass> {
+struct ResetInsertionPass
+    : public circt::calyx::impl::ResetInsertionBase<ResetInsertionPass> {
   void runOnOperation() override {
     doPortPassthrough(getOperation(), getOperation().getResetPort(), "reset");
   }

diff --git a/lib/Dialect/Calyx/Transforms/CompileControl.cpp b/lib/Dialect/Calyx/Transforms/CompileControl.cpp
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetails.h"
 #include "circt/Dialect/Calyx/CalyxHelpers.h"
 #include "circt/Dialect/Calyx/CalyxOps.h"
 #include "circt/Dialect/Calyx/CalyxPasses.h"
@@ -20,6 +19,13 @@
 #include "mlir/IR/PatternMatch.h"
 #include "llvm/ADT/TypeSwitch.h"
 
+namespace circt {
+namespace calyx {
+#define GEN_PASS_DEF_COMPILECONTROL
+#include "circt/Dialect/Calyx/CalyxPasses.h.inc"
+} // namespace calyx
+} // namespace circt
+
 using namespace circt;
 using namespace calyx;
 using namespace mlir;
@@ -179,7 +185,8 @@ void CompileControlVisitor::visit(SeqOp seq, ComponentOp &component) {
 
 namespace {
 
-struct CompileControlPass : public CompileControlBase<CompileControlPass> {
+struct CompileControlPass
+    : public circt::calyx::impl::CompileControlBase<CompileControlPass> {
   void runOnOperation() override;
 };
 

diff --git a/lib/Dialect/Calyx/Transforms/GICM.cpp b/lib/Dialect/Calyx/Transforms/GICM.cpp
@@ -11,7 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetails.h"
 #include "circt/Dialect/Calyx/CalyxOps.h"
 #include "circt/Dialect/Calyx/CalyxPasses.h"
 #include "circt/Support/LLVM.h"
@@ -20,14 +19,22 @@
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
+namespace circt {
+namespace calyx {
+#define GEN_PASS_DEF_GROUPINVARIANTCODEMOTION
+#include "circt/Dialect/Calyx/CalyxPasses.h.inc"
+} // namespace calyx
+} // namespace circt
+
 using namespace circt;
 using namespace calyx;
 using namespace mlir;
 
 namespace {
 
 struct GroupInvariantCodeMotionPass
-    : public GroupInvariantCodeMotionBase<GroupInvariantCodeMotionPass> {
+    : public circt::calyx::impl::GroupInvariantCodeMotionBase<
+          GroupInvariantCodeMotionPass> {
   void runOnOperation() override {
     auto wires = getOperation().getWiresOp();
     for (auto groupOp : wires.getOps<GroupOp>()) {

diff --git a/lib/Dialect/Calyx/Transforms/GoInsertion.cpp b/lib/Dialect/Calyx/Transforms/GoInsertion.cpp
@@ -10,21 +10,28 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetails.h"
 #include "circt/Dialect/Calyx/CalyxHelpers.h"
 #include "circt/Dialect/Calyx/CalyxOps.h"
 #include "circt/Dialect/Calyx/CalyxPasses.h"
 #include "circt/Support/LLVM.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/OperationSupport.h"
 
+namespace circt {
+namespace calyx {
+#define GEN_PASS_DEF_GOINSERTION
+#include "circt/Dialect/Calyx/CalyxPasses.h.inc"
+} // namespace calyx
+} // namespace circt
+
 using namespace circt;
 using namespace calyx;
 using namespace mlir;
 
 namespace {
 
-struct GoInsertionPass : public GoInsertionBase<GoInsertionPass> {
+struct GoInsertionPass
+    : public circt::calyx::impl::GoInsertionBase<GoInsertionPass> {
   void runOnOperation() override;
 };
 

diff --git a/lib/Dialect/Calyx/Transforms/PassDetails.h b/lib/Dialect/Calyx/Transforms/PassDetails.h
diff --git a/lib/Dialect/Calyx/Transforms/RemoveCombGroups.cpp b/lib/Dialect/Calyx/Transforms/RemoveCombGroups.cpp
@@ -72,7 +72,6 @@
 /// }
 /// ```
 
-#include "PassDetails.h"
 #include "circt/Dialect/Calyx/CalyxOps.h"
 #include "circt/Dialect/Calyx/CalyxPasses.h"
 #include "circt/Support/LLVM.h"
@@ -81,6 +80,13 @@
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
+namespace circt {
+namespace calyx {
+#define GEN_PASS_DEF_REMOVECOMBGROUPS
+#include "circt/Dialect/Calyx/CalyxPasses.h.inc"
+} // namespace calyx
+} // namespace circt
+
 using namespace circt;
 using namespace calyx;
 using namespace mlir;
@@ -203,7 +209,7 @@ struct RemoveCombGroupsPattern : public OpRewritePattern<calyx::CombGroupOp> {
 };
 
 struct RemoveCombGroupsPass
-    : public RemoveCombGroupsBase<RemoveCombGroupsPass> {
+    : public circt::calyx::impl::RemoveCombGroupsBase<RemoveCombGroupsPass> {
   void runOnOperation() override;
 
   /// Removes 'with' groups from an operation and instead schedules the group

diff --git a/lib/Dialect/Calyx/Transforms/RemoveGroups.cpp b/lib/Dialect/Calyx/Transforms/RemoveGroups.cpp
@@ -10,14 +10,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PassDetails.h"
 #include "circt/Dialect/Calyx/CalyxHelpers.h"
 #include "circt/Dialect/Calyx/CalyxOps.h"
 #include "circt/Dialect/Calyx/CalyxPasses.h"
 #include "circt/Support/LLVM.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/OperationSupport.h"
 
+namespace circt {
+namespace calyx {
+#define GEN_PASS_DEF_REMOVEGROUPS
+#include "circt/Dialect/Calyx/CalyxPasses.h.inc"
+} // namespace calyx
+} // namespace circt
+
 using namespace circt;
 using namespace calyx;
 using namespace mlir;
@@ -94,7 +100,8 @@ void inlineGroups(ComponentOp component) {
 
 namespace {
 
-struct RemoveGroupsPass : public RemoveGroupsBase<RemoveGroupsPass> {
+struct RemoveGroupsPass
+    : public circt::calyx::impl::RemoveGroupsBase<RemoveGroupsPass> {
   void runOnOperation() override;
 };