Skip to content

Commit 5b70d21

Browse files
gadfortgadfort
committed
Merge remote-tracking branch 'origin/master' into pdn-arb-straps
2 parents a80ebbb + 746586d commit 5b70d21

File tree

104 files changed

+177727
-102355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+177727
-102355
lines changed

‎src/gpl/test/simple01-rd.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ TRACKS X 190 DO 163 STEP 380 LAYER metal2 ;
5353
TRACKS Y 140 DO 220 STEP 280 LAYER metal2 ;
5454
TRACKS X 190 DO 163 STEP 380 LAYER metal1 ;
5555
TRACKS Y 140 DO 220 STEP 280 LAYER metal1 ;
56-
GCELLGRID X 0 DO 14 STEP 4200 ;
57-
GCELLGRID Y 0 DO 14 STEP 4200 ;
56+
GCELLGRID X 0 DO 10 STEP 5700 ;
57+
GCELLGRID Y 0 DO 10 STEP 5700 ;
5858
COMPONENTS 294 ;
5959
- _276_ NOR2_X2 + PLACED ( 39409 50307 ) N ;
6060
- _277_ BUF_X4 + PLACED ( 39508 46648 ) N ;

‎src/gpl/test/simple01-rd.ok‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
7878
[INFO GPL-0064] TotalRouteOverflowH2: 0.0000
7979
[INFO GPL-0065] TotalRouteOverflowV2: 0.0000
8080
[INFO GPL-0066] OverflowTileCnt2: 0
81-
[INFO GPL-0067] 0.5%RC: 0.9733
82-
[INFO GPL-0068] 1.0%RC: 0.9481
83-
[INFO GPL-0069] 2.0%RC: 0.8652
84-
[INFO GPL-0070] 5.0%RC: 0.6905
81+
[INFO GPL-0067] 0.5%RC: 0.9357
82+
[INFO GPL-0068] 1.0%RC: 0.8852
83+
[INFO GPL-0069] 2.0%RC: 0.8068
84+
[INFO GPL-0070] 5.0%RC: 0.6565
8585
[INFO GPL-0071] 0.5rcK: 1.00
8686
[INFO GPL-0072] 1.0rcK: 1.00
8787
[INFO GPL-0073] 2.0rcK: 0.00
8888
[INFO GPL-0074] 5.0rcK: 0.00
89-
[INFO GPL-0075] Final routing congestion: 0.96074075
89+
[INFO GPL-0075] Final routing congestion: 0.9104762
9090
[INFO GPL-0050] Weighted routing congestion is lower than target routing congestion(1.2500), end routability optimization.
9191
[INFO GPL-0090] Routability finished. Target routing congestion achieved succesfully.
9292
Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
@@ -103,7 +103,7 @@ Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
103103
[INFO GPL-1001] Global placement finished at iteration 355
104104
[INFO GPL-1003] Routability mode iteration count: 64
105105
[INFO GPL-0039] Number of routing layers: 0
106-
[INFO GPL-1005] Routability final weighted congestion: 0.4360
106+
[INFO GPL-1005] Routability final weighted congestion: 0.4179
107107
[INFO GPL-1002] Placed Cell Area 619.7347
108108
[INFO GPL-1003] Available Free Area 953.8760
109109
[INFO GPL-1004] Minimum Feasible Density 0.6500 (cell_area / free_area)

‎src/gpl/test/simple02-rd.defok‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ TRACKS X 190 DO 163 STEP 380 LAYER metal2 ;
5353
TRACKS Y 140 DO 220 STEP 280 LAYER metal2 ;
5454
TRACKS X 190 DO 163 STEP 380 LAYER metal1 ;
5555
TRACKS Y 140 DO 220 STEP 280 LAYER metal1 ;
56-
GCELLGRID X 0 DO 14 STEP 4200 ;
57-
GCELLGRID Y 0 DO 14 STEP 4200 ;
56+
GCELLGRID X 0 DO 10 STEP 5700 ;
57+
GCELLGRID Y 0 DO 10 STEP 5700 ;
5858
COMPONENTS 294 ;
5959
- _276_ NOR2_X2 + PLACED ( 39409 50307 ) N ;
6060
- _277_ BUF_X4 + PLACED ( 39508 46648 ) N ;

