Skip to content

Commit

Permalink
Merge pull request The-OpenROAD-Project#5262 from The-OpenROAD-Projec…
Browse files Browse the repository at this point in the history 
…t-staging/grt-rudy-width-fix

Grt rudy width fix
  • Loading branch information
@eder-matheus
eder-matheus authored Jun 26, 2024
2 parents 0ee8029 + 9e64760 commit 343d3c0
Show file tree
Hide file tree
Showing 9 changed files with 467 additions and 627 deletions.
10 changes: 5 additions & 5 deletions src/gpl/test/simple03-rd.ok
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@
[INFO GPL-0040] NumTiles: 196
[INFO GPL-0081] TotalRouteOverflow: 0.0
[INFO GPL-0082] OverflowTileCnt: 0
[INFO GPL-0083] 0.5%RC: 0.8663694858551025
[INFO GPL-0084] 1.0%RC: 0.7915560305118561
[INFO GPL-0085] 2.0%RC: 0.7390100508928299
[INFO GPL-0086] 5.0%RC: 0.6729927897453308
[INFO GPL-0087] FinalRC: 0.82896274
[INFO GPL-0083] 0.5%RC: 0.48812615871429443
[INFO GPL-0084] 1.0%RC: 0.4571320414543152
[INFO GPL-0085] 2.0%RC: 0.4332096576690674
[INFO GPL-0086] 5.0%RC: 0.3979834884405136
[INFO GPL-0087] FinalRC: 0.4726291
[INFO GPL-0077] FinalRC lower than targetRC(1.25), routability not needed.
[NesterovSolve] Iter: 290 overflow: 0.267 HPWL: 4778698
[NesterovSolve] Iter: 300 overflow: 0.233 HPWL: 4810713
Expand Down
588 changes: 294 additions & 294 deletions src/gpl/test/simple04-rd.defok
View file

Large diffs are not rendered by default.

