diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/arch_api.h | 1 | ||||
| -rw-r--r-- | common/arch_pybindings_shared.h | 2 | ||||
| -rw-r--r-- | common/base_arch.h | 5 | ||||
| -rw-r--r-- | common/router2.cc | 20 |
4 files changed, 15 insertions, 13 deletions
diff --git a/common/arch_api.h b/common/arch_api.h index 83872b7d..7ed81434 100644 --- a/common/arch_api.h +++ b/common/arch_api.h @@ -93,6 +93,7 @@ template <typename R> struct ArchAPI : BaseCtx virtual void bindPip(PipId pip, NetInfo *net, PlaceStrength strength) = 0; virtual void unbindPip(PipId pip) = 0; virtual bool checkPipAvail(PipId pip) const = 0; + virtual bool checkPipAvailForNet(PipId pip, NetInfo *net) const = 0; virtual NetInfo *getBoundPipNet(PipId pip) const = 0; virtual WireId getConflictingPipWire(PipId pip) const = 0; virtual NetInfo *getConflictingPipNet(PipId pip) const = 0; diff --git a/common/arch_pybindings_shared.h b/common/arch_pybindings_shared.h index 81469df3..ef355a54 100644 --- a/common/arch_pybindings_shared.h +++ b/common/arch_pybindings_shared.h @@ -60,6 +60,8 @@ fn_wrapper_0a<Context, decltype(&Context::getBels), &Context::getBels, wrap_cont fn_wrapper_2a<Context, decltype(&Context::getBelPinWire), &Context::getBelPinWire, conv_to_str<WireId>, conv_from_str<BelId>, conv_from_str<IdString>>::def_wrap(ctx_cls, "getBelPinWire"); +fn_wrapper_2a<Context, decltype(&Context::getBelPinType), &Context::getBelPinType, pass_through<PortType>, + conv_from_str<BelId>, conv_from_str<IdString>>::def_wrap(ctx_cls, "getBelPinType"); fn_wrapper_1a<Context, decltype(&Context::getWireBelPins), &Context::getWireBelPins, wrap_context<BelPinRange>, conv_from_str<WireId>>::def_wrap(ctx_cls, "getWireBelPins"); diff --git a/common/base_arch.h b/common/base_arch.h index 84629977..d4efe9ce 100644 --- a/common/base_arch.h +++ b/common/base_arch.h @@ -243,6 +243,11 @@ template <typename R> struct BaseArch : ArchAPI<R> p2n_entry = nullptr; } virtual bool checkPipAvail(PipId pip) const override { return getBoundPipNet(pip) == nullptr; } + virtual bool checkPipAvailForNet(PipId pip, NetInfo *net) const override + { + NetInfo *bound_net = getBoundPipNet(pip); + return bound_net == nullptr || bound_net == net; + } virtual NetInfo *getBoundPipNet(PipId pip) const override { auto fnd = base_pip2net.find(pip); diff --git a/common/router2.cc b/common/router2.cc index 002a05a3..a233cdc5 100644 --- a/common/router2.cc +++ b/common/router2.cc @@ -588,7 +588,7 @@ struct Router2 bool did_something = false; for (auto uh : ctx->getPipsUphill(flat_wires[cursor].w)) { did_something = true; - if (!ctx->checkPipAvail(uh) && ctx->getBoundPipNet(uh) != net) + if (!ctx->checkPipAvailForNet(uh, net)) continue; if (cpip != PipId() && cpip != uh) continue; // don't allow multiple pips driving a wire with a net @@ -675,18 +675,12 @@ struct Router2 #else if (is_bb && !hit_test_pip(ad.bb, ctx->getPipLocation(dh))) continue; - if (!ctx->checkPipAvail(dh)) { - NetInfo *bound_net = ctx->getBoundPipNet(dh); - if (bound_net != net) { - if (bound_net != nullptr) { - ROUTE_LOG_DBG("Skipping pip %s because it is bound to net '%s' not net '%s'\n", - ctx->nameOfPip(dh), bound_net->name.c_str(ctx), net->name.c_str(ctx)); - } else { - ROUTE_LOG_DBG("Skipping pip %s because it is reported not available\n", ctx->nameOfPip(dh)); - } - - continue; - } + if (!ctx->checkPipAvailForNet(dh, net)) { + ROUTE_LOG_DBG("Skipping pip %s because it is bound to net '%s' not net '%s'\n", ctx->nameOfPip(dh), + ctx->getBoundPipNet(dh) != nullptr ? ctx->getBoundPipNet(dh)->name.c_str(ctx) + : "<not a net>", + net->name.c_str(ctx)); + continue; } #endif // Evaluate score of next wire |