‎src/gpl/test/simple02-rd.ok‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
7878
[INFO GPL-0064] TotalRouteOverflowH2: 0.0000
7979
[INFO GPL-0065] TotalRouteOverflowV2: 0.0000
8080
[INFO GPL-0066] OverflowTileCnt2: 0
81-
[INFO GPL-0067] 0.5%RC: 0.9733
82-
[INFO GPL-0068] 1.0%RC: 0.9481
83-
[INFO GPL-0069] 2.0%RC: 0.8652
84-
[INFO GPL-0070] 5.0%RC: 0.6905
81+
[INFO GPL-0067] 0.5%RC: 0.9357
82+
[INFO GPL-0068] 1.0%RC: 0.8852
83+
[INFO GPL-0069] 2.0%RC: 0.8068
84+
[INFO GPL-0070] 5.0%RC: 0.6565
8585
[INFO GPL-0071] 0.5rcK: 1.00
8686
[INFO GPL-0072] 1.0rcK: 1.00
8787
[INFO GPL-0073] 2.0rcK: 0.00
8888
[INFO GPL-0074] 5.0rcK: 0.00
89-
[INFO GPL-0075] Final routing congestion: 0.96074075
89+
[INFO GPL-0075] Final routing congestion: 0.9104762
9090
[INFO GPL-0050] Weighted routing congestion is lower than target routing congestion(1.0000), end routability optimization.
9191
[INFO GPL-0090] Routability finished. Target routing congestion achieved succesfully.
9292
Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
@@ -103,7 +103,7 @@ Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
103103
[INFO GPL-1001] Global placement finished at iteration 355
104104
[INFO GPL-1003] Routability mode iteration count: 64
105105
[INFO GPL-0039] Number of routing layers: 0
106-
[INFO GPL-1005] Routability final weighted congestion: 0.4360
106+
[INFO GPL-1005] Routability final weighted congestion: 0.4179
107107
[INFO GPL-1002] Placed Cell Area 619.7347
108108
[INFO GPL-1003] Available Free Area 953.8760
109109
[INFO GPL-1004] Minimum Feasible Density 0.6500 (cell_area / free_area)

‎src/gpl/test/simple03-rd.ok‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
7676
[INFO GPL-0040] Routability iteration: 1
7777
[INFO GPL-0041] Total routing overflow: 0.0000
7878
[INFO GPL-0042] Number of overflowed tiles: 0 (0.00%)
79-
[INFO GPL-0043] Average top 0.5% routing congestion: 0.4737
80-
[INFO GPL-0044] Average top 1.0% routing congestion: 0.4651
81-
[INFO GPL-0045] Average top 2.0% routing congestion: 0.4568
82-
[INFO GPL-0046] Average top 5.0% routing congestion: 0.4382
83-
[INFO GPL-0047] Routability iteration weighted routing congestion: 0.4694
79+
[INFO GPL-0043] Average top 0.5% routing congestion: 0.4498
80+
[INFO GPL-0044] Average top 1.0% routing congestion: 0.4498
81+
[INFO GPL-0045] Average top 2.0% routing congestion: 0.4368
82+
[INFO GPL-0046] Average top 5.0% routing congestion: 0.4256
83+
[INFO GPL-0047] Routability iteration weighted routing congestion: 0.4498
8484
[INFO GPL-0050] Weighted routing congestion is lower than target routing congestion(1.2500), end routability optimization.
8585
[INFO GPL-0090] Routability finished. Target routing congestion achieved succesfully.
8686
Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
@@ -96,7 +96,7 @@ Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
9696
---------------------------------------------------------------
9797
[INFO GPL-1001] Global placement finished at iteration 355
9898
[INFO GPL-1003] Routability mode iteration count: 64
99-
[INFO GPL-1005] Routability final weighted congestion: 0.4360
99+
[INFO GPL-1005] Routability final weighted congestion: 0.4179
100100
[INFO GPL-1002] Placed Cell Area 619.7347
101101
[INFO GPL-1003] Available Free Area 953.8760
102102
[INFO GPL-1004] Minimum Feasible Density 0.6500 (cell_area / free_area)

