Merge pull request #8849 from gadfort/pdn-repair-vias

pdn: correct repair via behavior when repairing the same strap multiple times

Author: maliberty

src/pdn/src/PdnGen.cc

@@ -134,11 +134,13 @@ void PdnGen::buildGrids(bool trim)
                   Grid::typeToString(grid->type()));
     failed = true;
   }
+
+  updateRenderer();
+
   if (failed) {
     logger_->error(utl::PDN, 233, "Failed to generate full power grid.");
   }
 
-  updateRenderer();
   debugPrint(logger_, utl::PDN, "Make", 1, "Build - end");
 }
 
@@ -154,6 +156,8 @@ void PdnGen::cleanupVias()
 
 void PdnGen::updateVias()
 {
+  debugPrint(logger_, utl::PDN, "Make", 2, "Update vias - start");
+
   const auto grids = getGrids();
 
   for (auto* grid : grids) {
@@ -171,6 +175,8 @@ void PdnGen::updateVias()
       via->getUpperShape()->addVia(via);
     }
   }
+
+  debugPrint(logger_, utl::PDN, "Make", 2, "Update vias - end");
 }
 
 void PdnGen::trimShapes()

src/pdn/src/grid.cpp

@@ -313,18 +313,30 @@ bool Grid::repairVias(const Shape::ShapeTreeMap& global_shapes,
     }
 
     if (lower_belongs_to_grid && lower_shape->isModifiable()) {
+      Shape* extend_test = lower_shape.get();
+      auto find_replace = replace_shapes.find(extend_test);
+      if (find_replace != replace_shapes.end()) {
+        extend_test = find_replace->second.get();
+      }
       auto new_lower
-          = lower_shape->extendTo(upper_shape->getRect(),
-                                  obstructions[lower_shape->getLayer()],
+          = extend_test->extendTo(upper_shape->getRect(),
+                                  obstructions[extend_test->getLayer()],
+                                  lower_shape.get(),
                                   obs_filter);
       if (new_lower != nullptr) {
         replace_shapes[lower_shape.get()] = std::move(new_lower);
       }
     }
     if (upper_belongs_to_grid && upper_shape->isModifiable()) {
+      Shape* extend_test = upper_shape.get();
+      auto find_replace = replace_shapes.find(extend_test);
+      if (find_replace != replace_shapes.end()) {
+        extend_test = find_replace->second.get();
+      }
       auto new_upper
-          = upper_shape->extendTo(lower_shape->getRect(),
-                                  obstructions[upper_shape->getLayer()],
+          = extend_test->extendTo(lower_shape->getRect(),
+                                  obstructions[extend_test->getLayer()],
+                                  upper_shape.get(),
                                   obs_filter);
       if (new_upper != nullptr) {
         replace_shapes[upper_shape.get()] = std::move(new_upper);
@@ -773,7 +785,8 @@ void Grid::makeVias(const Shape::ShapeTreeMap& global_shapes,
 void Grid::makeVias(const Shape::ShapeTreeMap& global_shapes,
                     const Shape::ObstructionTreeMap& obstructions)
 {
-  debugPrint(getLogger(), utl::PDN, "Make", 1, "Making vias in \"{}\"", name_);
+  debugPrint(
+      getLogger(), utl::PDN, "Make", 1, "Making vias in \"{}\" - start", name_);
   Shape::ShapeTreeMap search_shapes = getShapes();
 
   odb::Rect search_area = getDomainBoundary();
@@ -896,6 +909,8 @@ void Grid::makeVias(const Shape::ShapeTreeMap& global_shapes,
     via->getLowerShape()->addVia(via);
     via->getUpperShape()->addVia(via);
   }
+  debugPrint(
+      getLogger(), utl::PDN, "Make", 1, "Making vias in \"{}\" - end", name_);
 }
 
 void Grid::getVias(std::vector<ViaPtr>& vias) const

src/pdn/src/grid_component.cpp

@@ -180,6 +180,12 @@ ShapePtr GridComponent::addShape(std::unique_ptr<Shape> shape)
 
 void GridComponent::removeShape(Shape* shape)
 {
+  debugPrint(getLogger(),
+             utl::PDN,
+             "Shape",
+             3,
+             "Removing shape {}.",
+             shape->getReportText());
   for (const auto& via : shape->getVias()) {
     via->removeShape(shape);
   }

src/pdn/src/shape.cpp

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "boost/geometry/geometry.hpp"
+#include "boost/geometry/index/predicates.hpp"
 #include "boost/polygon/polygon.hpp"
 #include "grid.h"
 #include "grid_component.h"
@@ -596,6 +597,7 @@ std::string Shape::getRectText(const odb::Rect& rect, double dbu_to_micron)
 std::unique_ptr<Shape> Shape::extendTo(
     const odb::Rect& rect,
     const ObstructionTree& obstructions,
+    Shape* orig_shape,
     const std::function<bool(const ShapePtr&)>& obs_filter) const
 {
   std::unique_ptr<Shape> new_shape = copy();
@@ -616,9 +618,9 @@ std::unique_ptr<Shape> Shape::extendTo(
   }
 
   if (obstructions.qbegin(bgi::intersects(new_shape->getRect())
-                          && bgi::satisfies([this](const auto& other) {
+                          && bgi::satisfies([&orig_shape](const auto& other) {
                                // ignore violations that results from itself
-                               return other.get() != this;
+                               return other.get() != orig_shape;
                              })
                           && bgi::satisfies(obs_filter))
       != obstructions.qend()) {

src/pdn/src/shape.h

@@ -178,6 +178,7 @@ class Shape
   std::unique_ptr<Shape> extendTo(
       const odb::Rect& rect,
       const ObstructionTree& obstructions,
+      Shape* orig_shape,
       const std::function<bool(const ShapePtr&)>& obs_filter
       = [](const ShapePtr&) { return true; }) const;
 

src/pdn/test/BUILD

@@ -52,6 +52,7 @@ COMPULSORY_TESTS = [
     "core_grid_with_M7_pins",
     "core_grid_with_dual_rings",
     "core_grid_with_fixed_pins",
+    "core_grid_with_m2_straps",
     "core_grid_with_rings",
     "core_grid_with_rings_connect",
     "core_grid_with_rings_different_offset",

src/pdn/test/CMakeLists.txt

@@ -49,6 +49,7 @@ or_integration_tests(
     core_grid_with_M7_pins
     core_grid_with_dual_rings
     core_grid_with_fixed_pins
+    core_grid_with_m2_straps
     core_grid_with_rings
     core_grid_with_rings_connect
     core_grid_with_rings_different_offset