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

ice40: Only pack up to one SB_CARRY into a LC

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-06-27 16:24:44 +02:00
parent 28e851cf45
commit c0724a7e97
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ice40/pack.cc
View File

@ -128,7 +128,7 @@ static bool net_is_constant(const Context *ctx, NetInfo *net, bool &value)
static void pack_carries(Context *ctx) static void pack_carries(Context *ctx)
{ {
log_info("Packing carries..\n"); log_info("Packing carries..\n");
std::unordered_set<IdString> exhausted_cells;
std::unordered_set<IdString> packed_cells; std::unordered_set<IdString> packed_cells;
std::vector<std::unique_ptr<CellInfo>> new_cells; std::vector<std::unique_ptr<CellInfo>> new_cells;
@ -153,7 +153,8 @@ static void pack_carries(Context *ctx)
if (i0_net) { if (i0_net) {
for (auto usr : i0_net->users) { for (auto usr : i0_net->users) {
if (is_lc(ctx, usr.cell) && usr.port == ctx->id("I1")) { if (is_lc(ctx, usr.cell) && usr.port == ctx->id("I1")) {
if (ctx->cells.find(usr.cell->name) != ctx->cells.end()) { if (ctx->cells.find(usr.cell->name) != ctx->cells.end() &&
exhausted_cells.find(usr.cell->name) == exhausted_cells.end()) {
// This clause stops us double-packing cells // This clause stops us double-packing cells
i0_matches.insert(usr.cell->name); i0_matches.insert(usr.cell->name);
if (!i1_net) { if (!i1_net) {
@ -161,14 +162,14 @@ static void pack_carries(Context *ctx)
i1_matches.insert(usr.cell->name); i1_matches.insert(usr.cell->name);
} }
} }
} }
} }
} }
if (i1_net) { if (i1_net) {
for (auto usr : i1_net->users) { for (auto usr : i1_net->users) {
if (is_lc(ctx, usr.cell) && usr.port == ctx->id("I2")) { if (is_lc(ctx, usr.cell) && usr.port == ctx->id("I2")) {
if (ctx->cells.find(usr.cell->name) != ctx->cells.end()) { if (ctx->cells.find(usr.cell->name) != ctx->cells.end() &&
exhausted_cells.find(usr.cell->name) == exhausted_cells.end()) {
// This clause stops us double-packing cells // This clause stops us double-packing cells
i1_matches.insert(usr.cell->name); i1_matches.insert(usr.cell->name);
if (!i0_net) { if (!i0_net) {
@ -242,6 +243,7 @@ static void pack_carries(Context *ctx)
})); }));
} }
} }
exhausted_cells.insert(carry_lc->name);
} }
} }
for (auto pcell : packed_cells) { for (auto pcell : packed_cells) {
@ -381,7 +383,6 @@ static void pack_io(Context *ctx)
{ {
std::unordered_set<IdString> packed_cells; std::unordered_set<IdString> packed_cells;
std::vector<std::unique_ptr<CellInfo>> new_cells; std::vector<std::unique_ptr<CellInfo>> new_cells;
log_info("Packing IOs..\n"); log_info("Packing IOs..\n");
for (auto cell : sorted(ctx->cells)) { for (auto cell : sorted(ctx->cells)) {