From 2b3f363e8975e80bb56e6adaea5604ab8fce164c Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 1 Aug 2018 17:05:30 +0200 Subject: [PATCH 1/5] Add reroute pass and other router1 tweaks Signed-off-by: Clifford Wolf --- common/router1.cc | 117 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 95 insertions(+), 22 deletions(-) diff --git a/common/router1.cc b/common/router1.cc index 46be444e94..2daefcb669 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -128,7 +128,7 @@ struct Router QueuedWire qw; qw.wire = it.first; qw.pip = PipId(); - qw.delay = it.second; + qw.delay = it.second - (it.second / 16); qw.togo = ctx->estimateDelay(qw.wire, dst_wire); qw.randtag = ctx->rng(); @@ -200,8 +200,7 @@ struct Router continue; #if 0 // FIXME if (ctx->debug) - log("Found better route to %s. Old vs new delay " - "estimate: %.3f %.3f\n", + log("Found better route to %s. Old vs new delay estimate: %.3f %.3f\n", ctx->getWireName(next_wire).c_str(), ctx->getDelayNS(visited.at(next_wire).delay), ctx->getDelayNS(next_delay)); @@ -274,16 +273,19 @@ struct Router log(" Source wire: %s\n", ctx->getWireName(src_wire).c_str(ctx)); std::unordered_map src_wires; - std::vector users_array; + std::vector> users_array; if (user_idx < 0) { - // route all users - for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) - users_array.push_back(user_idx); - ctx->shuffle(users_array); + // route all users, from worst to best slack + for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) { + auto dst_wire = ctx->getNetinfoSinkWire(net_info, net_info->users[user_idx]); + delay_t slack = net_info->users[user_idx].budget - ctx->estimateDelay(src_wire, dst_wire); + users_array.push_back(std::pair(slack, user_idx)); + } + std::sort(users_array.begin(), users_array.end()); } else { // route only the selected user - users_array.push_back(user_idx); + users_array.push_back(std::pair(delay_t(), user_idx)); } if (reroute) { @@ -315,7 +317,6 @@ struct Router delay_t delay = register_existing_path(ctx->getPipSrcWire(pip)); delay += ctx->getPipDelay(pip).maxDelay(); delay += ctx->getWireDelay(wire).maxDelay(); - delay -= 2 * ctx->getDelayEpsilon(); src_wires[wire] = delay; return delay; @@ -347,7 +348,9 @@ struct Router } } - for (int user_idx : users_array) { + for (auto user_idx_it : users_array) { + int user_idx = user_idx_it.second; + if (ctx->debug) log(" Route to: %s.%s.\n", net_info->users[user_idx].cell->name.c_str(ctx), net_info->users[user_idx].port.c_str(ctx)); @@ -565,6 +568,73 @@ void addNetRouteJobs(Context *ctx, IdString net_name, std::unordered_map &cleanupQueue, + std::priority_queue, RouteJob::Greater> &jobQueue, + int &totalVisitCnt, int &totalRevisitCnt, int &totalOvertimeRevisitCnt) +{ + std::priority_queue, RouteJob::Greater> cleanupJobs; + + for (auto net_name : cleanupQueue) { + NetInfo *net_info = ctx->nets.at(net_name).get(); + auto src_wire = ctx->getNetinfoSourceWire(net_info); + + for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) { + auto dst_wire = ctx->getNetinfoSinkWire(net_info, net_info->users[user_idx]); + RouteJob job; + job.net = net_name; + job.user_idx = user_idx; + job.slack = net_info->users[user_idx].budget - ctx->estimateDelay(src_wire, dst_wire); + job.randtag = ctx->rng(); + cleanupJobs.push(job); + } + } + + log_info("running cleanup re-route of %d nets (%d arcs).\n", + int(cleanupQueue.size()), int(cleanupJobs.size())); + + cleanupQueue.clear(); + + int visitCnt = 0, revisitCnt = 0, overtimeRevisitCnt = 0; + + while (!cleanupJobs.empty()) { + RouteJob job = cleanupJobs.top(); + cleanupJobs.pop(); + + auto net_name = job.net; + auto user_idx = job.user_idx; + + NetInfo *net_info = ctx->nets.at(net_name).get(); + auto dst_wire = ctx->getNetinfoSinkWire(net_info, net_info->users[user_idx]); + + if (net_info->wires.count(dst_wire) == 0) { + cleanupQueue.insert(net_name); + continue; + } + + ctx->unbindWire(dst_wire); + + Router router(ctx, scores, net_name, user_idx, false, false); + + if (!router.routedOkay) { + // FIXME: This should never happen + log_warning("Failed to re-route arc %d on net %s.\n", user_idx, net_name.c_str(ctx)); + jobQueue.push(job); + } + + visitCnt += router.visitCnt; + revisitCnt += router.revisitCnt; + overtimeRevisitCnt += router.overtimeRevisitCnt; + } + + if (ctx->verbose) + log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", + visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt); + + totalVisitCnt += visitCnt; + totalRevisitCnt += revisitCnt; + totalOvertimeRevisitCnt += overtimeRevisitCnt; +} + } // namespace NEXTPNR_NAMESPACE_BEGIN @@ -580,6 +650,7 @@ bool router1(Context *ctx) log_info("Routing..\n"); ctx->lock(); + std::unordered_set cleanupQueue; std::unordered_map> jobCache; std::priority_queue, RouteJob::Greater> jobQueue; @@ -669,14 +740,12 @@ bool router1(Context *ctx) } if (ctx->verbose) - log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime " - "revisits).\n", + log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt); if (!ripupQueue.empty()) { if (ctx->verbose || iterCnt == 1) - log_info("failed to route %d nets. re-routing in ripup " - "mode.\n", + log_info("failed to route %d nets. re-routing in ripup mode.\n", int(ripupQueue.size())); printNets = ctx->verbose && (ripupQueue.size() < 10); @@ -691,6 +760,8 @@ bool router1(Context *ctx) ctx->sorted_shuffle(ripupArray); for (auto net_name : ripupArray) { + cleanupQueue.insert(net_name); + if (printNets) log_info(" routing net %s. (%d users)\n", net_name.c_str(ctx), int(ctx->nets.at(net_name)->users.size())); @@ -705,8 +776,10 @@ bool router1(Context *ctx) if (!router.routedOkay) log_error("Net %s is impossible to route.\n", net_name.c_str(ctx)); - for (auto it : router.rippedNets) + for (auto it : router.rippedNets) { addFullNetRouteJob(ctx, it, jobCache, jobQueue); + cleanupQueue.insert(it); + } if (printNets) { if (router.rippedNets.size() < 10) { @@ -730,13 +803,11 @@ bool router1(Context *ctx) log_info(" routed %d nets, ripped %d nets.\n", netCnt, ripCnt); if (ctx->verbose) - log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% " - "overtime revisits).\n", + log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt); if (ctx->verbose && !jobQueue.empty()) - log_info(" ripped up %d previously routed nets. continue " - "routing.\n", + log_info(" ripped up %d previously routed nets. continue routing.\n", int(jobQueue.size())); } @@ -751,13 +822,15 @@ bool router1(Context *ctx) if (iterCnt == 8 || iterCnt == 16 || iterCnt == 32 || iterCnt == 64 || iterCnt == 128) ripup_penalty += ctx->getRipupDelayPenalty(); + if (jobQueue.empty() || (iterCnt % 5) == 4) + cleanupPass(ctx, scores, cleanupQueue, jobQueue, totalVisitCnt, totalRevisitCnt, totalOvertimeRevisitCnt); + ctx->yield(); } log_info("routing complete after %d iterations.\n", iterCnt); - log_info("visited %d PIPs (%.2f%% revisits, %.2f%% " - "overtime revisits).\n", + log_info("visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", totalVisitCnt, (100.0 * totalRevisitCnt) / totalVisitCnt, (100.0 * totalOvertimeRevisitCnt) / totalVisitCnt); From 94abe914fcdc8914120058f236286a627011c60e Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 2 Aug 2018 13:39:37 +0200 Subject: [PATCH 2/5] Improve router1 cleanupReroute Signed-off-by: Clifford Wolf --- common/router1.cc | 60 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/common/router1.cc b/common/router1.cc index 2daefcb669..452c35ac9d 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -568,16 +568,20 @@ void addNetRouteJobs(Context *ctx, IdString net_name, std::unordered_map &cleanupQueue, - std::priority_queue, RouteJob::Greater> &jobQueue, - int &totalVisitCnt, int &totalRevisitCnt, int &totalOvertimeRevisitCnt) +void cleanupReroute(Context *ctx, RipupScoreboard &scores, std::unordered_set &cleanupQueue, + std::priority_queue, RouteJob::Greater> &jobQueue, + int &totalVisitCnt, int &totalRevisitCnt, int &totalOvertimeRevisitCnt) { std::priority_queue, RouteJob::Greater> cleanupJobs; + std::vector allNetinfos; for (auto net_name : cleanupQueue) { NetInfo *net_info = ctx->nets.at(net_name).get(); auto src_wire = ctx->getNetinfoSourceWire(net_info); + if (ctx->verbose) + allNetinfos.push_back(net_info); + for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) { auto dst_wire = ctx->getNetinfoSinkWire(net_info, net_info->users[user_idx]); RouteJob job; @@ -595,6 +599,12 @@ void cleanupPass(Context *ctx, RipupScoreboard &scores, std::unordered_setverbose) { + for (auto it : allNetinfos) + totalWireCountDelta -= it->wires.size(); + } while (!cleanupJobs.empty()) { RouteJob job = cleanupJobs.top(); @@ -604,31 +614,51 @@ void cleanupPass(Context *ctx, RipupScoreboard &scores, std::unordered_setnets.at(net_name).get(); + auto src_wire = ctx->getNetinfoSourceWire(net_info); auto dst_wire = ctx->getNetinfoSinkWire(net_info, net_info->users[user_idx]); - if (net_info->wires.count(dst_wire) == 0) { - cleanupQueue.insert(net_name); - continue; + auto cursor = dst_wire; + while (cursor != src_wire) { + auto it = net_info->wires.find(cursor); + if (it == net_info->wires.end()) { + cleanupQueue.insert(net_name); + goto skipThisJob; + } + cursor = ctx->getPipSrcWire(it->second.pip); } + if (0) + skipThisJob: + continue; + + int oldWireCount = net_info->wires.size(); + ctx->unbindWire(dst_wire); Router router(ctx, scores, net_name, user_idx, false, false); - if (!router.routedOkay) { - // FIXME: This should never happen - log_warning("Failed to re-route arc %d on net %s.\n", user_idx, net_name.c_str(ctx)); - jobQueue.push(job); - } + if (!router.routedOkay) + log_error("Failed to re-route arc %d of net %s.\n", user_idx, net_name.c_str(ctx)); + + int newWireCount = net_info->wires.size(); + + if (ctx->debug && oldWireCount != newWireCount) + log_info(" rerouting arc %d of net %s changed wire count: %d -> %d (%+d)\n", + user_idx, net_name.c_str(ctx), oldWireCount, newWireCount, newWireCount - oldWireCount); visitCnt += router.visitCnt; revisitCnt += router.revisitCnt; overtimeRevisitCnt += router.overtimeRevisitCnt; } - if (ctx->verbose) - log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", - visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt); + if (ctx->verbose) { + for (auto it : allNetinfos) + totalWireCountDelta += it->wires.size(); + + log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits), %+d bound wires.\n", + visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt, + totalWireCountDelta); + } totalVisitCnt += visitCnt; totalRevisitCnt += revisitCnt; @@ -823,7 +853,7 @@ bool router1(Context *ctx) ripup_penalty += ctx->getRipupDelayPenalty(); if (jobQueue.empty() || (iterCnt % 5) == 4) - cleanupPass(ctx, scores, cleanupQueue, jobQueue, totalVisitCnt, totalRevisitCnt, totalOvertimeRevisitCnt); + cleanupReroute(ctx, scores, cleanupQueue, jobQueue, totalVisitCnt, totalRevisitCnt, totalOvertimeRevisitCnt); ctx->yield(); } From 6ccf8629b5c9f143eafa48c0427b066593f12403 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 2 Aug 2018 13:58:23 +0200 Subject: [PATCH 3/5] Add Router1Cfg Signed-off-by: Clifford Wolf --- common/router1.cc | 53 +++++++++++++++++++++++++++-------------------- common/router1.h | 9 +++++++- ecp5/arch.cc | 6 +++++- generic/arch.cc | 2 +- ice40/arch.cc | 6 +++++- 5 files changed, 50 insertions(+), 26 deletions(-) diff --git a/common/router1.cc b/common/router1.cc index 452c35ac9d..b8ab2db27d 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -105,6 +105,7 @@ void ripup_net(Context *ctx, IdString net_name) struct Router { Context *ctx; + const Router1Cfg &cfg; RipupScoreboard scores; IdString net_name; @@ -226,9 +227,9 @@ struct Router visitCnt += thisVisitCnt; } - Router(Context *ctx, RipupScoreboard &scores, WireId src_wire, WireId dst_wire, bool ripup = false, - delay_t ripup_penalty = 0) - : ctx(ctx), scores(scores), ripup(ripup), ripup_penalty(ripup_penalty) + Router(Context *ctx, const Router1Cfg &cfg, RipupScoreboard &scores, WireId src_wire, WireId dst_wire, + bool ripup = false, delay_t ripup_penalty = 0) + : ctx(ctx), cfg(cfg), scores(scores), ripup(ripup), ripup_penalty(ripup_penalty) { std::unordered_map src_wires; src_wires[src_wire] = ctx->getWireDelay(src_wire).maxDelay(); @@ -251,9 +252,9 @@ struct Router } } - Router(Context *ctx, RipupScoreboard &scores, IdString net_name, int user_idx = -1, bool reroute = false, - bool ripup = false, delay_t ripup_penalty = 0) - : ctx(ctx), scores(scores), net_name(net_name), ripup(ripup), ripup_penalty(ripup_penalty) + Router(Context *ctx, const Router1Cfg &cfg, RipupScoreboard &scores, IdString net_name, int user_idx = -1, + bool reroute = false, bool ripup = false, delay_t ripup_penalty = 0) + : ctx(ctx), cfg(cfg), scores(scores), net_name(net_name), ripup(ripup), ripup_penalty(ripup_penalty) { auto net_info = ctx->nets.at(net_name).get(); @@ -455,7 +456,8 @@ struct RouteJob }; }; -void addFullNetRouteJob(Context *ctx, IdString net_name, std::unordered_map> &cache, +void addFullNetRouteJob(Context *ctx, const Router1Cfg &cfg, + IdString net_name, std::unordered_map> &cache, std::priority_queue, RouteJob::Greater> &queue) { NetInfo *net_info = ctx->nets.at(net_name).get(); @@ -520,7 +522,8 @@ void addFullNetRouteJob(Context *ctx, IdString net_name, std::unordered_map> &cache, +void addNetRouteJobs(Context *ctx, const Router1Cfg &cfg, + IdString net_name, std::unordered_map> &cache, std::priority_queue, RouteJob::Greater> &queue) { NetInfo *net_info = ctx->nets.at(net_name).get(); @@ -568,7 +571,8 @@ void addNetRouteJobs(Context *ctx, IdString net_name, std::unordered_map &cleanupQueue, +void cleanupReroute(Context *ctx, const Router1Cfg &cfg, + RipupScoreboard &scores, std::unordered_set &cleanupQueue, std::priority_queue, RouteJob::Greater> &jobQueue, int &totalVisitCnt, int &totalRevisitCnt, int &totalOvertimeRevisitCnt) { @@ -635,7 +639,7 @@ void cleanupReroute(Context *ctx, RipupScoreboard &scores, std::unordered_setunbindWire(dst_wire); - Router router(ctx, scores, net_name, user_idx, false, false); + Router router(ctx, cfg, scores, net_name, user_idx, false, false); if (!router.routedOkay) log_error("Failed to re-route arc %d of net %s.\n", user_idx, net_name.c_str(ctx)); @@ -669,7 +673,7 @@ void cleanupReroute(Context *ctx, RipupScoreboard &scores, std::unordered_set, RouteJob::Greater> jobQueue; for (auto &net_it : ctx->nets) - addNetRouteJobs(ctx, net_it.first, jobCache, jobQueue); + addNetRouteJobs(ctx, cfg, net_it.first, jobCache, jobQueue); if (jobQueue.empty()) { log_info("found no unrouted source-sink pairs. no routing necessary.\n"); @@ -698,7 +702,7 @@ bool router1(Context *ctx) int iterCnt = 0; while (!jobQueue.empty()) { - if (iterCnt == 200) { + if (iterCnt == cfg.maxIterCnt) { log_warning("giving up after %d iterations.\n", iterCnt); log_info("Checksum: 0x%08x\n", ctx->checksum()); #ifndef NDEBUG @@ -731,6 +735,9 @@ bool router1(Context *ctx) auto user_idx = jobQueue.top().user_idx; jobQueue.pop(); + if (cfg.fullCleanupReroute) + cleanupQueue.insert(net_name); + if (printNets) { if (user_idx < 0) log_info(" routing all %d users of net %s\n", int(ctx->nets.at(net_name)->users.size()), @@ -739,7 +746,7 @@ bool router1(Context *ctx) log_info(" routing user %d of net %s\n", user_idx, net_name.c_str(ctx)); } - Router router(ctx, scores, net_name, user_idx, false, false); + Router router(ctx, cfg, scores, net_name, user_idx, false, false); jobCnt++; visitCnt += router.visitCnt; @@ -790,13 +797,14 @@ bool router1(Context *ctx) ctx->sorted_shuffle(ripupArray); for (auto net_name : ripupArray) { - cleanupQueue.insert(net_name); + if (cfg.cleanupReroute) + cleanupQueue.insert(net_name); if (printNets) log_info(" routing net %s. (%d users)\n", net_name.c_str(ctx), int(ctx->nets.at(net_name)->users.size())); - Router router(ctx, scores, net_name, -1, false, true, ripup_penalty); + Router router(ctx, cfg, scores, net_name, -1, false, true, ripup_penalty); netCnt++; visitCnt += router.visitCnt; @@ -807,8 +815,9 @@ bool router1(Context *ctx) log_error("Net %s is impossible to route.\n", net_name.c_str(ctx)); for (auto it : router.rippedNets) { - addFullNetRouteJob(ctx, it, jobCache, jobQueue); - cleanupQueue.insert(it); + addFullNetRouteJob(ctx, cfg, it, jobCache, jobQueue); + if (cfg.cleanupReroute) + cleanupQueue.insert(it); } if (printNets) { @@ -852,8 +861,8 @@ bool router1(Context *ctx) if (iterCnt == 8 || iterCnt == 16 || iterCnt == 32 || iterCnt == 64 || iterCnt == 128) ripup_penalty += ctx->getRipupDelayPenalty(); - if (jobQueue.empty() || (iterCnt % 5) == 4) - cleanupReroute(ctx, scores, cleanupQueue, jobQueue, totalVisitCnt, totalRevisitCnt, totalOvertimeRevisitCnt); + if (jobQueue.empty() || (iterCnt % 5) == 4 || (cfg.fullCleanupReroute && iterCnt == 1)) + cleanupReroute(ctx, cfg, scores, cleanupQueue, jobQueue, totalVisitCnt, totalRevisitCnt, totalOvertimeRevisitCnt); ctx->yield(); } @@ -901,7 +910,7 @@ bool router1(Context *ctx) jobCache.clear(); for (auto &net_it : ctx->nets) - addNetRouteJobs(ctx, net_it.first, jobCache, jobQueue); + addNetRouteJobs(ctx, cfg, net_it.first, jobCache, jobQueue); #ifndef NDEBUG if (!jobQueue.empty()) { @@ -936,7 +945,7 @@ bool router1(Context *ctx) bool Context::getActualRouteDelay(WireId src_wire, WireId dst_wire, delay_t &delay) { RipupScoreboard scores; - Router router(this, scores, src_wire, dst_wire); + Router router(this, Router1Cfg(), scores, src_wire, dst_wire); if (router.routedOkay) delay = router.visited.at(dst_wire).delay; return router.routedOkay; diff --git a/common/router1.h b/common/router1.h index 38552c5890..a9e84b6bee 100644 --- a/common/router1.h +++ b/common/router1.h @@ -24,7 +24,14 @@ NEXTPNR_NAMESPACE_BEGIN -extern bool router1(Context *ctx); +struct Router1Cfg +{ + int maxIterCnt = 200; + bool cleanupReroute = true; + bool fullCleanupReroute = true; +}; + +extern bool router1(Context *ctx, const Router1Cfg &cfg); NEXTPNR_NAMESPACE_END diff --git a/ecp5/arch.cc b/ecp5/arch.cc index bf05c15df0..262f43fe9c 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -428,7 +428,11 @@ delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, de bool Arch::place() { return placer1(getCtx()); } -bool Arch::route() { return router1(getCtx()); } +bool Arch::route() +{ + Router1Cfg cfg; + return router1(getCtx(), cfg); +} // ----------------------------------------------------------------------- diff --git a/generic/arch.cc b/generic/arch.cc index 66fbd1ff14..cff638df25 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -420,7 +420,7 @@ delay_t getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t bool Arch::place() { return placer1(getCtx()); } -bool Arch::route() { return router1(getCtx()); } +bool Arch::route() { return router1(getCtx(), Router1Cfg()); } // --------------------------------------------------------------- diff --git a/ice40/arch.cc b/ice40/arch.cc index b3d514b58e..2867f5919e 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -661,7 +661,11 @@ delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, de bool Arch::place() { return placer1(getCtx()); } -bool Arch::route() { return router1(getCtx()); } +bool Arch::route() +{ + Router1Cfg cfg; + return router1(getCtx(), cfg); +} // ----------------------------------------------------------------------- From 3185abe2649ad57ec6eb06ccf99ed0d767daadb9 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 2 Aug 2018 14:47:07 +0200 Subject: [PATCH 4/5] Fix router1 cleanupReroute() for "drive-by nets" Signed-off-by: Clifford Wolf --- common/router1.cc | 57 ++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/common/router1.cc b/common/router1.cc index b8ab2db27d..06da114e71 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -586,8 +586,38 @@ void cleanupReroute(Context *ctx, const Router1Cfg &cfg, if (ctx->verbose) allNetinfos.push_back(net_info); + std::unordered_map useCounters; + std::vector candidateArcs; + for (int user_idx = 0; user_idx < int(net_info->users.size()); user_idx++) { auto dst_wire = ctx->getNetinfoSinkWire(net_info, net_info->users[user_idx]); + + if (dst_wire == src_wire) + continue; + + auto cursor = dst_wire; + useCounters[cursor]++; + + while (cursor != src_wire) { + auto it = net_info->wires.find(cursor); + if (it == net_info->wires.end()) + break; + cursor = ctx->getPipSrcWire(it->second.pip); + useCounters[cursor]++; + } + + if (cursor != src_wire) + continue; + + candidateArcs.push_back(user_idx); + } + + for (int user_idx : candidateArcs) { + auto dst_wire = ctx->getNetinfoSinkWire(net_info, net_info->users[user_idx]); + + if (useCounters.at(dst_wire) != 1) + continue; + RouteJob job; job.net = net_name; job.user_idx = user_idx; @@ -618,25 +648,8 @@ void cleanupReroute(Context *ctx, const Router1Cfg &cfg, auto user_idx = job.user_idx; NetInfo *net_info = ctx->nets.at(net_name).get(); - auto src_wire = ctx->getNetinfoSourceWire(net_info); auto dst_wire = ctx->getNetinfoSinkWire(net_info, net_info->users[user_idx]); - auto cursor = dst_wire; - while (cursor != src_wire) { - auto it = net_info->wires.find(cursor); - if (it == net_info->wires.end()) { - cleanupQueue.insert(net_name); - goto skipThisJob; - } - cursor = ctx->getPipSrcWire(it->second.pip); - } - - if (0) - skipThisJob: - continue; - - int oldWireCount = net_info->wires.size(); - ctx->unbindWire(dst_wire); Router router(ctx, cfg, scores, net_name, user_idx, false, false); @@ -644,12 +657,6 @@ void cleanupReroute(Context *ctx, const Router1Cfg &cfg, if (!router.routedOkay) log_error("Failed to re-route arc %d of net %s.\n", user_idx, net_name.c_str(ctx)); - int newWireCount = net_info->wires.size(); - - if (ctx->debug && oldWireCount != newWireCount) - log_info(" rerouting arc %d of net %s changed wire count: %d -> %d (%+d)\n", - user_idx, net_name.c_str(ctx), oldWireCount, newWireCount, newWireCount - oldWireCount); - visitCnt += router.visitCnt; revisitCnt += router.revisitCnt; overtimeRevisitCnt += router.overtimeRevisitCnt; @@ -659,7 +666,7 @@ void cleanupReroute(Context *ctx, const Router1Cfg &cfg, for (auto it : allNetinfos) totalWireCountDelta += it->wires.size(); - log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits), %+d bound wires.\n", + log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime), %+d wires.\n", visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt, totalWireCountDelta); } @@ -861,7 +868,7 @@ bool router1(Context *ctx, const Router1Cfg &cfg) if (iterCnt == 8 || iterCnt == 16 || iterCnt == 32 || iterCnt == 64 || iterCnt == 128) ripup_penalty += ctx->getRipupDelayPenalty(); - if (jobQueue.empty() || (iterCnt % 5) == 4 || (cfg.fullCleanupReroute && iterCnt == 1)) + if (jobQueue.empty() || (iterCnt % 5) == 0 || (cfg.fullCleanupReroute && iterCnt == 1)) cleanupReroute(ctx, cfg, scores, cleanupQueue, jobQueue, totalVisitCnt, totalRevisitCnt, totalOvertimeRevisitCnt); ctx->yield(); From 2b0bf3f9f80ba79c677505717d008bc00f1a6124 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 2 Aug 2018 14:51:09 +0200 Subject: [PATCH 5/5] clangformat Signed-off-by: Clifford Wolf --- common/router1.cc | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/common/router1.cc b/common/router1.cc index 06da114e71..6e352866ad 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -456,8 +456,8 @@ struct RouteJob }; }; -void addFullNetRouteJob(Context *ctx, const Router1Cfg &cfg, - IdString net_name, std::unordered_map> &cache, +void addFullNetRouteJob(Context *ctx, const Router1Cfg &cfg, IdString net_name, + std::unordered_map> &cache, std::priority_queue, RouteJob::Greater> &queue) { NetInfo *net_info = ctx->nets.at(net_name).get(); @@ -522,8 +522,8 @@ void addFullNetRouteJob(Context *ctx, const Router1Cfg &cfg, net_cache[user_idx] = true; } -void addNetRouteJobs(Context *ctx, const Router1Cfg &cfg, - IdString net_name, std::unordered_map> &cache, +void addNetRouteJobs(Context *ctx, const Router1Cfg &cfg, IdString net_name, + std::unordered_map> &cache, std::priority_queue, RouteJob::Greater> &queue) { NetInfo *net_info = ctx->nets.at(net_name).get(); @@ -571,13 +571,13 @@ void addNetRouteJobs(Context *ctx, const Router1Cfg &cfg, } } -void cleanupReroute(Context *ctx, const Router1Cfg &cfg, - RipupScoreboard &scores, std::unordered_set &cleanupQueue, +void cleanupReroute(Context *ctx, const Router1Cfg &cfg, RipupScoreboard &scores, + std::unordered_set &cleanupQueue, std::priority_queue, RouteJob::Greater> &jobQueue, int &totalVisitCnt, int &totalRevisitCnt, int &totalOvertimeRevisitCnt) { std::priority_queue, RouteJob::Greater> cleanupJobs; - std::vector allNetinfos; + std::vector allNetinfos; for (auto net_name : cleanupQueue) { NetInfo *net_info = ctx->nets.at(net_name).get(); @@ -627,8 +627,7 @@ void cleanupReroute(Context *ctx, const Router1Cfg &cfg, } } - log_info("running cleanup re-route of %d nets (%d arcs).\n", - int(cleanupQueue.size()), int(cleanupJobs.size())); + log_info("running cleanup re-route of %d nets (%d arcs).\n", int(cleanupQueue.size()), int(cleanupJobs.size())); cleanupQueue.clear(); @@ -666,9 +665,8 @@ void cleanupReroute(Context *ctx, const Router1Cfg &cfg, for (auto it : allNetinfos) totalWireCountDelta += it->wires.size(); - log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime), %+d wires.\n", - visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt, - totalWireCountDelta); + log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime), %+d wires.\n", visitCnt, + (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt, totalWireCountDelta); } totalVisitCnt += visitCnt; @@ -784,13 +782,12 @@ bool router1(Context *ctx, const Router1Cfg &cfg) } if (ctx->verbose) - log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", - visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt); + log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", visitCnt, + (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt); if (!ripupQueue.empty()) { if (ctx->verbose || iterCnt == 1) - log_info("failed to route %d nets. re-routing in ripup mode.\n", - int(ripupQueue.size())); + log_info("failed to route %d nets. re-routing in ripup mode.\n", int(ripupQueue.size())); printNets = ctx->verbose && (ripupQueue.size() < 10); @@ -849,12 +846,11 @@ bool router1(Context *ctx, const Router1Cfg &cfg) log_info(" routed %d nets, ripped %d nets.\n", netCnt, ripCnt); if (ctx->verbose) - log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", - visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt); + log_info(" visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", visitCnt, + (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt); if (ctx->verbose && !jobQueue.empty()) - log_info(" ripped up %d previously routed nets. continue routing.\n", - int(jobQueue.size())); + log_info(" ripped up %d previously routed nets. continue routing.\n", int(jobQueue.size())); } if (!ctx->verbose) @@ -869,16 +865,16 @@ bool router1(Context *ctx, const Router1Cfg &cfg) ripup_penalty += ctx->getRipupDelayPenalty(); if (jobQueue.empty() || (iterCnt % 5) == 0 || (cfg.fullCleanupReroute && iterCnt == 1)) - cleanupReroute(ctx, cfg, scores, cleanupQueue, jobQueue, totalVisitCnt, totalRevisitCnt, totalOvertimeRevisitCnt); + cleanupReroute(ctx, cfg, scores, cleanupQueue, jobQueue, totalVisitCnt, totalRevisitCnt, + totalOvertimeRevisitCnt); ctx->yield(); } log_info("routing complete after %d iterations.\n", iterCnt); - log_info("visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", - totalVisitCnt, (100.0 * totalRevisitCnt) / totalVisitCnt, - (100.0 * totalOvertimeRevisitCnt) / totalVisitCnt); + log_info("visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n", totalVisitCnt, + (100.0 * totalRevisitCnt) / totalVisitCnt, (100.0 * totalOvertimeRevisitCnt) / totalVisitCnt); { float tns = 0;