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

ecp5: Improve packer robustness to FF dangling M input

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2023-09-01 14:54:27 +02:00 committed by myrtle
parent a9a9251e42
commit 79c6840fef
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ecp5/pack.cc
View File

@ -234,6 +234,12 @@ class Ecp5Packer
CellInfo *ci = cell.second.get();
if (is_ff(ctx, ci)) {
NetInfo *di = ci->getPort(id_DI);
NetInfo *m = ci->getPort(id_M);
if (ci->ports.count(id_M) && (!m || !m->driver.cell)) {
// M input is floating. Remove it, so renamePort doesn't hit trouble
ci->disconnectPort(id_M);
ci->ports.erase(id_M);
}
if (di->driver.cell != nullptr && di->driver.cell->type == id_TRELLIS_COMB && di->driver.port == id_F) {
CellInfo *comb = di->driver.cell;
if (comb->cluster != ClusterId()) {