diff options
| author | David Shah <davey1576@gmail.com> | 2018-07-17 16:45:39 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-07-17 16:45:39 +0200 |
| commit | 2eb783d626a9a17baf70d2f7750be3c11623d5bc (patch) | |
| tree | 2e653dc4ab26d7d2dd95add96e382c3ea59e1477 /ecp5/pack.cc | |
| parent | f62f04e376f83d650ab1067cdf0f058151828b8a (diff) | |
| download | nextpnr-2eb783d626a9a17baf70d2f7750be3c11623d5bc.tar.gz nextpnr-2eb783d626a9a17baf70d2f7750be3c11623d5bc.tar.bz2 nextpnr-2eb783d626a9a17baf70d2f7750be3c11623d5bc.zip | |
ecp5: Fixing packer bugs
Signed-off-by: David Shah <davey1576@gmail.com>
Diffstat (limited to 'ecp5/pack.cc')
| -rw-r--r-- | ecp5/pack.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ecp5/pack.cc b/ecp5/pack.cc index 4f864b89..1900eded 100644 --- a/ecp5/pack.cc +++ b/ecp5/pack.cc @@ -119,7 +119,8 @@ class Ecp5Packer NetInfo *znet = ci->ports.at(ctx->id("Z")).net; if (znet != nullptr) { for (auto user : znet->users) { - if (is_lut(ctx, user.cell) && procdLuts.find(user.cell->name) == procdLuts.end()) { + if (is_lut(ctx, user.cell) && user.cell != ci && + procdLuts.find(user.cell->name) == procdLuts.end()) { if (can_pack_lutff(ci->name, user.cell->name)) { procdLuts.insert(ci->name); procdLuts.insert(user.cell->name); @@ -137,7 +138,8 @@ class Ecp5Packer NetInfo *qnet = ctx->cells.at(lutffPairs[ci->name])->ports.at(ctx->id("Q")).net; if (qnet != nullptr) { for (auto user : qnet->users) { - if (is_lut(ctx, user.cell) && procdLuts.find(user.cell->name) == procdLuts.end()) { + if (is_lut(ctx, user.cell) && user.cell != ci && + procdLuts.find(user.cell->name) == procdLuts.end()) { if (can_pack_lutff(ci->name, user.cell->name)) { procdLuts.insert(ci->name); procdLuts.insert(user.cell->name); @@ -152,11 +154,11 @@ class Ecp5Packer } } } - for (char inp : "ABCD") { - NetInfo *innet = ci->ports.at(ctx->id(std::string("") + inp)).net; + for (const char *inp : {"A", "B", "C", "D"}) { + NetInfo *innet = ci->ports.at(ctx->id(inp)).net; if (innet != nullptr && innet->driver.cell != nullptr) { CellInfo *drv = innet->driver.cell; - if (is_lut(ctx, drv) && innet->driver.port == ctx->id("Z")) { + if (is_lut(ctx, drv) && drv != ci && innet->driver.port == ctx->id("Z")) { if (procdLuts.find(drv->name) == procdLuts.end()) { if (can_pack_lutff(ci->name, drv->name)) { procdLuts.insert(ci->name); @@ -167,7 +169,8 @@ class Ecp5Packer } } else if (is_ff(ctx, drv) && innet->driver.port == ctx->id("Q")) { auto fflut = fflutPairs.find(drv->name); - if (fflut != fflutPairs.end() && procdLuts.find(fflut->second) == procdLuts.end()) { + if (fflut != fflutPairs.end() && fflut->second != ci->name && + procdLuts.find(fflut->second) == procdLuts.end()) { if (can_pack_lutff(ci->name, fflut->second)) { procdLuts.insert(ci->name); procdLuts.insert(fflut->second); |