diff options
| author | David Shah <davey1576@gmail.com> | 2018-06-20 13:01:30 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-06-20 13:01:30 +0200 |
| commit | c667f640d50b8b6ac7c3c3a25f0990c1ba522ae3 (patch) | |
| tree | 99d69744331bbfed7627c2bd792abe0a0251b7da /common/route.cc | |
| parent | 4648d3bc839f1c8458d3b96bc572774600eaa33f (diff) | |
| parent | 37f7802c6cfb9d9612e595c9914704c5403db9df (diff) | |
| download | nextpnr-c667f640d50b8b6ac7c3c3a25f0990c1ba522ae3.tar.gz nextpnr-c667f640d50b8b6ac7c3c3a25f0990c1ba522ae3.tar.bz2 nextpnr-c667f640d50b8b6ac7c3c3a25f0990c1ba522ae3.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr
Diffstat (limited to 'common/route.cc')
| -rw-r--r-- | common/route.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/common/route.cc b/common/route.cc index b031237c..42a705a1 100644 --- a/common/route.cc +++ b/common/route.cc @@ -206,15 +206,16 @@ struct Router assert(next_delay >= 0); if (visited.count(next_wire)) { - if (visited.at(next_wire).delay <= next_delay + 1e-3) + if (visited.at(next_wire).delay <= + next_delay + ctx->getDelayEpsilon()) continue; #if 0 // FIXME if (ctx->verbose) log("Found better route to %s. Old vs new delay " - "estimate: %.2f %.2f\n", + "estimate: %.3f %.3f\n", ctx->getWireName(next_wire).c_str(), - float(visited.at(next_wire).delay), - float(next_delay)); + ctx->getDelayNS(visited.at(next_wire).delay), + ctx->getDelayNS(next_delay)); #endif revisitCnt++; } @@ -246,8 +247,8 @@ struct Router } if (ctx->verbose) - log(" Final path delay: %.2f\n", - float(visited[dst_wire].delay)); + log(" Final path delay: %.3f\n", + ctx->getDelayNS(visited[dst_wire].delay)); maxDelay = fmaxf(maxDelay, visited[dst_wire].delay); if (ctx->verbose) @@ -257,7 +258,8 @@ struct Router while (1) { if (ctx->verbose) - log(" %8.2f %s\n", float(visited[cursor].delay), + log(" %8.3f %s\n", + ctx->getDelayNS(visited[cursor].delay), ctx->getWireName(cursor).c_str(ctx)); if (src_wires.count(cursor)) |