From 6fe071ad1d47c363f665995ae774edcd547e022d Mon Sep 17 00:00:00 2001 From: gatecat Date: Tue, 6 Jul 2021 10:21:31 +0100 Subject: router2: Dump pre-bound routes when routing fails in debug mode Signed-off-by: gatecat --- common/router2.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/router2.cc b/common/router2.cc index a8eea5f9..a1fd8bef 100644 --- a/common/router2.cc +++ b/common/router2.cc @@ -856,10 +856,20 @@ struct Router2 int(a.first), int(a.second), ctx->nameOf(net)); auto res2 = route_arc(t, net, a.first, a.second, is_mt, false); // If this also fails, no choice but to give up - if (res2 != ARC_SUCCESS) + if (res2 != ARC_SUCCESS) { + if (ctx->debug) { + log_info("Pre-bound routing: \n"); + for (auto &wire_pair : net->wires) { + log(" %s", ctx->nameOfWire(wire_pair.first)); + if (wire_pair.second.pip != PipId()) + log(" %s", ctx->nameOfPip(wire_pair.second.pip)); + log("\n"); + } + } log_error("Failed to route arc %d.%d of net '%s', from %s to %s.\n", int(a.first), int(a.second), ctx->nameOf(net), ctx->nameOfWire(ctx->getNetinfoSourceWire(net)), ctx->nameOfWire(ctx->getNetinfoSinkWire(net, net->users.at(a.first), a.second))); + } } } } -- cgit v1.2.3 From 31abefc8e49edce55fb42c99ac99b81e948d9004 Mon Sep 17 00:00:00 2001 From: gatecat Date: Tue, 6 Jul 2021 10:38:08 +0100 Subject: interchange: Allow pseudo pip wires to overlap with bound site wires on the same net Signed-off-by: gatecat --- common/router2.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'common') diff --git a/common/router2.cc b/common/router2.cc index a1fd8bef..7bffc089 100644 --- a/common/router2.cc +++ b/common/router2.cc @@ -978,17 +978,17 @@ struct Router2 log_error("Internal error; incomplete route tree for arc %d of net %s.\n", usr_idx, ctx->nameOf(net)); } auto &p = wd.bound_nets.at(net->udata).second; - if (!ctx->checkPipAvail(p)) { + if (ctx->checkPipAvailForNet(p, net)) { NetInfo *bound_net = ctx->getBoundPipNet(p); - if (bound_net != net) { - if (ctx->verbose) { - log_info("Failed to bind pip %s to net %s\n", ctx->nameOfPip(p), net->name.c_str(ctx)); - } - success = false; - break; + if (bound_net == nullptr) { + to_bind.push_back(p); } } else { - to_bind.push_back(p); + if (ctx->verbose) { + log_info("Failed to bind pip %s to net %s\n", ctx->nameOfPip(p), net->name.c_str(ctx)); + } + success = false; + break; } cursor = ctx->getPipSrcWire(p); } -- cgit v1.2.3 From 3d0facf1192ca38e5326ff088c585dfc86b63dc2 Mon Sep 17 00:00:00 2001 From: gatecat Date: Tue, 6 Jul 2021 11:34:14 +0100 Subject: design_utils: Fix memory error Signed-off-by: gatecat --- common/design_utils.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common') diff --git a/common/design_utils.cc b/common/design_utils.cc index a892feaa..da5decf9 100644 --- a/common/design_utils.cc +++ b/common/design_utils.cc @@ -161,7 +161,8 @@ void rename_net(Context *ctx, NetInfo *net, IdString new_name) if (net == nullptr) return; NPNR_ASSERT(!ctx->nets.count(new_name)); - std::swap(ctx->nets[net->name], ctx->nets[new_name]); + ctx->nets[new_name]; + std::swap(ctx->nets.at(net->name), ctx->nets.at(new_name)); ctx->nets.erase(net->name); net->name = new_name; } -- cgit v1.2.3