caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

router2: Prevent overflow

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2020-02-01 15:37:50 +00:00
parent a621e04062
commit 4b54253c24
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/router2.cc
View File

@ -747,7 +747,7 @@ struct Router2
total_wire_use += int(wire.bound_nets.size()); total_wire_use += int(wire.bound_nets.size());
int overuse = int(wire.bound_nets.size()) - 1; int overuse = int(wire.bound_nets.size()) - 1;
if (overuse > 0) { if (overuse > 0) {
wire.hist_cong_cost += overuse * hist_cong_weight; wire.hist_cong_cost = std::min(1e9, wire.hist_cong_cost + overuse * hist_cong_weight);
total_overuse += overuse; total_overuse += overuse;
overused_wires += 1; overused_wires += 1;
for (auto &bound : wire.bound_nets) for (auto &bound : wire.bound_nets)
@ -1082,7 +1082,8 @@ struct Router2
log_info(" iter=%d wires=%d overused=%d overuse=%d archfail=%s\n", iter, total_wire_use, overused_wires, log_info(" iter=%d wires=%d overused=%d overuse=%d archfail=%s\n", iter, total_wire_use, overused_wires,
total_overuse, overused_wires > 0 ? "NA" : std::to_string(arch_fail).c_str()); total_overuse, overused_wires > 0 ? "NA" : std::to_string(arch_fail).c_str());
++iter; ++iter;
curr_cong_weight *= cfg.curr_cong_mult; if (curr_cong_weight < 1e9)
curr_cong_weight *= cfg.curr_cong_mult;
} while (!failed_nets.empty()); } while (!failed_nets.empty());
if (cfg.perf_profile) { if (cfg.perf_profile) {
std::vector<std::pair<int, IdString>> nets_by_runtime; std::vector<std::pair<int, IdString>> nets_by_runtime;