caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interchange: Don't error out on missing cell ports

Browse Source 
This is required for LUTRAM support, as the upper address bits of
RAMD64E etc are missing for shallower primitives.

Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2021-04-25 16:29:13 +01:00
parent a146dbdb03
commit 64f5b1d031
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fpga_interchange/site_arch.cc
View File

@ -136,6 +136,8 @@ SiteArch::SiteArch(const SiteInformation *site_info) : ctx(site_info->ctx), site
bool have_vcc_pins = false; bool have_vcc_pins = false;
for (CellInfo *cell : site_info->cells_in_site) { for (CellInfo *cell : site_info->cells_in_site) {
for (const auto &pin_pair : cell->cell_bel_pins) { for (const auto &pin_pair : cell->cell_bel_pins) {
if (!cell->ports.count(pin_pair.first))
continue;
const PortInfo &port = cell->ports.at(pin_pair.first); const PortInfo &port = cell->ports.at(pin_pair.first);
if (port.net != nullptr) { if (port.net != nullptr) {
nets.emplace(port.net, SiteNetInfo{port.net}); nets.emplace(port.net, SiteNetInfo{port.net});

3
fpga_interchange/site_router.cc
View File

@ -59,8 +59,7 @@ bool check_initial_wires(const Context *ctx, SiteInformation *site_info)
BelId bel = cell->bel; BelId bel = cell->bel;
for (const auto &pin_pair : cell->cell_bel_pins) { for (const auto &pin_pair : cell->cell_bel_pins) {
if (!cell->ports.count(pin_pair.first)) if (!cell->ports.count(pin_pair.first))
log_error("Cell %s:%s is missing expected port %s\n", ctx->nameOf(cell), cell->type.c_str(ctx), continue;
pin_pair.first.c_str(ctx));
const PortInfo &port = cell->ports.at(pin_pair.first); const PortInfo &port = cell->ports.at(pin_pair.first);
NPNR_ASSERT(port.net != nullptr); NPNR_ASSERT(port.net != nullptr);