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

Improve router log messages

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-17 19:27:48 +02:00
parent 8e8838c8a7
commit 3cfd6841dc
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/route.cc
View File

@ -369,7 +369,14 @@ void route_design(Design *design, bool verbose)
std::unordered_set<IdString> ripupQueue; std::unordered_set<IdString> ripupQueue;
log_info("routing queue contains %d nets.\n", int(netsQueue.size()));
bool printNets = netsQueue.size() < 10;
for (auto net_name : netsQueue) { for (auto net_name : netsQueue) {
if (printNets)
log_info(" routing net %s. (%d users)\n", net_name.c_str(),
int(design->nets.at(net_name)->users.size()));
Router router(design, net_name, verbose, false); Router router(design, net_name, verbose, false);
netCnt++; netCnt++;
@ -382,7 +389,7 @@ void route_design(Design *design, bool verbose)
ripupQueue.insert(net_name); ripupQueue.insert(net_name);
} }
if (netCnt % 100 == 0) if (!printNets && netCnt % 100 == 0)
log_info(" processed %d nets. (%d routed, %d failed)\n", log_info(" processed %d nets. (%d routed, %d failed)\n",
netCnt, netCnt - int(ripupQueue.size()), netCnt, netCnt - int(ripupQueue.size()),
int(ripupQueue.size())); int(ripupQueue.size()));
@ -397,15 +404,21 @@ void route_design(Design *design, bool verbose)
visitCnt, (100.0 * revisitCnt) / visitCnt); visitCnt, (100.0 * revisitCnt) / visitCnt);
if (!ripupQueue.empty()) { if (!ripupQueue.empty()) {
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())); int(ripupQueue.size()));
printNets = ripupQueue.size() < 10;
visitCnt = 0; visitCnt = 0;
revisitCnt = 0; revisitCnt = 0;
netCnt = 0; netCnt = 0;
int ripCnt = 0; int ripCnt = 0;
for (auto net_name : ripupQueue) { for (auto net_name : ripupQueue) {
if (printNets)
log_info(" routing net %s. (%d users)\n", net_name.c_str(),
int(design->nets.at(net_name)->users.size()));
Router router(design, net_name, verbose, true, Router router(design, net_name, verbose, true,
ripup_pip_penalty, ripup_wire_penalty); ripup_pip_penalty, ripup_wire_penalty);
@ -422,9 +435,22 @@ void route_design(Design *design, bool verbose)
for (auto it : router.rippedNets) for (auto it : router.rippedNets)
netsQueue.insert(it); netsQueue.insert(it);
if (printNets) {
if (router.rippedNets.size() < 10) {
log_info(" ripped up %d other nets:\n",
int(router.rippedNets.size()));
for (auto n : router.rippedNets)
log_info(" %s (%d users)\n", n.c_str(),
int(design->nets.at(n)->users.size()));
} else {
log_info(" ripped up %d other nets.\n",
int(router.rippedNets.size()));
}
}
ripCnt += router.rippedNets.size(); ripCnt += router.rippedNets.size();
if (netCnt % 100 == 0) if (!printNets && netCnt % 100 == 0)
log_info(" routed %d nets, ripped %d nets.\n", netCnt, log_info(" routed %d nets, ripped %d nets.\n", netCnt,
ripCnt); ripCnt);
} }