Skip to content

Commit 5f0ba34

Browse files
eder-matheuseder-matheus
authored
Merge pull request #10410 from eder-matheus/grt_cugr_reports_rename
grt: change 'overflow' to 'congestion'
2 parents 707518a + 9486d57 commit 5f0ba34

66 files changed

Lines changed: 2211 additions & 2207 deletions

Some content is hidden

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

‎src/grt/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ global_route
4040
| Switch Name | Description |
4141
| ----- | ----- |
4242
| `-guide_file` | Set the output guides file name (e.g., `route.guide`). |
43-
| `-congestion_iterations` | Set the number of iterations made to remove the overflow of the routing. The default value is `50`, and the allowed values are integers `[0, MAX_INT]`. |
43+
| `-congestion_iterations` | Set the number of iterations made to remove the congestion of the routing. The default value is `50`, and the allowed values are integers `[0, MAX_INT]`. |
4444
| `-congestion_report_file` | Set the file name to save the congestion report. The file generated can be read by the DRC viewer in the GUI (e.g., `report_file.rpt`). |
4545
| `-congestion_report_iter_step` | Set the number of iterations to report. The default value is `0`, and the allowed values are integers `[0, MAX_INT]`. |
4646
| `-grid_origin` | Set the (x, y) origin of the routing grid in DBU. For example, `-grid_origin {1 1}` corresponds to the die (0, 0) + 1 DBU in each x--, y- direction. |
@@ -295,7 +295,7 @@ global_route_debug
295295
| ----- | ----- |
296296
| `-st` | Show the Steiner Tree generated by `stt`. |
297297
| `-rst` | Show the Rectilinear Steiner Tree generated by `grt`. |
298-
| `-tree2D` | Show the Rectilinear Steiner Tree generated by `grt` after the overflow iterations. |
298+
| `-tree2D` | Show the Rectilinear Steiner Tree generated by `grt` after the congestion iterations. |
299299
| `-tree3D` | Show the 3D Rectilinear Steiner Tree post-layer assignment. |
300300
| `-edges3D` | Show each edge being rerouted post-layer assignment. |
301301
| `-saveSttInput` | File name to save `stt` input of a net. |

‎src/grt/src/GlobalRouter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5615,7 +5615,7 @@ void GlobalRouter::reportCongestion()
56155615
"Layer Resource Demand Usage (%) Max H / "
56165616
"Max "
56175617
"V "
5618-
"/ Total Overflow");
5618+
"/ Total Congestion");
56195619
logger_->report(
56205620
"--------------------------------------------------------------------"
56215621
"--"

‎src/grt/src/GlobalRouter.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ proc read_global_route_segments { args } {
411411
sta::define_cmd_args "global_route_debug" {
412412
[-st] # Show the Steiner Tree generated by stt
413413
[-rst] # Show the Rectilinear Steiner Tree generated by FastRoute
414-
[-tree2D] # Show the Rectilinear Steiner Tree generated by FastRoute after overflow iterations
414+
[-tree2D] # Show the Rectilinear Steiner Tree generated by FastRoute after congestion iterations
415415
[-tree3D] # Show The Rectilinear Steiner Tree 3D after layer assignment
416416
[-edges3D] # Show edges being rerouted during maze route 3D
417417
[-saveSttInput file_name] # Save the stt input for a net on file_name

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void CUGR::updateOverflowNets(std::vector<int>& net_indices)
160160
net_indices.push_back(net->getIndex());
161161
}
162162
}
163-
logger_->report("Nets with overflow: {}.", net_indices.size());
163+
logger_->report("Nets with congestion: {}.", net_indices.size());
164164
}
165165

166166
void CUGR::patternRoute(std::vector<int>& net_indices)
@@ -575,7 +575,7 @@ void CUGR::printStatistics() const
575575
logger_->report("Wire length: {}",
576576
wire_length / grid_graph_->getM2Pitch());
577577
logger_->report("Total via count: {}", via_count);
578-
logger_->report("Total overflow: {}", (int) total_overflow);
578+
logger_->report("Total congestion: {}", (int) total_overflow);
579579
logger_->report("Min resource: {}", min_resource);
580580
logger_->report("Bottleneck: {}", bottleneck);
581581
}
@@ -868,8 +868,8 @@ void CUGR::saveCongestion()
868868
};
869869

