aboutsummaryrefslogtreecommitdiffstats
path: root/common/router2.cc
diff options
context:
space:
mode:
authorDavid Shah <dave@ds0.me>2021-01-28 16:10:22 +0000
committerGitHub <noreply@github.com>2021-01-28 16:10:22 +0000
commit15b2852b916c1299dfc1d91a217de3060701bfbe (patch)
tree8e7ffbce4b7d253f05d0bb58ea6430aae8e1b065 /common/router2.cc
parent0d9790421699a22fc6a5962b41910c3b7d089353 (diff)
parent94e8847d674388c3c8ac663fa4912bb8029b2951 (diff)
downloadnextpnr-15b2852b916c1299dfc1d91a217de3060701bfbe.tar.gz
nextpnr-15b2852b916c1299dfc1d91a217de3060701bfbe.tar.bz2
nextpnr-15b2852b916c1299dfc1d91a217de3060701bfbe.zip
Merge pull request #556 from YosysHQ/dave/cleanup
General opportunistic cleanup
Diffstat (limited to 'common/router2.cc')
-rw-r--r--common/router2.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/router2.cc b/common/router2.cc
index d19b8291..49d5fdec 100644
--- a/common/router2.cc
+++ b/common/router2.cc
@@ -396,7 +396,8 @@ struct Router2
if (ctx->getBelPinType(bp.bel, bp.pin) != PORT_IN)
return false;
for (auto p : ctx->getPipsUphill(wire))
- return false;
+ if (ctx->checkPipAvail(p))
+ return false;
return true;
}
@@ -411,7 +412,7 @@ struct Router2
WireId cursor = sink;
bool done = false;
if (ctx->debug)
- log("resevering wires for arc %d of net %s\n", int(i), ctx->nameOf(net));
+ log("reserving wires for arc %d of net %s\n", int(i), ctx->nameOf(net));
while (!done) {
auto &wd = wire_data(cursor);
if (ctx->debug)