luke
/
nextpnr
mirror of https://github.com/YosysHQ/nextpnr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mux bridges need cell bel pins too

This commit is contained in:
Lofty 2026-01-09 18:12:34 +00:00
parent 3227e4d717
commit c03dfdc7dc
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
himbaechel/uarch/gatemate/gatemate.cc
View File

@ -422,10 +422,16 @@ void GateMateImpl::reassign_bridges(NetInfo *ni, const dict<WireId, PipMap> &net
NetInfo *new_net = ctx->createNet(ctx->idf("%s$muxout", name.c_str(ctx))); NetInfo *new_net = ctx->createNet(ctx->idf("%s$muxout", name.c_str(ctx)));
IdString in_port = ctx->idf("IN%d", extra_data.value + 1); IdString in_port = ctx->idf("IN%d", extra_data.value + 1);
cell->addInput(in_port); auto add_port = [&](const IdString id, PortType dir) {
cell->connectPort(in_port, ni); cell->ports[id].name = id;
cell->ports[id].type = dir;
cell->cell_bel_pins[id] = std::vector{id};
};
cell->addOutput(id_MUXOUT); add_port(in_port, PORT_IN);
add_port(id_MUXOUT, PORT_OUT);
cell->connectPort(in_port, ni);
cell->connectPort(id_MUXOUT, new_net); cell->connectPort(id_MUXOUT, new_net);
num++; num++;
@ -471,6 +477,7 @@ void GateMateImpl::reassign_cplines(NetInfo *ni, const dict<WireId, PipMap> &net
auto add_port = [&](const IdString id, PortType dir) { auto add_port = [&](const IdString id, PortType dir) {
cell->ports[id].name = id; cell->ports[id].name = id;
cell->ports[id].type = dir; cell->ports[id].type = dir;
cell->cell_bel_pins[id] = std::vector{id};
}; };
add_port(id_OUT1, PORT_IN); add_port(id_OUT1, PORT_IN);
@ -525,8 +532,6 @@ void GateMateImpl::reassign_cplines(NetInfo *ni, const dict<WireId, PipMap> &net
auto input_port_name = input_port_map.find(ctx->getWireName(ctx->getPipSrcWire(pip))[1]); auto input_port_name = input_port_map.find(ctx->getWireName(ctx->getPipSrcWire(pip))[1]);
NPNR_ASSERT(input_port_name != input_port_map.end()); NPNR_ASSERT(input_port_name != input_port_map.end());
NPNR_ASSERT(cell->ports.find(input_port_name->second) == cell->ports.end());
cell->addInput(input_port_name->second);
cell->connectPort(input_port_name->second, ni); cell->connectPort(input_port_name->second, ni);
auto output_port_map = auto output_port_map =
@ -536,7 +541,6 @@ void GateMateImpl::reassign_cplines(NetInfo *ni, const dict<WireId, PipMap> &net
auto output_port_name = output_port_map.find(ctx->getWireName(ctx->getPipDstWire(pip))[1]); auto output_port_name = output_port_map.find(ctx->getWireName(ctx->getPipDstWire(pip))[1]);
NPNR_ASSERT(output_port_name != output_port_map.end()); NPNR_ASSERT(output_port_name != output_port_map.end());
NPNR_ASSERT(cell->ports.find(output_port_name->second) == cell->ports.end());
NetInfo *new_net = NetInfo *new_net =
ctx->createNet(ctx->idf("%s$%s", cell->name.c_str(ctx), output_port_name->second.c_str(ctx))); ctx->createNet(ctx->idf("%s$%s", cell->name.c_str(ctx), output_port_name->second.c_str(ctx)));
@ -565,9 +569,6 @@ void GateMateImpl::postRoute()
if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.flags & MUX_ROUTING)) { if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.flags & MUX_ROUTING)) {
nets_with_bridges.insert(ni->name); nets_with_bridges.insert(ni->name);
} }
if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.mask != 0)) {
nets_with_cplines.insert(ni->name);
}
} }
} }
} }
@ -615,6 +616,18 @@ void GateMateImpl::postRoute()
num = 0; num = 0;
for (auto &net : ctx->nets) {
NetInfo *ni = net.second.get();
for (auto &w : ni->wires) {
if (w.second.pip != PipId()) {
const auto &extra_data = *pip_extra_data(w.second.pip);
if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.mask != 0)) {
nets_with_cplines.insert(ni->name);
}
}
}
}
for (auto net_name : nets_with_cplines) { for (auto net_name : nets_with_cplines) {
auto *ni = ctx->nets.at(net_name).get(); auto *ni = ctx->nets.at(net_name).get();
auto net_wires = ni->wires; // copy wires to preserve across unbind/rebind. auto net_wires = ni->wires; // copy wires to preserve across unbind/rebind.