870870
// Emit one marker per congested 3D edge, tagged with its routing
871-
// layer. Comment carries capacity/usage/overflow and the source of
872-
// the overflow (wire segments, via stubs, or both).
871+
// layer. Comment carries capacity/usage/congestion and the source of
872+
// the congestion (wire segments, via stubs, or both).
873873
for (int l = 0; l < num_layers; l++) {
874874
const int direction = grid_graph_->getLayerDirection(l);
875875
odb::dbTechLayer* db_layer = tech->findRoutingLayer(l + 1);
@@ -916,7 +916,7 @@ void CUGR::saveCongestion()
916916
marker->setTechLayer(db_layer);
917917
}
918918
marker->setComment("capacity:" + std::to_string(cap_int) + " usage:"
919-
+ std::to_string(demand_int) + " overflow:"
919+
+ std::to_string(demand_int) + " congestion:"
920920
+ std::to_string(overflow_int) + " (" + kind + ")");
921921

922922
std::set<odb::dbNet*> sources;

‎src/grt/src/fastroute/src/FastRoute.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1968,7 +1968,7 @@ NetRouteMap FastRouteCore::run()
19681968

19691969
graph2d_.InitLastUsage(upType);
19701970
if (total_overflow_ > 0 && overflow_iterations_ > 0 && verbose_) {
1971-
logger_->info(GRT, 101, "Running extra iterations to remove overflow.");
1971+
logger_->info(GRT, 101, "Running extra iterations to remove congestion.");
19721972
}
19731973

19741974
if (useSnapshotBatchRouting(net_ids_.size())
@@ -1982,7 +1982,7 @@ NetRouteMap FastRouteCore::run()
19821982
if (debug_->isOn() && debug_->rectilinearSTree) {
19831983
for (const int& netID : net_ids_) {
19841984
if (nets_[netID]->getDbNet() == debug_->net) {
1985-
logger_->report("RST Tree before overflow iterations");
1985+
logger_->report("RST Tree before congestion iterations");
19861986
StTreeVisualization(sttrees_[netID], nets_[netID], false);
19871987
}
19881988
}
@@ -2004,7 +2004,7 @@ NetRouteMap FastRouteCore::run()
20042004
GRT,
20052005
"timer",
20062006
1,
2007-
"Overflow iterations: {}");
2007+
"Congestion iterations: {}");
20082008
while (total_overflow_ > 0 && i <= overflow_iterations_
20092009
&& overflow_increases <= max_overflow_increases) {
20102010
if (verbose_) {
@@ -2222,8 +2222,8 @@ NetRouteMap FastRouteCore::run()
22222222

22232223
if (logger_->debugCheck(GRT, "congestionIterations", 1)) {
22242224
logger_->report(
2225-
"=== Overflow Iteration {} - TotalOverflow {} - OverflowIter {} - "
2226-
"OverflowIncreases {} - MaxOverIncr {} ===",
2225+
"=== Congestion Iteration {} - TotalCongestion {} - "
2226+
"CongestionIter {} - CongestionIncreases {} - MaxCongIncr {} ===",
22272227
i,
22282228
total_overflow_,
22292229
overflow_iterations_,
@@ -2288,7 +2288,7 @@ NetRouteMap FastRouteCore::run()
22882288
if (debug_->isOn() && debug_->tree2D) {
22892289
for (const int& netID : net_ids_) {
22902290
if (nets_[netID]->getDbNet() == debug_->net) {
2291-
logger_->report("Tree 2D after overflow iterations");
2291+
logger_->report("Tree 2D after congestion iterations");
22922292
StTreeVisualization(sttrees_[netID], nets_[netID], false);
22932293
}
22942294
}
@@ -2301,7 +2301,7 @@ NetRouteMap FastRouteCore::run()
23012301
GRT,
23022302
"congestionIterations",
23032303
1,
2304-
"Minimal overflow {} occurring at round {}.",
2304+
"Minimal congestion {} occurring at round {}.",
23052305
minofl,
23062306
minoflrnd);
23072307
copyBR();
@@ -2312,8 +2312,8 @@ NetRouteMap FastRouteCore::run()
23122312
logger_->warn(
23132313
GRT,
23142314
230,
2315-
"Congestion iterations cannot increase overflow, reached the "
2316-
"maximum number of times the total overflow can be increased.");
2315+
"Congestion iterations cannot increase congestion, reached the "
2316+
"maximum number of times the total congestion can be increased.");
23172317
}
23182318
}
23192319

@@ -2681,7 +2681,7 @@ void FastRouteCore::writeCongestionMap(const std::string& filename)
26812681
{
26822682
std::ofstream cong_file;
26832683
cong_file.open(filename);
2684-
cong_file << "x,y,l,capacity,reduction,usage,overflow\n";
2684+
cong_file << "x,y,l,capacity,reduction,usage,congestion\n";
26852685
int total_overflow = 0;
26862686
for (int l = 0; l < num_layers_; l++) {
26872687
for (int x = 0; x < x_grid_; x++) {
@@ -2699,7 +2699,7 @@ void FastRouteCore::writeCongestionMap(const std::string& filename)
26992699
}
27002700
}
27012701
}
2702-
cong_file << "Total overflow: " << total_overflow << "\n";
2702+
cong_file << "Total congestion: " << total_overflow << "\n";
27032703
cong_file.close();
27042704
}
27052705

