Merge pull request #10421 from eder-matheus/grt_cugr_layer_idx

grt: fix CUGR min routing layer index

Author: eder-matheus

src/grt/src/cugr/src/CUGR.cpp

@@ -82,6 +82,7 @@ void CUGR::init(const int min_routing_layer,
                 const int max_routing_layer,
                 const std::set<odb::dbNet*>& clock_nets)
 {
+  constants_.min_routing_layer = min_routing_layer - 1;
   design_ = std::make_unique<Design>(db_,
                                      logger_,
                                      constants_,

src/grt/src/cugr/src/Design.cpp

@@ -85,8 +85,8 @@ void Design::readNetlist()
 
     auto pins = makeNetPins(db_net);
 
-    LayerRange layer_range
-        = {.min_layer = min_routing_layer_, .max_layer = max_routing_layer_};
+    LayerRange layer_range = {.min_layer = min_routing_layer_ - 1,
+                              .max_layer = max_routing_layer_ - 1};
     const int min_clk_layer = block_->getMinLayerForClock();
     const int max_clk_layer = block_->getMaxLayerForClock();
     if (clock_nets_.find(db_net) != clock_nets_.end() && min_clk_layer > 0
@@ -159,11 +159,14 @@ void Design::updateNet(odb::dbNet* db_net)
 
   auto pins = makeNetPins(db_net);
 
-  LayerRange layer_range
-      = {.min_layer = min_routing_layer_, .max_layer = max_routing_layer_};
-  if (clock_nets_.find(db_net) != clock_nets_.end()) {
-    layer_range.min_layer = block_->getMinLayerForClock() - 1;
-    layer_range.max_layer = block_->getMaxLayerForClock() - 1;
+  LayerRange layer_range = {.min_layer = min_routing_layer_ - 1,
+                            .max_layer = max_routing_layer_ - 1};
+  const int min_clk_layer = block_->getMinLayerForClock();
+  const int max_clk_layer = block_->getMaxLayerForClock();
+  if (clock_nets_.find(db_net) != clock_nets_.end() && min_clk_layer > 0
+      && max_clk_layer > 0) {
+    layer_range.min_layer = min_clk_layer - 1;
+    layer_range.max_layer = max_clk_layer - 1;
   }
 
   auto it = db_net_to_id_.find(db_net);

src/grt/test/clock_route_cugr.guideok

@@ -39,179 +39,132 @@ clknet_2_0__leaf_clk
 100800 93600 108000 100800 li1
 100800 93600 108000 100800 met1
 100800 93600 108000 115200 met2
-100800 108000 108000 115200 met2
-93600 108000 108000 115200 met3
-100800 108000 115200 115200 met3
-64800 108000 100800 115200 met3
+100800 108000 108000 115200 met1
+93600 108000 108000 115200 met1
+100800 108000 115200 115200 met1
+64800 108000 100800 115200 met1
 93600 108000 100800 115200 li1
-93600 108000 100800 115200 met1
-93600 108000 100800 115200 met2
 64800 108000 72000 115200 li1
-64800 108000 72000 115200 met1
-64800 108000 72000 115200 met2
-108000 108000 122400 115200 met3
-108000 108000 115200 115200 met2
+108000 108000 122400 115200 met1
+108000 108000 115200 115200 met1
 115200 108000 122400 115200 li1
-115200 108000 122400 115200 met1
-115200 108000 122400 115200 met2
 108000 108000 115200 122400 met2
 108000 115200 115200 129600 met2
-108000 115200 115200 122400 met2
+108000 115200 115200 122400 met1
 108000 122400 115200 151200 met2
 108000 122400 115200 129600 li1
 108000 122400 115200 129600 met1
-108000 144000 115200 151200 met2
-108000 144000 129600 151200 met3
-93600 144000 115200 151200 met3
-122400 144000 129600 151200 li1
-122400 144000 129600 151200 met1
-122400 144000 129600 151200 met2
-93600 144000 100800 151200 met2
-93600 144000 100800 158400 met2
+108000 144000 115200 158400 met2
+108000 144000 115200 151200 met1
+108000 151200 115200 158400 met1
+93600 151200 115200 158400 met1
 93600 151200 100800 158400 li1
-93600 151200 100800 158400 met1
-108000 115200 129600 122400 met3
+108000 144000 129600 151200 met1
+122400 144000 129600 151200 li1
+108000 115200 129600 122400 met1
 122400 115200 129600 122400 li1
-122400 115200 129600 122400 met1
-122400 115200 129600 122400 met2
 )
 clknet_2_1__leaf_clk
 (
 108000 151200 115200 158400 li1
 108000 151200 115200 158400 met1
 108000 151200 115200 165600 met2
 108000 158400 115200 180000 met2
-108000 158400 115200 165600 met2
-108000 158400 115200 165600 li1
 108000 158400 115200 165600 met1
 108000 172800 115200 194400 met2
-108000 172800 115200 180000 met2
-108000 172800 115200 180000 li1
 108000 172800 115200 180000 met1
 108000 187200 115200 208800 met2
-108000 187200 115200 194400 met2
-108000 201600 115200 208800 met2
-108000 201600 115200 208800 li1
+108000 187200 115200 194400 met1
 108000 201600 115200 208800 met1
-93600 201600 115200 208800 met3
+93600 201600 115200 208800 met1
+108000 201600 115200 208800 li1
 93600 201600 100800 208800 li1
-93600 201600 100800 208800 met1
-93600 201600 100800 208800 met2
-100800 187200 115200 194400 met3
-108000 187200 122400 194400 met3
+100800 187200 115200 194400 met1
+108000 187200 122400 194400 met1
 100800 187200 108000 194400 li1
-100800 187200 108000 194400 met1
-100800 187200 108000 194400 met2
 115200 187200 122400 194400 li1
-115200 187200 122400 194400 met1
-115200 187200 122400 194400 met2
-93600 172800 115200 180000 met3
+93600 172800 115200 180000 met1
+108000 172800 115200 180000 li1
 93600 172800 100800 180000 li1
-93600 172800 100800 180000 met1
-93600 172800 100800 180000 met2
-79200 158400 115200 165600 met3
+79200 158400 115200 165600 met1
+108000 158400 115200 165600 li1
 79200 158400 86400 165600 li1
-79200 158400 86400 165600 met1
-79200 158400 86400 165600 met2
 )
 clknet_2_2__leaf_clk
 (
 136800 115200 144000 122400 li1
 136800 115200 144000 122400 met1
 136800 115200 144000 129600 met2
 136800 122400 144000 136800 met2
-136800 122400 144000 129600 met2
+136800 122400 144000 129600 met1
 136800 129600 144000 144000 met2
 136800 129600 144000 136800 li1
 136800 129600 144000 136800 met1
-136800 136800 144000 144000 met2
-136800 136800 151200 144000 met3
-129600 136800 144000 144000 met3
-144000 136800 151200 144000 li1
-144000 136800 151200 144000 met1
-144000 136800 151200 144000 met2
-129600 136800 136800 144000 met2
-129600 136800 136800 151200 met2
+136800 136800 144000 151200 met2
+136800 136800 144000 144000 met1
+136800 144000 144000 151200 met1
+129600 144000 144000 151200 met1
 129600 144000 136800 151200 li1
-129600 144000 136800 151200 met1
-136800 122400 151200 129600 met3
-144000 122400 158400 129600 met3
-144000 122400 151200 129600 met2
+136800 136800 151200 144000 met1
+144000 136800 151200 144000 li1
+136800 122400 151200 129600 met1
+144000 122400 158400 129600 met1
+144000 122400 151200 129600 met1
 151200 122400 158400 129600 li1
-151200 122400 158400 129600 met1
-151200 122400 158400 129600 met2
 144000 100800 151200 129600 met2
-144000 100800 151200 108000 met2
-144000 100800 151200 108000 li1
 144000 100800 151200 108000 met1
-144000 100800 165600 108000 met3
-158400 100800 194400 108000 met3
+144000 100800 165600 108000 met1
+144000 100800 151200 108000 li1
+158400 100800 194400 108000 met1
 158400 100800 165600 108000 li1
-158400 100800 165600 108000 met1
-158400 100800 165600 108000 met2
-187200 100800 194400 108000 met2
+187200 100800 194400 108000 met1
 187200 100800 194400 115200 met2
 187200 108000 194400 122400 met2
 187200 108000 194400 115200 li1
 187200 108000 194400 115200 met1
 187200 115200 194400 144000 met2
-187200 115200 194400 122400 met2
+187200 115200 194400 122400 met1
 187200 136800 194400 144000 li1
 187200 136800 194400 144000 met1
-187200 115200 201600 122400 met3
+187200 115200 201600 122400 met1
 194400 115200 201600 122400 li1
-194400 115200 201600 122400 met1
-194400 115200 201600 122400 met2
 )
 clknet_2_3__leaf_clk
 (
 136800 158400 144000 165600 li1
-136800 158400 144000 165600 met1
-136800 158400 144000 165600 met2
-136800 158400 151200 165600 met3
-144000 158400 158400 165600 met3
+136800 158400 151200 165600 met1
+144000 158400 158400 165600 met1
 144000 158400 151200 165600 li1
-144000 158400 151200 165600 met1
-144000 158400 151200 165600 met2
-151200 158400 165600 165600 met3
-151200 158400 158400 165600 met2
+151200 158400 165600 165600 met1
+151200 158400 158400 165600 met1
 158400 158400 165600 165600 li1
-158400 158400 165600 165600 met1
-158400 158400 165600 165600 met2
 151200 158400 158400 180000 met2
 151200 172800 158400 194400 met2
 151200 172800 158400 180000 li1
 151200 172800 158400 180000 met1
-151200 187200 158400 194400 met2
-144000 187200 158400 194400 met3
-151200 187200 165600 194400 met3
-136800 187200 151200 194400 met3
+151200 187200 158400 194400 met1
+144000 187200 158400 194400 met1
+151200 187200 165600 194400 met1
+136800 187200 151200 194400 met1
 144000 187200 151200 194400 li1
-144000 187200 151200 194400 met1
-144000 187200 151200 194400 met2
-136800 187200 144000 194400 met2
+136800 187200 144000 194400 met1
 136800 187200 144000 201600 met2
 136800 194400 144000 208800 met2
-136800 194400 144000 201600 met2
+136800 194400 144000 201600 met1
 136800 201600 144000 208800 li1
 136800 201600 144000 208800 met1
-122400 194400 144000 201600 met3
+122400 194400 144000 201600 met1
 122400 194400 129600 201600 li1
-122400 194400 129600 201600 met1
-122400 194400 129600 201600 met2
-158400 187200 172800 194400 met3
-158400 187200 165600 194400 met2
-165600 187200 194400 194400 met3
+158400 187200 172800 194400 met1
+158400 187200 165600 194400 met1
+165600 187200 194400 194400 met1
 165600 187200 172800 194400 li1
-165600 187200 172800 194400 met1
-165600 187200 172800 194400 met2
-187200 187200 201600 194400 met3
-187200 187200 194400 194400 met2
-194400 187200 201600 194400 met2
-194400 165600 201600 194400 met2
-194400 165600 201600 172800 li1
-194400 165600 201600 172800 met1
+187200 187200 194400 194400 met1
+187200 165600 194400 194400 met2
 187200 187200 194400 208800 met2
+187200 165600 194400 172800 met1
+187200 165600 201600 172800 met1
+194400 165600 201600 172800 li1
 187200 201600 194400 208800 li1
 187200 201600 194400 208800 met1
 158400 187200 165600 201600 met2
@@ -224,60 +177,43 @@ clknet_2_3__leaf_clk
 net55
 (
 100800 136800 108000 144000 li1
-100800 136800 108000 144000 met1
-100800 136800 108000 144000 met2
-100800 136800 115200 144000 met3
-108000 136800 115200 144000 met2
-108000 136800 115200 165600 met2
-108000 136800 115200 144000 li1
+100800 136800 115200 144000 met1
 108000 136800 115200 144000 met1
+108000 136800 115200 144000 li1
+108000 136800 115200 165600 met2
 108000 158400 115200 187200 met2
 108000 158400 115200 165600 li1
 108000 158400 115200 165600 met1
 108000 180000 115200 201600 met2
 108000 180000 115200 187200 li1
 108000 180000 115200 187200 met1
-108000 194400 115200 201600 met2
-108000 194400 115200 201600 li1
 108000 194400 115200 201600 met1
-108000 194400 122400 201600 met3
-115200 194400 129600 201600 met3
+108000 194400 122400 201600 met1
+108000 194400 115200 201600 li1
+115200 194400 129600 201600 met1
 115200 194400 122400 201600 li1
-115200 194400 122400 201600 met1
-115200 194400 122400 201600 met2
-122400 194400 144000 201600 met3
+122400 194400 144000 201600 met1
 122400 194400 129600 201600 li1
-122400 194400 129600 201600 met1
-122400 194400 129600 201600 met2
-136800 194400 144000 201600 met2
-136800 187200 144000 201600 met2
-136800 194400 144000 201600 li1
 136800 194400 144000 201600 met1
+136800 194400 144000 201600 li1
+136800 187200 144000 201600 met2
 136800 187200 144000 194400 li1
 136800 187200 144000 194400 met1
 )
 net56
 (
 108000 122400 115200 129600 li1
-108000 122400 115200 129600 met1
-108000 122400 115200 129600 met2
-108000 122400 122400 129600 met3
-115200 122400 136800 129600 met3
-115200 122400 122400 129600 met2
+108000 122400 122400 129600 met1
+115200 122400 136800 129600 met1
+115200 122400 122400 129600 met1
 129600 122400 136800 129600 li1
-129600 122400 136800 129600 met1
-129600 122400 136800 129600 met2
 115200 122400 122400 144000 met2
 115200 136800 122400 144000 met1
 )
 net57
 (
-115200 158400 122400 165600 met1
-115200 158400 122400 165600 met2
-115200 158400 136800 165600 met3
+115200 158400 136800 165600 met1
 129600 158400 136800 165600 li1
-129600 158400 136800 165600 met1
-129600 158400 136800 165600 met2
 )
 net58
 (
@@ -310,12 +246,8 @@ net61
 net62
 (
 129600 187200 136800 194400 li1
-129600 187200 136800 194400 met1
-129600 187200 136800 194400 met2
-129600 187200 144000 194400 met3
+129600 187200 144000 194400 met1
 136800 187200 144000 194400 li1
-136800 187200 144000 194400 met1
-136800 187200 144000 194400 met2
 )
 net63
 (

src/grt/test/clock_route_cugr.ok

@@ -40,7 +40,7 @@ Stage 1: Pattern routing.
 Nets with overflow: 0.
 Routing statistics
 Wire length:           2918
-Total via count:       203
+Total via count:       135
 Total overflow:        0
 Min resource:          2
 Bottleneck:            (5, 0, 0)
@@ -49,13 +49,13 @@ Bottleneck:            (5, 0, 0)
 Layer         Resource        Demand        Usage (%)    Max H / Max V / Total Overflow
 ---------------------------------------------------------------------------------------
 li1              21571             3            0.01%             0 /  0 /  0
-met1             27555            17            0.06%             0 /  0 /  0
-met2             21571            70            0.32%             0 /  0 /  0
-met3             14023            90            0.64%             0 /  0 /  0
+met1             27555            73            0.26%             0 /  0 /  0
+met2             21571            63            0.29%             0 /  0 /  0
+met3             14023            25            0.18%             0 /  0 /  0
 met4             10804            13            0.12%             0 /  0 /  0
 met5              3108             0            0.00%             0 /  0 /  0
 ---------------------------------------------------------------------------------------
-Total            98632           193            0.20%             0 /  0 /  0
+Total            98632           177            0.18%             0 /  0 /  0
 
 [INFO GRT-0018] Total wirelength: 1641 um
 [INFO GRT-0014] Routed nets: 15