Merge pull request #9020 from gadfort/pdn-arb-straps

pdn: add option to allow stripes outside core area and add nets to report

Author: maliberty

src/pdn/README.md

@@ -215,6 +215,7 @@ add_pdn_stripe
     [-spacing spacing_value]
     [-starts_with POWER|GROUND]
     [-width width_value]
+    [-allow_out_of_core]
 ```
 
 #### Options
@@ -234,6 +235,7 @@ add_pdn_stripe
 | `[-spacing]` | Optional specification of the spacing between power/ground pairs within a single pitch (Default: pitch / 2). |
 | `[-starts_with]` | Specifies whether the first strap placed will be POWER or GROUND (Default: grid setting). This cannot be used with -followpins (Flip sites when initializing floorplan to change followpin power/ground order). |
 | `[-width]` | Value for the width of stripe. |
+| `-allow_out_of_core` | Allow stripes to continue beyond the core area. |
 
 ### Add Sroute Connect
 

src/pdn/include/pdn/PdnGen.hh

@@ -143,7 +143,8 @@ class PdnGen
                  bool snap,
                  StartsWith starts_with,
                  ExtensionMode extend,
-                 const std::vector<odb::dbNet*>& nets);
+                 const std::vector<odb::dbNet*>& nets,
+                 bool allow_out_of_core);
   void makeConnect(
       Grid* grid,
       odb::dbTechLayer* layer0,

src/pdn/src/PdnGen.cc

@@ -609,7 +609,8 @@ void PdnGen::makeStrap(Grid* grid,
                        bool snap,
                        StartsWith starts_with,
                        ExtensionMode extend,
-                       const std::vector<odb::dbNet*>& nets)
+                       const std::vector<odb::dbNet*>& nets,
+                       bool allow_out_of_core)
 {
   auto strap = std::make_unique<Straps>(
       grid, layer, width, pitch, spacing, number_of_straps);
@@ -620,6 +621,7 @@ void PdnGen::makeStrap(Grid* grid,
     strap->setStartWithPower(starts_with == POWER);
   }
   strap->setNets(nets);
+  strap->setAllowOutsideCoreArea(allow_out_of_core);
   grid->addStrap(std::move(strap));
 }
 

src/pdn/src/PdnGen.i

@@ -231,7 +231,8 @@ void make_strap(const char* grid_name,
                 bool use_grid_power_order,
                 bool starts_with_power,
                 pdn::ExtensionMode extend,
-                const std::vector<odb::dbNet*>& nets)
+                const std::vector<odb::dbNet*>& nets,
+                bool allow_out_of_core)
 {
   PdnGen* pdngen = ord::getPdnGen();
   StartsWith starts_with = GRID;
@@ -253,7 +254,8 @@ void make_strap(const char* grid_name,
                       snap,
                       starts_with,
                       extend,
-                      nets);
+                      nets,
+                      allow_out_of_core);
   }
 }
 

src/pdn/src/pdn.tcl

@@ -267,13 +267,14 @@ sta::define_cmd_args "add_pdn_stripe" {[-grid grid_name] \
                                        [-extend_to_boundary] \
                                        [-snap_to_grid] \
                                        [-number_of_straps count] \
-                                       [-nets list_of_nets]
+                                       [-nets list_of_nets]\
+                                       [-allow_out_of_core]
 }
 
 proc add_pdn_stripe { args } {
   sta::parse_key_args "add_pdn_stripe" args \
     keys {-grid -layer -width -pitch -spacing -offset -starts_with -number_of_straps -nets} \
-    flags {-followpins -extend_to_core_ring -extend_to_boundary -snap_to_grid}
+    flags {-followpins -extend_to_core_ring -extend_to_boundary -snap_to_grid -allow_out_of_core}
 
   sta::check_argc_eq0 "add_pdn_stripe" $args
 
@@ -377,7 +378,8 @@ proc add_pdn_stripe { args } {
       $use_grid_power_order \
       $start_with_power \
       $extend \
-      $nets
+      $nets \
+      [info exists flags(-allow_out_of_core)]
   }
 }
 

src/pdn/src/straps.cpp

@@ -98,7 +98,12 @@ void Straps::checkLayerSpecifications() const
 bool Straps::checkLayerOffsetSpecification(bool error) const
 {
   const int strap_width = getStrapGroupWidth();
-  const odb::Rect grid_area = getGrid()->getDomainArea();
+  odb::Rect grid_area = getGrid()->getDomainArea();
+  if (allow_out_of_core_) {
+    const odb::Rect die = getGrid()->getBlock()->getDieArea();
+    grid_area.set_xhi(die.xMax());
+    grid_area.set_yhi(die.yMax());
+  }
   int grid_width = 0;
   if (isHorizontal()) {
     grid_width = grid_area.dy();
@@ -216,7 +221,7 @@ void Straps::makeShapes(const Shape::ShapeTreeMap& other_shapes)
     makeStraps(x_start,
                core.yMin(),
                x_end,
-               core.yMax(),
+               allow_out_of_core_ ? die.yMax() : core.yMax(),
                abs_min,
                abs_max,
                false,
@@ -231,7 +236,7 @@ void Straps::makeShapes(const Shape::ShapeTreeMap& other_shapes)
 
     makeStraps(core.xMin(),
                y_start,
-               core.xMax(),
+               allow_out_of_core_ ? die.xMax() : core.xMax(),
                y_end,
                abs_min,
                abs_max,
@@ -366,6 +371,9 @@ void Straps::report() const
   if (number_of_straps_ > 0) {
     logger->report("    Number of strap sets: {}", number_of_straps_);
   }
+  if (getNets() != getGrid()->getNets()) {
+    logger->report("    Nets: {}", getNetString());
+  }
 }
 
 int Straps::getStrapGroupWidth() const
@@ -379,6 +387,20 @@ int Straps::getStrapGroupWidth() const
   return width;
 }
 
+std::string Straps::getNetString() const
+{
+  std::string nets;
+
+  for (auto* net : getNets()) {
+    if (!nets.empty()) {
+      nets += ", ";
+    }
+    nets += net->getName();
+  }
+
+  return nets;
+}
+
 ////
 
 FollowPins::FollowPins(Grid* grid, odb::dbTechLayer* layer, int width)
@@ -886,6 +908,7 @@ void PadDirectConnectionStraps::report() const
   if (type_ == ConnectionType::Edge) {
     logger->report("    Edge: {}", pad_edge_.getString());
   }
+  logger->report("    Net: {}", iterm_->getNet()->getName());
 }
 
 std::string PadDirectConnectionStraps::getName() const
@@ -1678,20 +1701,6 @@ RepairChannelStraps::RepairChannelStraps(
   }
 }
 
-std::string RepairChannelStraps::getNetString() const
-{
-  std::string nets;
-
-  for (auto* net : nets_) {
-    if (!nets.empty()) {
-      nets += ", ";
-    }
-    nets += net->getName();
-  }
-
-  return nets;
-}
-
 int RepairChannelStraps::getMaxLength() const
 {
   const odb::Rect core = getGrid()->getDomainArea();

src/pdn/src/straps.h

@@ -58,6 +58,10 @@ class Straps : public GridComponent
   {
     return direction_ == odb::dbTechLayerDir::HORIZONTAL;
   }
+  void setAllowOutsideCoreArea(bool allow_out_of_core)
+  {
+    allow_out_of_core_ = allow_out_of_core;
+  }
 
   void report() const override;
   Type type() const override { return GridComponent::Strap; }
@@ -70,6 +74,7 @@ class Straps : public GridComponent
 
  protected:
   bool checkLayerOffsetSpecification(bool error = false) const;
+  std::string getNetString() const;
 
  private:
   odb::dbTechLayer* layer_;
@@ -83,6 +88,7 @@ class Straps : public GridComponent
   ExtensionMode extend_mode_ = ExtensionMode::CORE;
   int strap_start_ = 0;
   int strap_end_ = 0;
+  bool allow_out_of_core_ = false;
 
   void makeStraps(int x_start,
                   int y_start,
@@ -276,8 +282,6 @@ class RepairChannelStraps : public Straps
                        int bisect_dist = 0,
                        int level = 0);
 
-  std::string getNetString() const;
-
   static std::vector<RepairChannelArea> findRepairChannels(
       Grid* grid,
       const Shape::ShapeTree& shapes,

src/pdn/test/BUILD

@@ -47,6 +47,7 @@ COMPULSORY_TESTS = [
     "core_grid_start_power",
     "core_grid_start_power_strap_ground",
     "core_grid_strap_count",
+    "core_grid_strap_outside_core",
     "core_grid_via_snap",
     "core_grid_with_M6_min_area",
     "core_grid_with_M7_pins",

src/pdn/test/CMakeLists.txt

@@ -44,6 +44,7 @@ or_integration_tests(
     core_grid_start_power
     core_grid_start_power_strap_ground
     core_grid_strap_count
+    core_grid_strap_outside_core
     core_grid_via_snap
     core_grid_with_M6_min_area
     core_grid_with_M7_pins