177 changes: 14 additions & 163 deletions src/gpl/test/simple04-rd.ok
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,167 +72,18 @@
[INFO GPL-0040] NumTiles: 196
[INFO GPL-0081] TotalRouteOverflow: 0.0
[INFO GPL-0082] OverflowTileCnt: 0
[INFO GPL-0083] 0.5%RC: 0.8663694858551025
[INFO GPL-0084] 1.0%RC: 0.7915560305118561
[INFO GPL-0085] 2.0%RC: 0.7390100508928299
[INFO GPL-0086] 5.0%RC: 0.6729927897453308
[INFO GPL-0087] FinalRC: 0.82896274
[INFO GPL-0078] FinalRC lower than minRC (1e+30), min RC updated.
[INFO GPL-0045] InflatedAreaDelta: 0.000 um^2
[INFO GPL-0046] TargetDensity: 0.700
[INFO GPL-0049] WhiteSpaceArea: 953.876 um^2
[INFO GPL-0050] NesterovInstsArea: 569.772 um^2
[INFO GPL-0051] TotalFillerArea: 97.941 um^2
[INFO GPL-0052] TotalGCellsArea: 667.713 um^2
[INFO GPL-0053] ExpectedGCellsArea: 667.713 um^2
[INFO GPL-0054] NewTargetDensity: 0.700
[INFO GPL-0055] NewWhiteSpaceArea: 953.876 um^2
[INFO GPL-0056] MovableArea: 667.713 um^2
[INFO GPL-0057] NewNesterovInstArea: 569.772 um^2
[INFO GPL-0058] NewTotalFillerArea: 97.941 um^2
[INFO GPL-0059] NewTotalGCellsArea: 667.713 um^2
[NesterovSolve] Revert back to snapshot coordi
[NesterovSolve] Iter: 290 overflow: 0.569 HPWL: 4622568
[NesterovSolve] Iter: 300 overflow: 0.534 HPWL: 4678132
[NesterovSolve] Iter: 310 overflow: 0.488 HPWL: 4696790
[NesterovSolve] Iter: 320 overflow: 0.446 HPWL: 4684731
[NesterovSolve] Iter: 330 overflow: 0.400 HPWL: 4669364
[NesterovSolve] Iter: 340 overflow: 0.357 HPWL: 4655730
[NesterovSolve] Iter: 350 overflow: 0.319 HPWL: 4686260
[INFO GPL-0075] Routability numCall: 2 inflationIterCnt: 2 bloatIterCnt: 0
[INFO GPL-0036] TileBBox: ( 0 0 ) ( 4200 4200 ) DBU
[INFO GPL-0038] TileCnt: 14 14
[INFO GPL-0040] NumTiles: 196
[INFO GPL-0081] TotalRouteOverflow: 0.0
[INFO GPL-0082] OverflowTileCnt: 0
[INFO GPL-0083] 0.5%RC: 0.8215832710266113
[INFO GPL-0084] 1.0%RC: 0.781876266002655
[INFO GPL-0085] 2.0%RC: 0.7435924112796783
[INFO GPL-0086] 5.0%RC: 0.6735508263111114
[INFO GPL-0087] FinalRC: 0.8017298
[INFO GPL-0078] FinalRC lower than minRC (0.82896274), min RC updated.
[INFO GPL-0045] InflatedAreaDelta: 0.000 um^2
[INFO GPL-0046] TargetDensity: 0.700
[INFO GPL-0049] WhiteSpaceArea: 953.876 um^2
[INFO GPL-0050] NesterovInstsArea: 569.772 um^2
[INFO GPL-0051] TotalFillerArea: 97.941 um^2
[INFO GPL-0052] TotalGCellsArea: 667.713 um^2
[INFO GPL-0053] ExpectedGCellsArea: 667.713 um^2
[INFO GPL-0054] NewTargetDensity: 0.700
[INFO GPL-0055] NewWhiteSpaceArea: 953.876 um^2
[INFO GPL-0056] MovableArea: 667.713 um^2
[INFO GPL-0057] NewNesterovInstArea: 569.772 um^2
[INFO GPL-0058] NewTotalFillerArea: 97.941 um^2
[INFO GPL-0059] NewTotalGCellsArea: 667.713 um^2
[NesterovSolve] Revert back to snapshot coordi
[NesterovSolve] Iter: 360 overflow: 0.587 HPWL: 4587768
[NesterovSolve] Iter: 370 overflow: 0.556 HPWL: 4648997
[NesterovSolve] Iter: 380 overflow: 0.518 HPWL: 4695007
[NesterovSolve] Iter: 390 overflow: 0.475 HPWL: 4690204
[NesterovSolve] Iter: 400 overflow: 0.434 HPWL: 4683351
[NesterovSolve] Iter: 410 overflow: 0.377 HPWL: 4645116
[NesterovSolve] Iter: 420 overflow: 0.344 HPWL: 4663512
[NesterovSolve] Iter: 430 overflow: 0.307 HPWL: 4699230
[INFO GPL-0075] Routability numCall: 3 inflationIterCnt: 3 bloatIterCnt: 0
[INFO GPL-0036] TileBBox: ( 0 0 ) ( 4200 4200 ) DBU
[INFO GPL-0038] TileCnt: 14 14
[INFO GPL-0040] NumTiles: 196
[INFO GPL-0081] TotalRouteOverflow: 0.0
[INFO GPL-0082] OverflowTileCnt: 0
[INFO GPL-0083] 0.5%RC: 0.8215832710266113
[INFO GPL-0084] 1.0%RC: 0.781876266002655
[INFO GPL-0085] 2.0%RC: 0.7435924112796783
[INFO GPL-0086] 5.0%RC: 0.6735508263111114
[INFO GPL-0087] FinalRC: 0.8017298
[INFO GPL-0079] MinRC (0.8017298) violation occurred, total count: 1.
[INFO GPL-0045] InflatedAreaDelta: 0.000 um^2
[INFO GPL-0046] TargetDensity: 0.700
[INFO GPL-0049] WhiteSpaceArea: 953.876 um^2
[INFO GPL-0050] NesterovInstsArea: 569.772 um^2
[INFO GPL-0051] TotalFillerArea: 97.941 um^2
[INFO GPL-0052] TotalGCellsArea: 667.713 um^2
[INFO GPL-0053] ExpectedGCellsArea: 667.713 um^2
[INFO GPL-0054] NewTargetDensity: 0.700
[INFO GPL-0055] NewWhiteSpaceArea: 953.876 um^2
[INFO GPL-0056] MovableArea: 667.713 um^2
[INFO GPL-0057] NewNesterovInstArea: 569.772 um^2
[INFO GPL-0058] NewTotalFillerArea: 97.941 um^2
[INFO GPL-0059] NewTotalGCellsArea: 667.713 um^2
[NesterovSolve] Revert back to snapshot coordi
[NesterovSolve] Iter: 440 overflow: 0.575 HPWL: 4610091
[NesterovSolve] Iter: 450 overflow: 0.541 HPWL: 4672342
[NesterovSolve] Iter: 460 overflow: 0.499 HPWL: 4694087
[NesterovSolve] Iter: 470 overflow: 0.455 HPWL: 4691130
[NesterovSolve] Iter: 480 overflow: 0.411 HPWL: 4681679
[NesterovSolve] Iter: 490 overflow: 0.364 HPWL: 4647002
[NesterovSolve] Iter: 500 overflow: 0.327 HPWL: 4684079
[INFO GPL-0075] Routability numCall: 4 inflationIterCnt: 4 bloatIterCnt: 0
[INFO GPL-0036] TileBBox: ( 0 0 ) ( 4200 4200 ) DBU
[INFO GPL-0038] TileCnt: 14 14
[INFO GPL-0040] NumTiles: 196
[INFO GPL-0081] TotalRouteOverflow: 0.0
[INFO GPL-0082] OverflowTileCnt: 0
[INFO GPL-0083] 0.5%RC: 0.8215832710266113
[INFO GPL-0084] 1.0%RC: 0.781876266002655
[INFO GPL-0085] 2.0%RC: 0.7435924112796783
[INFO GPL-0086] 5.0%RC: 0.6735508263111114
[INFO GPL-0087] FinalRC: 0.8017298
[INFO GPL-0079] MinRC (0.8017298) violation occurred, total count: 2.
[INFO GPL-0045] InflatedAreaDelta: 0.000 um^2
[INFO GPL-0046] TargetDensity: 0.700
[INFO GPL-0049] WhiteSpaceArea: 953.876 um^2
[INFO GPL-0050] NesterovInstsArea: 569.772 um^2
[INFO GPL-0051] TotalFillerArea: 97.941 um^2
[INFO GPL-0052] TotalGCellsArea: 667.713 um^2
[INFO GPL-0053] ExpectedGCellsArea: 667.713 um^2
[INFO GPL-0054] NewTargetDensity: 0.700
[INFO GPL-0055] NewWhiteSpaceArea: 953.876 um^2
[INFO GPL-0056] MovableArea: 667.713 um^2
[INFO GPL-0057] NewNesterovInstArea: 569.772 um^2
[INFO GPL-0058] NewTotalFillerArea: 97.941 um^2
[INFO GPL-0059] NewTotalGCellsArea: 667.713 um^2
[NesterovSolve] Revert back to snapshot coordi
[NesterovSolve] Iter: 510 overflow: 0.594 HPWL: 4571046
[NesterovSolve] Iter: 520 overflow: 0.563 HPWL: 4637180
[NesterovSolve] Iter: 530 overflow: 0.526 HPWL: 4686839
[NesterovSolve] Iter: 540 overflow: 0.482 HPWL: 4691202
[NesterovSolve] Iter: 550 overflow: 0.439 HPWL: 4682012
[NesterovSolve] Iter: 560 overflow: 0.387 HPWL: 4658075
[NesterovSolve] Iter: 570 overflow: 0.348 HPWL: 4662159
[NesterovSolve] Iter: 580 overflow: 0.313 HPWL: 4691486
[INFO GPL-0075] Routability numCall: 5 inflationIterCnt: 0 bloatIterCnt: 1
[INFO GPL-0036] TileBBox: ( 0 0 ) ( 4200 4200 ) DBU
[INFO GPL-0038] TileCnt: 14 14
[INFO GPL-0040] NumTiles: 196
[INFO GPL-0081] TotalRouteOverflow: 0.0
[INFO GPL-0082] OverflowTileCnt: 0
[INFO GPL-0083] 0.5%RC: 0.8215832710266113
[INFO GPL-0084] 1.0%RC: 0.781876266002655
[INFO GPL-0085] 2.0%RC: 0.7435924112796783
[INFO GPL-0086] 5.0%RC: 0.6735508263111114
[INFO GPL-0087] FinalRC: 0.8017298
[INFO GPL-0079] MinRC (0.8017298) violation occurred, total count: 3.
[INFO GPL-0045] InflatedAreaDelta: 0.000 um^2
[INFO GPL-0046] TargetDensity: 0.700
Revert Routability Procedure. Target density higher than max, or minRC max violations.
[INFO GPL-0080] minRcViolatedCnt: 3
[INFO GPL-0047] SavedMinRC: 0.8017
[INFO GPL-0048] SavedTargetDensity: 0.7000
[NesterovSolve] Revert back to snapshot coordi
[NesterovSolve] Iter: 590 overflow: 0.581 HPWL: 4598491
[NesterovSolve] Iter: 600 overflow: 0.549 HPWL: 4661193
[NesterovSolve] Iter: 610 overflow: 0.508 HPWL: 4695290
[NesterovSolve] Iter: 620 overflow: 0.462 HPWL: 4702654
[NesterovSolve] Iter: 630 overflow: 0.422 HPWL: 4689847
[NesterovSolve] Iter: 640 overflow: 0.370 HPWL: 4639836
[NesterovSolve] Iter: 650 overflow: 0.336 HPWL: 4674234
[NesterovSolve] Iter: 660 overflow: 0.303 HPWL: 4711304
[NesterovSolve] Iter: 670 overflow: 0.273 HPWL: 4774258
[NesterovSolve] Iter: 680 overflow: 0.236 HPWL: 4804987
[NesterovSolve] Iter: 690 overflow: 0.204 HPWL: 4845754
[NesterovSolve] Iter: 700 overflow: 0.174 HPWL: 4878074
[NesterovSolve] Iter: 710 overflow: 0.146 HPWL: 4911284
[NesterovSolve] Iter: 720 overflow: 0.122 HPWL: 4938747
[NesterovSolve] Iter: 730 overflow: 0.103 HPWL: 4964040
[NesterovSolve] Finished with Overflow: 0.099315
[INFO GPL-0083] 0.5%RC: 0.48812615871429443
[INFO GPL-0084] 1.0%RC: 0.4571320414543152
[INFO GPL-0085] 2.0%RC: 0.4332096576690674
[INFO GPL-0086] 5.0%RC: 0.3979834884405136
[INFO GPL-0087] FinalRC: 0.4726291
[INFO GPL-0077] FinalRC lower than targetRC(0.67), routability not needed.
[NesterovSolve] Iter: 290 overflow: 0.267 HPWL: 4778698
[NesterovSolve] Iter: 300 overflow: 0.233 HPWL: 4810713
[NesterovSolve] Iter: 310 overflow: 0.202 HPWL: 4848299
[NesterovSolve] Iter: 320 overflow: 0.171 HPWL: 4881515
[NesterovSolve] Iter: 330 overflow: 0.143 HPWL: 4916941
[NesterovSolve] Iter: 340 overflow: 0.123 HPWL: 4942028
[NesterovSolve] Iter: 350 overflow: 0.101 HPWL: 4964095
[NesterovSolve] Finished with Overflow: 0.099533
No differences found.
2 changes: 1 addition & 1 deletion src/grt/include/grt/GlobalRouter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ class GlobalRouter : public ant::GlobalRouteSource
void setAdjustment(const float adjustment);
void setMinRoutingLayer(const int min_layer);
void setMaxRoutingLayer(const int max_layer);
int getMinRoutingLayer() const { return min_routing_layer_; }
int getMaxRoutingLayer() const { return max_routing_layer_; }
void setMinLayerForClock(const int min_layer);
void setMaxLayerForClock(const int max_layer);
Expand All @@ -180,7 +181,6 @@ class GlobalRouter : public ant::GlobalRouteSource
void setAllowCongestion(bool allow_congestion);
void setMacroExtension(int macro_extension);
void setPinOffset(int pin_offset);
int getMinRoutingLayer() const { return min_routing_layer_; }