‎src/gpl/test/simple04-rd.ok‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
7676
[INFO GPL-0040] Routability iteration: 1
7777
[INFO GPL-0041] Total routing overflow: 0.0000
7878
[INFO GPL-0042] Number of overflowed tiles: 0 (0.00%)
79-
[INFO GPL-0043] Average top 0.5% routing congestion: 0.4737
80-
[INFO GPL-0044] Average top 1.0% routing congestion: 0.4651
81-
[INFO GPL-0045] Average top 2.0% routing congestion: 0.4568
82-
[INFO GPL-0046] Average top 5.0% routing congestion: 0.4382
83-
[INFO GPL-0047] Routability iteration weighted routing congestion: 0.4694
79+
[INFO GPL-0043] Average top 0.5% routing congestion: 0.4498
80+
[INFO GPL-0044] Average top 1.0% routing congestion: 0.4498
81+
[INFO GPL-0045] Average top 2.0% routing congestion: 0.4368
82+
[INFO GPL-0046] Average top 5.0% routing congestion: 0.4256
83+
[INFO GPL-0047] Routability iteration weighted routing congestion: 0.4498
8484
[INFO GPL-0050] Weighted routing congestion is lower than target routing congestion(0.6700), end routability optimization.
8585
[INFO GPL-0090] Routability finished. Target routing congestion achieved succesfully.
8686
Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
@@ -96,7 +96,7 @@ Iteration | Overflow | HPWL (um) | HPWL(%) | Penalty | Group
9696
---------------------------------------------------------------
9797
[INFO GPL-1001] Global placement finished at iteration 355
9898
[INFO GPL-1003] Routability mode iteration count: 64
99-
[INFO GPL-1005] Routability final weighted congestion: 0.4360
99+
[INFO GPL-1005] Routability final weighted congestion: 0.4179
100100
[INFO GPL-1002] Placed Cell Area 619.7347
101101
[INFO GPL-1003] Available Free Area 953.8760
102102
[INFO GPL-1004] Minimum Feasible Density 0.6500 (cell_area / free_area)

‎src/grt/include/grt/GlobalRouter.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@ class GlobalRouter
471471
void initClockNets();
472472
bool isClkTerm(odb::dbITerm* iterm, sta::dbNetwork* network);
473473
void initGridAndNets();
474-
void ensureLayerForGuideDimension(int max_routing_layer);
475474
void configFastRoute();
476475

477476
utl::Logger* logger_;
@@ -495,7 +494,6 @@ class GlobalRouter
495494
// Flow variables
496495
bool is_incremental_;
497496
float adjustment_;
498-
int layer_for_guide_dimension_;
499497
int congestion_iterations_{50};
500498
int congestion_report_iter_step_;
501499
bool allow_congestion_;

‎src/grt/src/GlobalRouter.cpp‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ GlobalRouter::GlobalRouter(utl::Logger* logger,
7979
groute_renderer_(nullptr),
8080
grid_(new Grid),
8181
adjustment_(0.0),
82-
layer_for_guide_dimension_(3),
8382
congestion_report_iter_step_(0),
8483
allow_congestion_(false),
8584
macro_extension_(0),
@@ -149,7 +148,6 @@ std::vector<Net*> GlobalRouter::initFastRoute(int min_routing_layer,
149148
fastroute_->clear();
150149
h_nets_in_pos_.clear();
151150
v_nets_in_pos_.clear();
152-
ensureLayerForGuideDimension(max_routing_layer);
153151

154152
configFastRoute();
155153

@@ -2172,13 +2170,6 @@ void GlobalRouter::initGridAndNets()
21722170
initNetlist(nets);
21732171
}
21742172

2175-
void GlobalRouter::ensureLayerForGuideDimension(int max_routing_layer)
2176-
{
2177-
if (max_routing_layer < layer_for_guide_dimension_) {
2178-
layer_for_guide_dimension_ = max_routing_layer;
2179-
}
2180-
}
2181-
21822173
void GlobalRouter::configFastRoute()
21832174
{
21842175
fastroute_->setVerbose(verbose_);

0 commit comments

Comments
 (0)