Advanced LayerSink

include/circt/Dialect/FIRRTL/Passes.h

@@ -195,6 +195,8 @@ std::unique_ptr<mlir::Pass> createLayerMergePass();
 
 std::unique_ptr<mlir::Pass> createLayerSinkPass();
 
+std::unique_ptr<mlir::Pass> createAdvancedLayerSinkPass();
+
 std::unique_ptr<mlir::Pass> createMaterializeDebugInfoPass();
 
 std::unique_ptr<mlir::Pass> createLintingPass();

include/circt/Dialect/FIRRTL/Passes.td

@@ -857,6 +857,15 @@ def LayerSink : Pass<"firrtl-layer-sink", "firrtl::FModuleOp"> {
   ];
 }
 
+def AdvancedLayerSink : Pass<"firrtl-advanced-layer-sink", "firrtl::CircuitOp"> {
+  let summary = "Sink operations into layer blocks";
+  let description = [{
+    This pass sinks ops into layers, whenever possible, to minimize unused
+    hardware in the design.
+  }];
+  let constructor = "::circt::firrtl::createAdvancedLayerSinkPass()";
+}
+
 def MaterializeDebugInfo :
     Pass<"firrtl-materialize-debug-info", "firrtl::FModuleOp"> {
   let summary = "Generate debug ops to track FIRRTL values";

include/circt/Firtool/Firtool.h

@@ -98,6 +98,7 @@ class FirtoolOptions {
   bool shouldConvertProbesToSignals() const { return probesToSignals; }
   bool shouldReplaceSequentialMemories() const { return replSeqMem; }
   bool shouldDisableOptimization() const { return disableOptimization; }
+  bool shouldAdvancedLayerSink() const { return advancedLayerSink; }
   bool shouldLowerMemories() const { return lowerMemories; }
   bool shouldDedup() const { return !noDedup; }
   bool shouldEnableDebugInfo() const { return enableDebugInfo; }
@@ -231,6 +232,11 @@ class FirtoolOptions {
     return *this;
   }
 
+  FirtoolOptions &setAdvancedLayerSink(bool value) {
+    advancedLayerSink = value;
+    return *this;
+  }
+
   FirtoolOptions &setLowerMemories(bool value) {
     lowerMemories = value;
     return *this;
@@ -382,6 +388,7 @@ class FirtoolOptions {
   bool disableAggressiveMergeConnections;
   bool emitOMIR;
   std::string omirOutFile;
+  bool advancedLayerSink;
   bool lowerMemories;
   std::string blackBoxRootPath;
   bool replSeqMem;