// flow functions
void readGuides(const char* file_name);
Expand Down
49 changes: 17 additions & 32 deletions src/grt/src/Rudy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ Rudy::Rudy(odb::dbBlock* block, grt::GlobalRouter* grouter)
if (grid_block_.area() == 0) {
return;
}
// TODO: Match the wire width with the paper definition
wire_width_ = block_->getTech()->findRoutingLayer(1)->getWidth();

if (!grouter_->isInitialized()) {
int min_layer, max_layer;
Expand All @@ -56,6 +54,23 @@ Rudy::Rudy(odb::dbBlock* block, grt::GlobalRouter* grouter)
grouter_->initFastRoute(min_layer, max_layer);
}

// The wire width is the harmonic average pitch divided by the number of
// routing layers.
double pitch_terms = 0;
const int min_routing_layer = grouter->getMinRoutingLayer();
const int max_routing_layer = grouter->getMaxRoutingLayer();
const auto tech = block_->getTech();
for (int layer_idx = min_routing_layer; layer_idx <= max_routing_layer;
++layer_idx) {
const auto layer = tech->findRoutingLayer(layer_idx);
int pitch = layer->getPitch();
if (pitch == 0) {
pitch = layer->getWidth() + layer->getSpacing();
}
pitch_terms += 1.0 / pitch;
}
wire_width_ = 1 / pitch_terms; // = harm. mean / num_routing_layers

