diff options
| author | gatecat <gatecat@ds0.me> | 2021-07-01 20:17:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 20:17:02 +0100 |
| commit | fe38e70dc1cd84a60e2fe05f7153c8deed1c16e9 (patch) | |
| tree | 5752e4a2be0793539691580c02ea85933544c47f /machxo2/pack.cc | |
| parent | 55c663f7ac63253124cffd1efec8b9b400658a3d (diff) | |
| parent | 41d09f71871184aabbd7495a485e257fc0450d40 (diff) | |
| download | nextpnr-fe38e70dc1cd84a60e2fe05f7153c8deed1c16e9.tar.gz nextpnr-fe38e70dc1cd84a60e2fe05f7153c8deed1c16e9.tar.bz2 nextpnr-fe38e70dc1cd84a60e2fe05f7153c8deed1c16e9.zip | |
Merge pull request #747 from cr1901/machxo2
MachXO2 Checkpoint 1
Diffstat (limited to 'machxo2/pack.cc')
| -rw-r--r-- | machxo2/pack.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/machxo2/pack.cc b/machxo2/pack.cc index a8a2a671..66d2d411 100644 --- a/machxo2/pack.cc +++ b/machxo2/pack.cc @@ -62,7 +62,7 @@ static void pack_lut_lutffs(Context *ctx) // Locations don't match, can't pack } else { lut_to_lc(ctx, ci, packed.get(), false); - dff_to_lc(ctx, dff, packed.get(), false); + dff_to_lc(ctx, dff, packed.get(), LutType::Normal); if (dff_bel != dff->attrs.end()) packed->attrs[ctx->id("BEL")] = dff_bel->second; packed_cells.insert(dff->name); @@ -105,7 +105,9 @@ static void pack_remaining_ffs(Context *ctx) packed->attrs[attr.first] = attr.second; auto dff_bel = ci->attrs.find(ctx->id("BEL")); - dff_to_lc(ctx, ci, packed.get(), false); + + dff_to_lc(ctx, ci, packed.get(), LutType::None); + if (dff_bel != ci->attrs.end()) packed->attrs[ctx->id("BEL")] = dff_bel->second; packed_cells.insert(ci->name); @@ -146,7 +148,7 @@ static void set_net_constant(Context *ctx, NetInfo *orig, NetInfo *constnet, boo for (auto &attr : uc->attrs) lc->attrs[attr.first] = attr.second; - dff_to_lc(ctx, uc, lc.get(), true); + dff_to_lc(ctx, uc, lc.get(), LutType::PassThru); packed_cells.insert(uc->name); lc->ports[id_A0].net = constnet; |