‎src/grt/src/fastroute/src/maze.cpp‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,7 +2169,8 @@ int FastRouteCore::getOverflow2Dmaze(int* maxOverflow, int* tUsage)
21692169
// Convert to real coordinates
21702170
int x_real = tile_size_ * (x + 0.5) + x_corner_;
21712171
int y_real = tile_size_ * (y + 0.5) + y_corner_;
2172-
logger_->report("H 2D Overflow x{} y{} ({} {})", x, y, x_real, y_real);
2172+
logger_->report(
2173+
"H 2D Congestion x{} y{} ({} {})", x, y, x_real, y_real);
21732174
}
21742175
H_overflow += overflow;
21752176
max_H_overflow = std::max(max_H_overflow, overflow);
@@ -2185,7 +2186,8 @@ int FastRouteCore::getOverflow2Dmaze(int* maxOverflow, int* tUsage)
21852186
// Convert to real coordinates
21862187
int x_real = tile_size_ * (x + 0.5) + x_corner_;
21872188
int y_real = tile_size_ * (y + 0.5) + y_corner_;
2188-
logger_->report("V 2D Overflow x{} y{} ({} {})", x, y, x_real, y_real);
2189+
logger_->report(
2190+
"V 2D Congestion x{} y{} ({} {})", x, y, x_real, y_real);
21892191
}
21902192
V_overflow += overflow;
21912193
max_V_overflow = std::max(max_V_overflow, overflow);
@@ -2198,15 +2200,15 @@ int FastRouteCore::getOverflow2Dmaze(int* maxOverflow, int* tUsage)
21982200
*maxOverflow = max_overflow;
21992201

22002202
if (logger_->debugCheck(GRT, "congestion2D", 1)) {
2201-
logger_->report("Overflow report:");
2202-
logger_->report("Total usage : {}", total_usage);
2203-
logger_->report("Max H overflow : {}", max_H_overflow);
2204-
logger_->report("Max V overflow : {}", max_V_overflow);
2205-
logger_->report("Max overflow : {}", max_overflow);
2206-
logger_->report("Number overflow edges: {}", numedges);
2207-
logger_->report("H overflow : {}", H_overflow);
2208-
logger_->report("V overflow : {}", V_overflow);
2209-
logger_->report("Final overflow : {}\n", total_overflow_);
2203+
logger_->report("Congestion report:");
2204+
logger_->report("Total usage : {}", total_usage);
2205+
logger_->report("Max H congestion : {}", max_H_overflow);
2206+
logger_->report("Max V congestion : {}", max_V_overflow);
2207+
logger_->report("Max congestion : {}", max_overflow);
2208+
logger_->report("Number congestion edges: {}", numedges);
2209+
logger_->report("H congestion : {}", H_overflow);
2210+
logger_->report("V congestion : {}", V_overflow);
2211+
logger_->report("Final congestion : {}\n", total_overflow_);
22102212
}
22112213

