diff options
Diffstat (limited to 'fpga_interchange')
| -rw-r--r-- | fpga_interchange/fpga_interchange.cpp | 5 | ||||
| -rw-r--r-- | fpga_interchange/site_router.cc | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/fpga_interchange/fpga_interchange.cpp b/fpga_interchange/fpga_interchange.cpp index 89f1f958..92d409f9 100644 --- a/fpga_interchange/fpga_interchange.cpp +++ b/fpga_interchange/fpga_interchange.cpp @@ -313,6 +313,11 @@ static void emit_net( // FIXME: Consider making sure that wire_data.bel_pins[0] is always the // source BEL pin in the BBA generator. static BelPin find_source(const Context *ctx, WireId source_wire) { + if (source_wire.tile == -1) { + // Nodal wire, probably a constant, cannot have an associated bel pin + return BelPin(); + } + const TileTypeInfoPOD & tile_type = loc_info(ctx->chip_info, source_wire); const TileWireInfoPOD & wire_data = tile_type.wire_data[source_wire.index]; diff --git a/fpga_interchange/site_router.cc b/fpga_interchange/site_router.cc index 94d7ee17..92176d86 100644 --- a/fpga_interchange/site_router.cc +++ b/fpga_interchange/site_router.cc @@ -858,9 +858,7 @@ static void apply_constant_routing(Context *ctx, const SiteArch &site_arch, NetI NPNR_ASSERT(net == vcc_net || net == gnd_net); for (auto &user : site_net->users) { - // FIXME: Handle case where pip is "can_invert", and that - // inversion helps with accomidating "best constant". - bool is_path_inverting = false; + bool is_path_inverting = false, path_can_invert = false; SiteWire wire = user; PipId inverting_pip; @@ -879,10 +877,16 @@ static void apply_constant_routing(Context *ctx, const SiteArch &site_arch, NetI inverting_pip = pip.pip; } + if (site_arch.canInvert(pip)) { + path_can_invert = true; + NPNR_ASSERT(pip.type == SitePip::SITE_PIP); + inverting_pip = pip.pip; + } + wire = site_arch.getPipSrcWire(pip); } - if (!is_path_inverting) { + if (!is_path_inverting && !path_can_invert) { // This routing is boring, use base logic. apply_simple_routing(ctx, site_arch, net, site_net, user); continue; @@ -956,7 +960,7 @@ static void apply_constant_routing(Context *ctx, const SiteArch &site_arch, NetI SitePip site_pip = site_net->wires.at(wire).pip; NPNR_ASSERT(site_arch.getPipDstWire(site_pip) == wire); - if (site_arch.isInverting(site_pip)) { + if (site_arch.isInverting(site_pip) || site_arch.canInvert(site_pip)) { NPNR_ASSERT(after_inverter); after_inverter = false; |