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

Merge pull request #944 from Riesi/master

Browse Source 
ice40: fix crash when packing LUTs with no output
This commit is contained in:
gatecat 2022-03-15 18:59:45 +00:00 committed by GitHub
commit e327050bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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));
// See if we can pack into a DFF
// 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);
auto lut_bel = ci->attrs.find(id_BEL);
bool packed_dff = false;
if (dff) {
if (ctx->verbose)
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;
}
}
}
if (!packed_dff) {
lut_to_lc(ctx, ci, packed.get(), true);
++lut_only;