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

7
ice40/pack.cc
View File

@ -49,10 +49,12 @@ 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);
bool packed_dff = false;
if (port != ci->ports.end()) {
NetInfo *o = port->second.net;
CellInfo *dff = net_only_drives(ctx, o, is_ff, id_D, true); CellInfo *dff = net_only_drives(ctx, o, is_ff, id_D, true);
auto lut_bel = ci->attrs.find(id_BEL); auto lut_bel = ci->attrs.find(id_BEL);
bool packed_dff = false;
if (dff) { if (dff) {
if (ctx->verbose) if (ctx->verbose)
log_info("found attached dff %s\n", dff->name.c_str(ctx)); log_info("found attached dff %s\n", dff->name.c_str(ctx));
@ -77,6 +79,7 @@ static void pack_lut_lutffs(Context *ctx)
packed_dff = true; packed_dff = true;
} }
} }
}
if (!packed_dff) { if (!packed_dff) {
lut_to_lc(ctx, ci, packed.get(), true); lut_to_lc(ctx, ci, packed.get(), true);
++lut_only; ++lut_only;