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

ice40: fix crash when packing LUTs with no output

Browse Source
This commit is contained in:
Stefan Riesenberger 2022-03-14 12:43:19 +01:00
parent b852df3260
commit e9ce55bfd0
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ice40/pack.cc
View File

@ -49,32 +49,35 @@ static void pack_lut_lutffs(Context *ctx)
log_info("packed cell %s into %s\n", ci->name.c_str(ctx), packed->name.c_str(ctx)); log_info("packed cell %s into %s\n", ci->name.c_str(ctx), packed->name.c_str(ctx));
// See if we can pack into a DFF // See if we can pack into a DFF
// TODO: LUT cascade // TODO: LUT cascade
NetInfo *o = ci->ports.at(id_O).net; auto port = ci->ports.find(id_O);
CellInfo *dff = net_only_drives(ctx, o, is_ff, id_D, true);
auto lut_bel = ci->attrs.find(id_BEL);
bool packed_dff = false; bool packed_dff = false;
if (dff) { if (port != ci->ports.end()) {
if (ctx->verbose) NetInfo *o = port->second.net;
log_info("found attached dff %s\n", dff->name.c_str(ctx)); CellInfo *dff = net_only_drives(ctx, o, is_ff, id_D, true);
auto dff_bel = dff->attrs.find(id_BEL); auto lut_bel = ci->attrs.find(id_BEL);
if (lut_bel != ci->attrs.end() && dff_bel != dff->attrs.end() && lut_bel->second != dff_bel->second) { if (dff) {
// Locations don't match, can't pack
} else {
lut_to_lc(ctx, ci, packed.get(), false);
dff_to_lc(ctx, dff, packed.get(), false);
++lut_and_ff;
ctx->nets.erase(o->name);
if (dff_bel != dff->attrs.end())
packed->attrs[id_BEL] = dff_bel->second;
for (const auto &attr : dff->attrs) {
// BEL is dealt with specially
if (attr.first != id_BEL)
packed->attrs[attr.first] = attr.second;
}
packed_cells.insert(dff->name);
if (ctx->verbose) if (ctx->verbose)
log_info("packed cell %s into %s\n", dff->name.c_str(ctx), packed->name.c_str(ctx)); log_info("found attached dff %s\n", dff->name.c_str(ctx));
packed_dff = true; auto dff_bel = dff->attrs.find(id_BEL);
if (lut_bel != ci->attrs.end() && dff_bel != dff->attrs.end() && lut_bel->second != dff_bel->second) {
// Locations don't match, can't pack
} else {
lut_to_lc(ctx, ci, packed.get(), false);
dff_to_lc(ctx, dff, packed.get(), false);
++lut_and_ff;
ctx->nets.erase(o->name);
if (dff_bel != dff->attrs.end())
packed->attrs[id_BEL] = dff_bel->second;
for (const auto &attr : dff->attrs) {
// BEL is dealt with specially
if (attr.first != id_BEL)
packed->attrs[attr.first] = attr.second;
}
packed_cells.insert(dff->name);
if (ctx->verbose)
log_info("packed cell %s into %s\n", dff->name.c_str(ctx), packed->name.c_str(ctx));
packed_dff = true;
}
} }
} }
if (!packed_dff) { if (!packed_dff) {