diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/archcheck.cc | 8 | ||||
| -rw-r--r-- | common/placer1.cc | 6 | ||||
| -rw-r--r-- | common/timing.cc | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/common/archcheck.cc b/common/archcheck.cc index 412feca9..6efa3a1e 100644 --- a/common/archcheck.cc +++ b/common/archcheck.cc @@ -48,7 +48,7 @@ void archcheck_names(const Context *ctx) IdString name = ctx->getWireName(wire); WireId wire2 = ctx->getWireByName(name); if (wire != wire2) { - log_error("wire != wire2, name = %s\n", name.c_str(ctx)); + log_error("wire != wire2, name = %s\n", ctx->nameOfWire(wire)); } } @@ -67,7 +67,7 @@ void archcheck_names(const Context *ctx) IdString name = ctx->getPipName(pip); PipId pip2 = ctx->getPipByName(name); if (pip != pip2) { - log_error("pip != pip2, name = %s\n", name.c_str(ctx)); + log_error("pip != pip2, name = %s\n", ctx->nameOfPip(pip)); } } #endif @@ -109,7 +109,7 @@ void archcheck_locs(const Context *ctx) if (bel == BelId()) continue; Loc loc = ctx->getBelLocation(bel); - dbg(" + %d %s\n", z, ctx->getBelName(bel).c_str(ctx)); + dbg(" + %d %s\n", z, ctx->nameOfBel(bel)); log_assert(x == loc.x); log_assert(y == loc.y); log_assert(z == loc.z); @@ -118,7 +118,7 @@ void archcheck_locs(const Context *ctx) for (BelId bel : ctx->getBelsByTile(x, y)) { Loc loc = ctx->getBelLocation(bel); - dbg(" - %d %s\n", loc.z, ctx->getBelName(bel).c_str(ctx)); + dbg(" - %d %s\n", loc.z, ctx->nameOfBel(bel)); log_assert(x == loc.x); log_assert(y == loc.y); log_assert(usedz.count(loc.z)); diff --git a/common/placer1.cc b/common/placer1.cc index c54c3cf2..280dd02e 100644 --- a/common/placer1.cc +++ b/common/placer1.cc @@ -563,9 +563,9 @@ class SAPlacer } commit_cost_changes(moveChange); #if 0 - log_info("swap %s -> %s\n", cell->name.c_str(ctx), ctx->getBelName(newBel).c_str(ctx)); + log_info("swap %s -> %s\n", cell->name.c_str(ctx), ctx->nameOfBel(newBel)); if (other_cell != nullptr) - log_info("swap %s -> %s\n", other_cell->name.c_str(ctx), ctx->getBelName(oldBel).c_str(ctx)); + log_info("swap %s -> %s\n", other_cell->name.c_str(ctx), ctx->nameOfBel(oldBel)); #endif return true; swap_fail: @@ -590,7 +590,7 @@ class SAPlacer { BelId oldBel = cell->bel; #if 0 - log_info("%s old: %s new: %s\n", cell->name.c_str(ctx), ctx->getBelName(cell->bel).c_str(ctx), ctx->getBelName(newBel).c_str(ctx)); + log_info("%s old: %s new: %s\n", cell->name.c_str(ctx), ctx->nameOfBel(cell->bel), ctx->nameOfBel(newBel)); #endif CellInfo *bound = ctx->getBoundBelCell(newBel); if (bound != nullptr) diff --git a/common/timing.cc b/common/timing.cc index d8445989..9fb14a33 100644 --- a/common/timing.cc +++ b/common/timing.cc @@ -885,8 +885,7 @@ void timing_analysis(Context *ctx, bool print_histogram, bool print_fmax, bool p auto pip = it->second.pip; NPNR_ASSERT(pip != PipId()); delay = ctx->getPipDelay(pip).maxDelay(); - log_info(" %1.3f %s\n", ctx->getDelayNS(delay), - ctx->getPipName(pip).c_str(ctx)); + log_info(" %1.3f %s\n", ctx->getDelayNS(delay), ctx->nameOfPip(pip)); cursor = ctx->getPipSrcWire(pip); } } |