22122214
*tUsage = total_usage;
@@ -2245,7 +2247,8 @@ int FastRouteCore::getOverflow2D(int* maxOverflow)
22452247
// Convert to real coordinates
22462248
int x_real = tile_size_ * (x + 0.5) + x_corner_;
22472249
int y_real = tile_size_ * (y + 0.5) + y_corner_;
2248-
logger_->report("H 2D Overflow x{} y{} ({} {})", x, y, x_real, y_real);
2250+
logger_->report(
2251+
"H 2D Congestion x{} y{} ({} {})", x, y, x_real, y_real);
22492252
}
22502253
H_overflow += overflow;
22512254
max_H_overflow = std::max(max_H_overflow, overflow);
@@ -2262,7 +2265,8 @@ int FastRouteCore::getOverflow2D(int* maxOverflow)
22622265
// Convert to real coordinates
22632266
int x_real = tile_size_ * (x + 0.5) + x_corner_;
22642267
int y_real = tile_size_ * (y + 0.5) + y_corner_;
2265-
logger_->report("V 2D Overflow x{} y{} ({} {})", x, y, x_real, y_real);
2268+
logger_->report(
2269+
"V 2D Congestion x{} y{} ({} {})", x, y, x_real, y_real);
22662270
}
22672271
V_overflow += overflow;
22682272
max_V_overflow = std::max(max_V_overflow, overflow);
@@ -2281,17 +2285,17 @@ int FastRouteCore::getOverflow2D(int* maxOverflow)
22812285
}
22822286

22832287
if (logger_->debugCheck(GRT, "congestion2D", 1)) {
2284-
logger_->report("Overflow report.");
2285-
logger_->report("Total hCap : {}", hCap);
2286-
logger_->report("Total vCap : {}", vCap);
2287-
logger_->report("Total usage : {}", total_usage);
2288-
logger_->report("Max H overflow : {}", max_H_overflow);
2289-
logger_->report("Max V overflow : {}", max_V_overflow);
2290-
logger_->report("Max overflow : {}", max_overflow);
2291-
logger_->report("Number of overflow edges : {}", numedges);
2292-
logger_->report("H overflow : {}", H_overflow);
2293-
logger_->report("V overflow : {}", V_overflow);
2294-
logger_->report("Final overflow : {}\n", total_overflow_);
2288+
logger_->report("Congestion report.");
2289+
logger_->report("Total hCap : {}", hCap);
2290+
logger_->report("Total vCap : {}", vCap);
2291+
logger_->report("Total usage : {}", total_usage);
2292+
logger_->report("Max H congestion : {}", max_H_overflow);
2293+
logger_->report("Max V congestion : {}", max_V_overflow);
2294+
logger_->report("Max congestion : {}", max_overflow);
2295+
logger_->report("Number of congestion edges : {}", numedges);
2296+
logger_->report("H congestion : {}", H_overflow);
2297+
logger_->report("V congestion : {}", V_overflow);
2298+
logger_->report("Final congestion : {}\n", total_overflow_);
22952299
}
22962300

