rsz: add -net and -subdivide_step to set_debug

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/rsz/src/Graphics.cc

@@ -42,11 +42,45 @@ Graphics::Graphics()
   gui::Gui::get()->registerRenderer(this);
 }
 
+void Graphics::setNet(odb::dbNet* net)
+{
+  net_ = net;
+  if (!net) {
+    subdivide_ignore_ = false;
+  }
+}
+
+void Graphics::stopOnSubdivideStep(const bool stop)
+{
+  stop_on_subdivide_step_ = stop;
+}
+
+void Graphics::subdivideStart(odb::dbNet* net)
+{
+  lines_.clear();
+  if (net_) {
+    subdivide_ignore_ = (net != net_);
+  }
+}
+
 void Graphics::subdivide(const odb::Line& line)
 {
+  if (subdivide_ignore_) {
+    return;
+  }
   lines_.emplace_back(line);
-  gui::Gui::get()->redraw();
-  gui::Gui::get()->pause();
+  if (stop_on_subdivide_step_) {
+    gui::Gui::get()->redraw();
+    gui::Gui::get()->pause();
+  }
+}
+
+void Graphics::subdivideDone()
+{
+  if (!subdivide_ignore_) {
+    gui::Gui::get()->redraw();
+    gui::Gui::get()->pause();
+  }
 }
 
 void Graphics::drawObjects(gui::Painter& painter)

src/rsz/src/Graphics.hh

@@ -46,13 +46,22 @@ class Graphics : public gui::Renderer, public ResizerObserver
   Graphics();
 
   // ResizerObserver
+  void setNet(odb::dbNet* net) override;
+  void stopOnSubdivideStep(bool stop) override;
+  void subdivideStart(odb::dbNet* net) override;
   void subdivide(const odb::Line& line) override;
+  void subdivideDone() override;
 
   // Renderer
   void drawObjects(gui::Painter& painter) override;
 
  private:
+  odb::dbNet* net_{nullptr};
   std::vector<odb::Line> lines_;
+  // Ingore this net if true
+  bool subdivide_ignore_{false};
+  // stop at each step?
+  bool stop_on_subdivide_step_{false};
 };
 
 }  // namespace rsz

src/rsz/src/RepairDesign.cc

@@ -671,7 +671,7 @@ void RepairDesign::repairNet(Net* net,
         repaired_net = true;
 
         debugPrint(logger_, RSZ, "repair_net", 3, "fanout violation");
-        LoadRegion region = findLoadRegions(drvr_pin, max_fanout);
+        LoadRegion region = findLoadRegions(net, drvr_pin, max_fanout);
         corner_ = corner;
         makeRegionRepeaters(region,
                             max_fanout,
@@ -1481,12 +1481,21 @@ LoadRegion::LoadRegion(PinSeq& pins, Rect& bbox) : pins_(pins), bbox_(bbox)
 {
 }
 
-LoadRegion RepairDesign::findLoadRegions(const Pin* drvr_pin, int max_fanout)
+LoadRegion RepairDesign::findLoadRegions(const Net* net,
+                                         const Pin* drvr_pin,
+                                         int max_fanout)
 {
   PinSeq loads = findLoads(drvr_pin);
   Rect bbox = findBbox(loads);
   LoadRegion region(loads, bbox);
+  if (graphics_) {
+    odb::dbNet* db_net = db_network_->staToDb(net);
+    graphics_->subdivideStart(db_net);
+  }
   subdivideRegion(region, max_fanout);
+  if (graphics_) {
+    graphics_->subdivideDone();
+  }
   return region;
 }
 
@@ -2242,7 +2251,7 @@ void RepairDesign::reportViolationCounters(bool invalidate_driver_vertices,
 
 void RepairDesign::setDebugGraphics(std::shared_ptr<ResizerObserver> graphics)
 {
-  graphics_ = graphics;
+  graphics_ = std::move(graphics);
 }
 
 }  // namespace rsz

src/rsz/src/RepairDesign.hh

@@ -199,7 +199,9 @@ class RepairDesign : dbStaState
                       double load_cap,
                       double slew,
                       const DcalcAnalysisPt* dcalc_ap);
-  LoadRegion findLoadRegions(const Pin* drvr_pin, int max_fanout);
+  LoadRegion findLoadRegions(const Net* net,
+                             const Pin* drvr_pin,
+                             int max_fanout);
   void subdivideRegion(LoadRegion& region, int max_fanout);
   void makeRegionRepeaters(LoadRegion& region,
                            int max_fanout,

src/rsz/src/Resizer.cc

@@ -4609,8 +4609,8 @@ void Resizer::copyDontUseFromLiberty()
 
 void Resizer::setDebugGraphics(std::shared_ptr<ResizerObserver> graphics)
 {
-  graphics_ = graphics;
   repair_design_->setDebugGraphics(graphics);
+  graphics_ = std::move(graphics);
 }
 
 }  // namespace rsz

src/rsz/src/Resizer.i

@@ -778,10 +778,20 @@ void report_equiv_cells_cmd(LibertyCell* cell, bool match_cell_footprint)
   resizer->reportEquivalentCells(cell, match_cell_footprint);
 }
 
-void set_debug_cmd()
+void set_debug_cmd(const char* net_name,
+                   const bool subdivide_step)
 {
   Resizer* resizer = getResizer();
+
+  odb::dbNet* net = nullptr;
+  if (net_name) {
+    auto block = ord::OpenRoad::openRoad()->getDb()->getChip()->getBlock();
+    net = block->findNet(net_name);
+  }
+
   auto graphics = std::make_shared<Graphics>();
+  graphics->setNet(net);
+  graphics->stopOnSubdivideStep(subdivide_step);
   resizer->setDebugGraphics(std::move(graphics));
 }
 

src/rsz/src/Resizer.tcl

@@ -982,10 +982,17 @@ proc repair_setup_pin { end_pin } {
 
 proc set_debug { args } {
   sta::parse_key_args "set_debug" args \
-    keys { } \
-    flags { } ;# checker off
+    keys { -net } \
+    flags { -subdivide_step } ;# checker off
 
-  rsz::set_debug_cmd
+  set net ""
+  if { [info exists keys(-net)] } {
+    set net $keys(-net)
+  }
+
+  set subdivide_step [info exists flags(-subdivide_step)]
+  
+  rsz::set_debug_cmd $net $subdivide_step
 }
 
 proc report_swappable_pins { } {

src/rsz/src/ResizerObserver.hh

@@ -35,6 +35,7 @@
 
 #pragma once
 
+#include "odb/db.h"
 #include "odb/geom.h"
 
 namespace rsz {
@@ -44,7 +45,12 @@ class ResizerObserver
  public:
   virtual ~ResizerObserver() = default;
 
+  virtual void setNet(odb::dbNet* net) {}
+  virtual void stopOnSubdivideStep(bool stop) {}
+
+  virtual void subdivideStart(odb::dbNet* net) {}
   virtual void subdivide(const odb::Line& line) {}
+  virtual void subdivideDone() {}
 };
 
 }  // namespace rsz