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

Improve router console output

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-11-09 22:59:23 +01:00
parent f0a3a272ca
commit e312fc79bc
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/router1.cc
View File

@ -537,18 +537,21 @@ bool router1(Context *ctx, const Router1Cfg &cfg)
Router1 router(ctx, cfg); Router1 router(ctx, cfg);
router.setup(); router.setup();
log_info("Added %d arcs to routing queue.\n", int(router.arc_queue.size())); log_info("Routing %d arcs.\n", int(router.arc_queue.size()));
int iter_cnt = 0; int iter_cnt = 0;
int last_arcs_with_ripup = 0; int last_arcs_with_ripup = 0;
int last_arcs_without_ripup = 0; int last_arcs_without_ripup = 0;
log_info(" | (re-)routed arcs | delta | remaining\n");
log_info(" IterCnt | w/riput wo/ripup | w/r wo/r | arcs\n");
while (!router.arc_queue.empty()) { while (!router.arc_queue.empty()) {
if (++iter_cnt % 1000 == 0) { if (++iter_cnt % 1000 == 0) {
log_info("At iteration %d:\n", iter_cnt); log_info("%10d | %8d %10d | %4d %5d | %9d\n",
log_info(" routed %d (%d) arcs with rip-up.\n", router.arcs_with_ripup, router.arcs_with_ripup - last_arcs_with_ripup); iter_cnt, router.arcs_with_ripup, router.arcs_without_ripup,
log_info(" routed %d (%d) arcs without rip-up.\n", router.arcs_without_ripup, router.arcs_without_ripup - last_arcs_without_ripup); router.arcs_with_ripup - last_arcs_with_ripup,
log_info(" %d arcs remaining in routing queue.\n", int(router.arc_queue.size())); router.arcs_without_ripup - last_arcs_without_ripup, int(router.arc_queue.size()));
last_arcs_with_ripup = router.arcs_with_ripup; last_arcs_with_ripup = router.arcs_with_ripup;
last_arcs_without_ripup = router.arcs_without_ripup; last_arcs_without_ripup = router.arcs_without_ripup;
} }
@ -566,12 +569,12 @@ bool router1(Context *ctx, const Router1Cfg &cfg)
} }
} }
log_info("At iteration %d:\n", iter_cnt); log_info("%10d | %8d %10d | %4d %5d | %9d\n",
log_info(" routed %d (%d) arcs with rip-up.\n", router.arcs_with_ripup, router.arcs_with_ripup - last_arcs_with_ripup); iter_cnt, router.arcs_with_ripup, router.arcs_without_ripup,
log_info(" routed %d (%d) arcs without rip-up.\n", router.arcs_without_ripup, router.arcs_without_ripup - last_arcs_without_ripup); router.arcs_with_ripup - last_arcs_with_ripup,
log_info(" %d arcs remaining in routing queue.\n", int(router.arc_queue.size())); router.arcs_without_ripup - last_arcs_without_ripup, int(router.arc_queue.size()));
log_info("Routing finished after %d iterations.\n", iter_cnt); log_info("Routing complete.\n");
log_info("Checksum: 0x%08x\n", ctx->checksum()); log_info("Checksum: 0x%08x\n", ctx->checksum());
#ifndef NDEBUG #ifndef NDEBUG