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

ecp5: Carry packing fixes

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-09-30 18:10:20 +01:00
parent 9218d2e56b
commit 3e399c9f20
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ecp5/pack.cc
View File

@ -121,8 +121,8 @@ class Ecp5Packer
if (str_or_default(existing->params, ctx->id("LSRMUX"), "LSR") != if (str_or_default(existing->params, ctx->id("LSRMUX"), "LSR") !=
str_or_default(ff0->params, ctx->id("LSRMUX"), "LSR")) str_or_default(ff0->params, ctx->id("LSRMUX"), "LSR"))
return false; return false;
if (str_or_default(existing->params, ctx->id("LSRMUX"), "LSR") != if (str_or_default(existing->params, ctx->id("SRMODE"), "LSR_OVER_CE") !=
str_or_default(ff0->params, ctx->id("LSRMUX"), "LSR")) str_or_default(ff0->params, ctx->id("SRMODE"), "LSR_OVER_CE"))
return false; return false;
} }
return true; return true;
@ -354,6 +354,7 @@ class Ecp5Packer
std::unique_ptr<NetInfo> new_carry(new NetInfo()); std::unique_ptr<NetInfo> new_carry(new NetInfo());
new_carry->name = ctx->id(feedin->name.str(ctx) + "$COUT"); new_carry->name = ctx->id(feedin->name.str(ctx) + "$COUT");
connect_port(ctx, new_carry.get(), feedin.get(), ctx->id("COUT")); connect_port(ctx, new_carry.get(), feedin.get(), ctx->id("COUT"));
chain_in.cell->ports[chain_in.port].net = nullptr;
connect_port(ctx, new_carry.get(), chain_in.cell, chain_in.port); connect_port(ctx, new_carry.get(), chain_in.cell, chain_in.port);
CellInfo *feedin_ptr = feedin.get(); CellInfo *feedin_ptr = feedin.get();
@ -492,10 +493,13 @@ class Ecp5Packer
} }
} }
std::vector<std::vector<CellInfo*>> packed_chains;
// Chain packing // Chain packing
for (auto &chain : all_chains) { for (auto &chain : all_chains) {
int cell_count = 0; int cell_count = 0;
std::vector<CellInfo *> tile_ffs; std::vector<CellInfo *> tile_ffs;
std::vector<CellInfo *> packed_chain;
for (auto &cell : chain.cells) { for (auto &cell : chain.cells) {
if (cell_count % 4 == 0) if (cell_count % 4 == 0)
tile_ffs.clear(); tile_ffs.clear();
@ -526,24 +530,25 @@ class Ecp5Packer
packed_cells.insert(ff1->name); packed_cells.insert(ff1->name);
} }
} }
packed_chain.push_back(slice.get());
new_cells.push_back(std::move(slice)); new_cells.push_back(std::move(slice));
packed_cells.insert(cell->name); packed_cells.insert(cell->name);
cell_count++; cell_count++;
} }
packed_chains.push_back(packed_chain);
} }
// Relative chain placement // Relative chain placement
for (auto &chain : all_chains) { for (auto &chain : packed_chains) {
chain.cells.at(0)->constr_abs_z = true; chain.at(0)->constr_abs_z = true;
chain.cells.at(0)->constr_z = 0; chain.at(0)->constr_z = 0;
for (int i = 1; i < int(chain.cells.size()); i++) { for (int i = 1; i < int(chain.size()); i++) {
chain.cells.at(i)->constr_x = (i / 4); chain.at(i)->constr_x = (i / 4);
chain.cells.at(i)->constr_y = 0; chain.at(i)->constr_y = 0;
chain.cells.at(i)->constr_z = i % 4; chain.at(i)->constr_z = i % 4;
chain.cells.at(i)->constr_abs_z = true; chain.at(i)->constr_abs_z = true;
chain.cells.at(i)->constr_parent = chain.cells.at(0); chain.at(i)->constr_parent = chain.at(0);
chain.cells.at(0)->constr_children.push_back(chain.cells.at(i)); chain.at(0)->constr_children.push_back(chain.at(i));
} }
} }