22972301
return total_overflow_;
@@ -2319,7 +2323,7 @@ int FastRouteCore::getOverflow3D()
23192323
int x_real = tile_size_ * (x + 0.5) + x_corner_;
23202324
int y_real = tile_size_ * (y + 0.5) + y_corner_;
23212325
logger_->report(
2322-
">>> 3D H Overflow: x{} y{} l{} - Real coordinates: ({}, {})",
2326+
">>> 3D H Congestion: x{} y{} l{} - Real coordinates: ({}, {})",
23232327
x,
23242328
y,
23252329
k + 1,
@@ -2339,7 +2343,7 @@ int FastRouteCore::getOverflow3D()
23392343
int x_real = tile_size_ * (x + 0.5) + x_corner_;
23402344
int y_real = tile_size_ * (y + 0.5) + y_corner_;
23412345
logger_->report(
2342-
">>> 3D V Overflow: x{} y{} l{} - Real coordinates: ({}, {})",
2346+
">>> 3D V Congestion: x{} y{} l{} - Real coordinates: ({}, {})",
23432347
x,
23442348
y,
23452349
k + 1,
@@ -2355,12 +2359,12 @@ int FastRouteCore::getOverflow3D()
23552359
total_overflow_ = H_overflow + V_overflow;
23562360

23572361
if (logger_->debugCheck(GRT, "checkRoute3D", 1) && total_overflow_) {
2358-
logger_->report("=== Total 3D Overflow Summary ===");
2359-
logger_->report("Total H overflow: {}", H_overflow);
2360-
logger_->report("Total V overflow: {}", V_overflow);
2361-
logger_->report("Max H overflow: {}", max_H_overflow);
2362-
logger_->report("Max V overflow: {}", max_V_overflow);
2363-
logger_->report("Total overflow: {}", total_overflow_);
2362+
logger_->report("=== Total 3D Congestion Summary ===");
2363+
logger_->report("Total H congestion: {}", H_overflow);
2364+
logger_->report("Total V congestion: {}", V_overflow);
2365+
logger_->report("Max H congestion: {}", max_H_overflow);
2366+
logger_->report("Max V congestion: {}", max_V_overflow);
2367+
logger_->report("Total congestion: {}", total_overflow_);
23642368
}
23652369

23662370
return total_usage;

‎src/grt/src/fastroute/src/utility.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2763,7 +2763,7 @@ void FastRouteCore::saveCongestion(const int iter)
27632763

27642764
const int capacity = tile.capacity;
27652765
const int usage = tile.usage;
2766-
marker->setComment(fmt::format("capacity:{} usage:{} overflow:{}",
2766+
marker->setComment(fmt::format("capacity:{} usage:{} congestion:{}",
27672767
capacity,
27682768
usage,
27692769
usage - capacity));
@@ -2787,7 +2787,7 @@ void FastRouteCore::saveCongestion(const int iter)
27872787

27882788
const int capacity = tile.capacity;
27892789
const int usage = tile.usage;
2790-
marker->setComment(fmt::format("capacity:{} usage:{} overflow:{}",
2790+
marker->setComment(fmt::format("capacity:{} usage:{} congestion:{}",
27912791
capacity,
27922792
usage,
27932793
usage - capacity));

‎src/grt/test/clock_route.ok‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ met5 Horizontal 3108 1443 53.57%
3939
[INFO GRT-0112] Final usage 3D: 772
4040

4141
[INFO GRT-0096] Final congestion report:
42-
Layer Resource Demand Usage (%) Max H / Max V / Total Overflow
42+
Layer Resource Demand Usage (%) Max H / Max V / Total Congestion
4343
---------------------------------------------------------------------------------------
4444
li1 0 0 0.00% 0 / 0 / 0
4545
met1 4310 65 1.51% 0 / 0 / 0

‎src/grt/test/clock_route_alpha.ok‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ met5 Horizontal 3108 1443 53.57%
3939
[INFO GRT-0112] Final usage 3D: 751
4040

4141
[INFO GRT-0096] Final congestion report:
42-
Layer Resource Demand Usage (%) Max H / Max V / Total Overflow
42+
Layer Resource Demand Usage (%) Max H / Max V / Total Congestion
4343
---------------------------------------------------------------------------------------
4444
li1 0 0 0.00% 0 / 0 / 0
4545
met1 4310 66 1.53% 0 / 0 / 0

‎src/grt/test/clock_route_cugr.ok‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ met5 Horizontal 3108 3108 0.00%
3737
---------------------------------------------------------------
3838

3939
Stage 1: Pattern routing.
40-
Nets with overflow: 0.
40+
Nets with congestion: 0.
4141
Routing statistics
4242
Wire length: 2918
4343
Total via count: 135
44-
Total overflow: 0
44+
Total congestion: 0
4545
Min resource: 2
4646
Bottleneck: (5, 0, 0)
4747

4848
[INFO GRT-0096] Final congestion report:
49-
Layer Resource Demand Usage (%) Max H / Max V / Total Overflow
49+
Layer Resource Demand Usage (%) Max H / Max V / Total Congestion
5050
---------------------------------------------------------------------------------------
5151
li1 21571 3 0.01% 0 / 0 / 0
5252
met1 27555 73 0.26% 0 / 0 / 0

0 commit comments

Comments
 (0)