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

ice40: Carry packer bugfix

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-06-27 15:24:34 +02:00
parent 92ddc31003
commit 885fe93a17
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ice40/main.cc
View File

@ -364,6 +364,7 @@ int main(int argc, char *argv[])
if (vm.count("freq")) if (vm.count("freq"))
freq = vm["freq"].as<double>() * 1e6; freq = vm["freq"].as<double>() * 1e6;
assign_budget(&ctx, freq); assign_budget(&ctx, freq);
ctx.check();
print_utilisation(&ctx); print_utilisation(&ctx);
bool timing_driven = true; bool timing_driven = true;
if (vm.count("no-tmdriv")) if (vm.count("no-tmdriv"))

19
ice40/pack.cc
View File

@ -153,17 +153,23 @@ 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()) {
// 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) {
// I1 is don't care when disconnected, duplicate I0 // I1 is don't care when disconnected, duplicate I0
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()) {
// 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) {
// I0 is don't care when disconnected, duplicate I1 // I0 is don't care when disconnected, duplicate I1
@ -172,6 +178,7 @@ static void pack_carries(Context *ctx)
} }
} }
} }
}
std::set<IdString> carry_lcs; std::set<IdString> carry_lcs;
std::set_intersection(i0_matches.begin(), i0_matches.end(), i1_matches.begin(), i1_matches.end(), std::set_intersection(i0_matches.begin(), i0_matches.end(), i1_matches.begin(), i1_matches.end(),
@ -202,17 +209,7 @@ static void pack_carries(Context *ctx)
new_cells.push_back(std::move(created_lc)); new_cells.push_back(std::move(created_lc));
} else { } else {
IdString lc_name = *carry_lcs.begin(); carry_lc = ctx->cells.at(*(carry_lcs.begin())).get();
if (ctx->cells.find(lc_name) != ctx->cells.end()) {
carry_lc = ctx->cells.at(lc_name).get();
} else {
// Name might not be found in the Context, if it is a new cell
auto new_pack =
std::find_if(new_cells.begin(), new_cells.end(),
[lc_name](std::unique_ptr<CellInfo> &nc) { return nc->name == lc_name; });
assert(new_pack != new_cells.end());
carry_lc = new_pack->get();
}
} }
} }
carry_lc->params[ctx->id("CARRY_ENABLE")] = "1"; carry_lc->params[ctx->id("CARRY_ENABLE")] = "1";