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

ecp5: Remove excessive debugging from global promoter

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-09-29 17:38:39 +01:00
parent c5f9a12bb1
commit 5e46d1eb98
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecp5/globals.cc
View File

@ -92,10 +92,8 @@ class Ecp5GlobalRouter
tap_loc.x = ctx->globalInfoAtLoc(tile_glb.location).tap_col; tap_loc.x = ctx->globalInfoAtLoc(tile_glb.location).tap_col;
tap_loc.y = tile_glb.location.y; tap_loc.y = tile_glb.location.y;
if (td == TAP_DIR_LEFT) { if (td == TAP_DIR_LEFT) {
log_info(" finding tap %d, %d, %s\n", tap_loc.x, tap_loc.y, ("L_" + glbName).c_str());
tap_wire = ctx->getWireByLocAndBasename(tap_loc, "L_" + glbName); tap_wire = ctx->getWireByLocAndBasename(tap_loc, "L_" + glbName);
} else { } else {
log_info(" finding tap %d, %d, %s\n", tap_loc.x, tap_loc.y, ("R_" + glbName).c_str());
tap_wire = ctx->getWireByLocAndBasename(tap_loc, "R_" + glbName); tap_wire = ctx->getWireByLocAndBasename(tap_loc, "R_" + glbName);
} }
NPNR_ASSERT(tap_wire != WireId()); NPNR_ASSERT(tap_wire != WireId());
@ -149,7 +147,6 @@ class Ecp5GlobalRouter
ctx->getBelName(user.cell->bel).c_str(ctx), user.port.c_str(ctx)); ctx->getBelName(user.cell->bel).c_str(ctx), user.port.c_str(ctx));
} }
} }
log_info(" routing net %s from %s\n", net->name.c_str(ctx), ctx->getWireName(next).c_str(ctx));
// Set all the pips we found along the way // Set all the pips we found along the way
WireId cursor = next; WireId cursor = next;
while (true) { while (true) {
@ -158,7 +155,6 @@ class Ecp5GlobalRouter
break; break;
ctx->bindPip(fnd->second, net, STRENGTH_LOCKED); ctx->bindPip(fnd->second, net, STRENGTH_LOCKED);
cursor = ctx->getPipDstWire(fnd->second); cursor = ctx->getPipDstWire(fnd->second);
log_info(" via %s\n", ctx->getWireName(cursor).c_str(ctx));
} }
// If the global network inside the tile isn't already set up, // If the global network inside the tile isn't already set up,
@ -215,8 +211,6 @@ class Ecp5GlobalRouter
cursor = visit.front(); cursor = visit.front();
visit.pop(); visit.pop();
NetInfo *bound = ctx->getBoundWireNet(cursor); NetInfo *bound = ctx->getBoundWireNet(cursor);
if (ctx->verbose)
log_info(" exploring %s\n", ctx->getWireName(cursor).c_str(ctx));
if (bound == net) { if (bound == net) {
} else if (bound != nullptr) { } else if (bound != nullptr) {
continue; continue;
@ -225,8 +219,6 @@ class Ecp5GlobalRouter
break; break;
for (auto dh : ctx->getPipsDownhill(cursor)) { for (auto dh : ctx->getPipsDownhill(cursor)) {
WireId pipDst = ctx->getPipDstWire(dh); WireId pipDst = ctx->getPipDstWire(dh);
if (ctx->verbose)
log_info(" downhill -> %s\n", ctx->getWireName(pipDst).c_str(ctx));
if (backtrace.count(pipDst)) if (backtrace.count(pipDst))
continue; continue;
backtrace[pipDst] = dh; backtrace[pipDst] = dh;
@ -244,7 +236,7 @@ class Ecp5GlobalRouter
} }
ctx->bindPip(fnd->second, net, STRENGTH_LOCKED); ctx->bindPip(fnd->second, net, STRENGTH_LOCKED);
cursor = ctx->getPipSrcWire(fnd->second); cursor = ctx->getPipSrcWire(fnd->second);
} }\
if (ctx->getBoundWireNet(src) == nullptr) if (ctx->getBoundWireNet(src) == nullptr)
ctx->bindWire(src, net, STRENGTH_LOCKED); ctx->bindWire(src, net, STRENGTH_LOCKED);
return true; return true;