int x_grids, y_grids;
grouter_->getGridSize(x_grids, y_grids);
tile_size_ = grouter_->getGridTileSize();
Expand Down Expand Up @@ -131,36 +146,6 @@ void Rudy::calculateRudy()
processIntersectionSignalNet(net_rect);
}
}

double min_rudy = std::numeric_limits<double>::max();
double max_observed_rudy = std::numeric_limits<double>::lowest();

for (int x = 0; x < grid_.size(); x++) {
for (int y = 0; y < grid_[x].size(); y++) {
const Tile& tile = getEditableTile(x, y);
const double rudy_value = tile.getRudy();
min_rudy = std::min(min_rudy, rudy_value);
max_observed_rudy = std::max(max_observed_rudy, rudy_value);
}
}

for (int x = 0; x < grid_.size(); x++) {
for (int y = 0; y < grid_[x].size(); y++) {
Tile& tile = getEditableTile(x, y);
const float rudy_value = tile.getRudy();
float normalized_rudy = min_rudy;
if (rudy_value > min_rudy) {
normalized_rudy = min_rudy
+ (rudy_value - min_rudy)
/ (max_observed_rudy - min_rudy)
* (140 - min_rudy);
}
if (normalized_rudy < rudy_value) {
tile.clearRudy();
tile.addRudy(normalized_rudy);
}
}
}
}

void Rudy::processIntersectionSignalNet(const odb::Rect net_rect)
Expand Down
Loading

0 comments on commit 343d3c0

Please sign in to comment.