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

ecp5: Handle the case where both CE are the same constant

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2023-02-09 11:12:15 +01:00
parent a93f49eb04
commit a8a88d4813
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecp5/pack.cc
View File

@ -1508,6 +1508,10 @@ class Ecp5Packer
// Check if two nets have identical constant drivers // Check if two nets have identical constant drivers
bool equal_constant(NetInfo *a, NetInfo *b) bool equal_constant(NetInfo *a, NetInfo *b)
{ {
if (a == nullptr && b == nullptr)
return true;
if ((a == nullptr) != (b == nullptr))
return false;
if (a->driver.cell == nullptr || b->driver.cell == nullptr) if (a->driver.cell == nullptr || b->driver.cell == nullptr)
return (a->driver.cell == nullptr && b->driver.cell == nullptr); return (a->driver.cell == nullptr && b->driver.cell == nullptr);
if (a->driver.cell->type != id_GND && a->driver.cell->type != id_VCC) if (a->driver.cell->type != id_GND && a->driver.cell->type != id_VCC)
@ -2237,7 +2241,8 @@ class Ecp5Packer
iol->params[id_CEMUX] = str_or_default(ci->params, id_CEMUX, "CE"); iol->params[id_CEMUX] = str_or_default(ci->params, id_CEMUX, "CE");
ci->movePortTo(id_CE, iol, id_CE); ci->movePortTo(id_CE, iol, id_CE);
} else { } else {
if (iol->getPort(id_CE) != ci->getPort(id_CE) || if ((iol->getPort(id_CE) != ci->getPort(id_CE) &&
!equal_constant(iol->getPort(id_CE), ci->getPort(id_CE))) ||
str_or_default(ci->params, id_CEMUX, "CE") != str_or_default(ci->params, id_CEMUX, "CE") !=
str_or_default(iol->params, id_CEMUX, "CE")) str_or_default(iol->params, id_CEMUX, "CE"))
log_error("CE signal or polarity mismatch for IO flipflop %s with other IOFFs at " log_error("CE signal or polarity mismatch for IO flipflop %s with other IOFFs at "
@ -2303,7 +2308,8 @@ class Ecp5Packer
iol->params[id_CEMUX] = str_or_default(ci->params, id_CEMUX, "CE"); iol->params[id_CEMUX] = str_or_default(ci->params, id_CEMUX, "CE");
ci->movePortTo(id_CE, iol, id_CE); ci->movePortTo(id_CE, iol, id_CE);
} else { } else {
if (iol->getPort(id_CE) != ci->getPort(id_CE) || if ((iol->getPort(id_CE) != ci->getPort(id_CE) &&
!equal_constant(iol->getPort(id_CE), ci->getPort(id_CE))) ||
str_or_default(ci->params, id_CEMUX, "CE") != str_or_default(ci->params, id_CEMUX, "CE") !=
str_or_default(iol->params, id_CEMUX, "CE")) str_or_default(iol->params, id_CEMUX, "CE"))
log_error("CE signal or polarity mismatch for IO flipflop %s with other IOFFs at " log_error("CE signal or polarity mismatch for IO flipflop %s with other IOFFs at "