Merge remote-tracking branch 'origin/master' into web-lockup

Author: gadfort

src/pad/README.md

@@ -392,6 +392,7 @@ rdl_route
     [-spacing spacing]
     [-turn_penalty penalty]
     [-allow45]
+    [-fixed]
     [-max_iterations max_iterations]
     nets
 ```
@@ -408,6 +409,7 @@ rdl_route
 | `-turn_penalty` | Scaling factor to apply to discurage turning to allow for straighter routes. The default value is `2.0`, and the allowed values are floats. |
 | `-max_iterations` | Maximum number of router iterations. The default value is `10`. |
 | `-allow45` | Specifies that 45 degree routing is permitted. |
+| `-fixed` | When specified, routes will be marked as fixed. |
 | `nets` | Nets to route. |
 
 ### Selectively routing terminals

src/pad/include/pad/ICeWall.h

@@ -99,6 +99,7 @@ class ICeWall
                 int width = 0,
                 int spacing = 0,
                 bool allow45 = false,
+                bool fixed = false,
                 float turn_penalty = 2.0,
                 int max_iterations = 10);
   void routeRDLDebugGUI(bool enable);

src/pad/src/ICeWall.cpp

@@ -1444,6 +1444,7 @@ void ICeWall::routeRDL(odb::dbTechLayer* layer,
                        int width,
                        int spacing,
                        bool allow45,
+                       bool fixed,
                        float turn_penalty,
                        int max_iterations)
 {
@@ -1460,6 +1461,7 @@ void ICeWall::routeRDL(odb::dbTechLayer* layer,
                                         width,
                                         spacing,
                                         allow45,
+                                        fixed,
                                         turn_penalty,
                                         max_iterations);
   router_->setRDLDebugNet(rdl_net_debug_);

src/pad/src/RDLRouter.cpp

@@ -157,6 +157,7 @@ RDLRouter::RDLRouter(
     int width,
     int spacing,
     bool allow45,
+    bool fixed,
     float turn_penalty,
     int max_iterations)
     : logger_(logger),
@@ -167,6 +168,7 @@ RDLRouter::RDLRouter(
       width_(width),
       spacing_(spacing),
       allow45_(allow45),
+      fixed_(fixed),
       turn_penalty_(turn_penalty),
       max_router_iterations_(max_iterations),
       routing_map_(routing_map),
@@ -1729,7 +1731,8 @@ void RDLRouter::writeToDb(odb::dbNet* net,
     return;
   }
 
-  odb::dbSWire* swire = odb::dbSWire::create(net, odb::dbWireType::ROUTED);
+  odb::dbSWire* swire = odb::dbSWire::create(
+      net, fixed_ ? odb::dbWireType::FIXED : odb::dbWireType::ROUTED);
   for (const odb::Rect& stub : stubs) {
     odb::dbSBox::create(swire,
                         layer_,

src/pad/src/RDLRouter.h

@@ -133,6 +133,7 @@ class RDLRouter
             int width,
             int spacing,
             bool allow45,
+            bool fixed,
             float turn_penalty,
             int max_iterations);
   ~RDLRouter();
@@ -247,6 +248,7 @@ class RDLRouter
   int width_;
   int spacing_;
   bool allow45_;
+  bool fixed_;
   float turn_penalty_;
   int max_router_iterations_;
 

src/pad/src/pad.i

@@ -138,10 +138,11 @@ void route_rdl(odb::dbTechLayer* layer,
                odb::dbTechVia* pad_via,
                const std::vector<odb::dbNet*>& nets,
                int width = 0, int spacing = 0, bool allow45 = false,
+               bool fixed = false,
                float penalty = 2.0,
                int max_iterations = 10)
 {
-  ord::getICeWall()->routeRDL(layer, bump_via, pad_via, nets, width, spacing, allow45, penalty, max_iterations);
+  ord::getICeWall()->routeRDL(layer, bump_via, pad_via, nets, width, spacing, allow45, fixed, penalty, max_iterations);
 }
 
 void route_rdl_gui(bool enable)

src/pad/src/pad.tcl

@@ -398,12 +398,13 @@ sta::define_cmd_args "rdl_route" {-layer layer \
                                   [-turn_penalty penalty] \
                                   [-allow45] \
                                   [-max_iterations iterations] \
+                                  [-fixed] \
                                   nets}
 
 proc rdl_route { args } {
   sta::parse_key_args "rdl_route" args \
     keys {-layer -width -spacing -bump_via -pad_via -turn_penalty -max_iterations} \
-    flags {-allow45}
+    flags {-allow45 -fixed}
 
   if { [llength $args] == 1 } {
     set args [lindex $args 0]
@@ -471,6 +472,7 @@ proc rdl_route { args } {
     $nets \
     $width $spacing \
     [info exists flags(-allow45)] \
+    [info exists flags(-fixed)] \
     $penalty \
     $max_iterations
 }

src/pad/test/BUILD

@@ -53,6 +53,7 @@ COMPULSORY_TESTS = [
     "rdl_route_bump_to_bump_only",
     "rdl_route_bump_via",
     "rdl_route_failed",
+    "rdl_route_fixed",
     "rdl_route_invalid",
     "rdl_route_keep_existing",
     "rdl_route_max_iterations",

src/pad/test/CMakeLists.txt

@@ -46,6 +46,7 @@ or_integration_tests(
     rdl_route_bump_to_bump_only
     rdl_route_bump_via
     rdl_route_failed
+    rdl_route_fixed
     rdl_route_invalid
     rdl_route_keep_existing
     rdl_route_max_iterations