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

ecp5: Fix missing LUT inputs, fixes #301

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-07-10 09:34:22 +01:00
parent 19cb4ca554
commit d297a96dc1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecp5/pack.cc
View File

@ -204,6 +204,8 @@ class Ecp5Packer
} }
} }
for (const char *inp : {"A", "B", "C", "D"}) { for (const char *inp : {"A", "B", "C", "D"}) {
if (!ci->ports.count(ctx->id(inp)))
continue;
NetInfo *innet = ci->ports.at(ctx->id(inp)).net; NetInfo *innet = ci->ports.at(ctx->id(inp)).net;
if (innet != nullptr && innet->driver.cell != nullptr) { if (innet != nullptr && innet->driver.cell != nullptr) {
CellInfo *drv = innet->driver.cell; CellInfo *drv = innet->driver.cell;
@ -258,6 +260,8 @@ class Ecp5Packer
// Pack LUTs sharing an input with a simple fanout-based heuristic // Pack LUTs sharing an input with a simple fanout-based heuristic
for (const char *inp : {"A", "B", "C", "D"}) { for (const char *inp : {"A", "B", "C", "D"}) {
if (!ci->ports.count(ctx->id(inp)))
continue;
NetInfo *innet = ci->ports.at(ctx->id(inp)).net; NetInfo *innet = ci->ports.at(ctx->id(inp)).net;
if (innet != nullptr && innet->users.size() < 5 && innet->users.size() > 1) if (innet != nullptr && innet->users.size() < 5 && innet->users.size() > 1)
inpnets.push_back(innet); inpnets.push_back(innet);