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

ice40: Fix accidental creation of empty ports

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2022-06-25 15:56:16 +01:00
parent f11225360b
commit 6122f172e3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ice40/arch_place.cc
View File

@ -95,7 +95,7 @@ bool Arch::isBelLocationValid(BelId bel) const
} }
return logic_cells_compatible(bel_cells.data(), num_cells); return logic_cells_compatible(bel_cells.data(), num_cells);
} else { } else {
CellInfo *cell = getBoundBelCell(bel); const CellInfo *cell = getBoundBelCell(bel);
if (cell == nullptr) if (cell == nullptr)
return true; return true;
else if (cell->type == id_SB_IO) { else if (cell->type == id_SB_IO) {
@ -107,7 +107,7 @@ bool Arch::isBelLocationValid(BelId bel) const
for (auto pin : getWireBelPins(wire)) { for (auto pin : getWireBelPins(wire)) {
if (pin.pin == id_PLLOUT_A || pin.pin == id_PLLOUT_B) { if (pin.pin == id_PLLOUT_A || pin.pin == id_PLLOUT_B) {
// Is there a PLL there ? // Is there a PLL there ?
auto pll_cell = getBoundBelCell(pin.bel); const CellInfo *pll_cell = getBoundBelCell(pin.bel);
if (pll_cell == nullptr) if (pll_cell == nullptr)
break; break;
@ -116,11 +116,11 @@ bool Arch::isBelLocationValid(BelId bel) const
break; break;
// Is that SB_IO used at an input ? // Is that SB_IO used at an input ?
if ((cell->ports[id_D_IN_0].net == nullptr) && (cell->ports[id_D_IN_1].net == nullptr)) if ((cell->getPort(id_D_IN_0) == nullptr) && (cell->getPort(id_D_IN_1) == nullptr))
break; break;
// Are we perhaps a PAD INPUT Bel that can be placed here? // Are we perhaps a PAD INPUT Bel that can be placed here?
if (pll_cell->attrs[id_BEL_PAD_INPUT] == getBelName(bel).str(getCtx())) if (str_or_default(pll_cell->attrs, id_BEL_PAD_INPUT, "") == getBelName(bel).str(getCtx()))
return true; return true;
// Conflict // Conflict
@ -144,7 +144,7 @@ bool Arch::isBelLocationValid(BelId bel) const
} else { } else {
// Check LVDS IO is not placed at complement location // Check LVDS IO is not placed at complement location
BelId compBel = getBelByLocation(compLoc); BelId compBel = getBelByLocation(compLoc);
CellInfo *compCell = getBoundBelCell(compBel); const CellInfo *compCell = getBoundBelCell(compBel);
if (compCell && compCell->ioInfo.lvds) if (compCell && compCell->ioInfo.lvds)
return false; return false;
@ -161,10 +161,10 @@ bool Arch::isBelLocationValid(BelId bel) const
_io_pintype_need_clk_en(cell->ioInfo.pintype), _io_pintype_need_clk_en(cell->ioInfo.pintype),
_io_pintype_need_clk_en(compCell->ioInfo.pintype), _io_pintype_need_clk_en(compCell->ioInfo.pintype),
}; };
NetInfo *nets[] = { const NetInfo *nets[] = {
cell->ports[id_INPUT_CLK].net, compCell->ports[id_INPUT_CLK].net, cell->getPort(id_INPUT_CLK), compCell->getPort(id_INPUT_CLK),
cell->ports[id_OUTPUT_CLK].net, compCell->ports[id_OUTPUT_CLK].net, cell->getPort(id_OUTPUT_CLK), compCell->getPort(id_OUTPUT_CLK),
cell->ports[id_CLOCK_ENABLE].net, compCell->ports[id_CLOCK_ENABLE].net, cell->getPort(id_CLOCK_ENABLE), compCell->getPort(id_CLOCK_ENABLE),
}; };
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)