luke
/
nextpnr
mirror of https://github.com/YosysHQ/nextpnr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gatemate: respect keep attribute and prevent crash with BEL set (#1566)

This commit is contained in:
Miodrag Milanović 2025-10-02 11:27:44 +02:00 committed by GitHub
parent e16bd45b01
commit ad76625d4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
himbaechel/uarch/gatemate/pack.cc
View File

@ -137,6 +137,8 @@ void GateMatePacker::optimize_lut()
CellInfo &ci = *cell.second;
if (!ci.type.in(id_CC_LUT1, id_CC_LUT2))
continue;
if (ci.attrs.count(ctx->id("keep")))
continue;
NetInfo *o_net = ci.getPort(id_O);
if (!o_net) {
count_cell(ci);
@ -176,6 +178,8 @@ void GateMatePacker::optimize_mx()
CellInfo &ci = *cell.second;
if (!ci.type.in(id_CC_MX2, id_CC_MX4))
continue;
if (ci.attrs.count(ctx->id("keep")))
continue;
NetInfo *y_net = ci.getPort(id_Y);
if (!y_net) {
count_cell(ci);
@ -220,6 +224,8 @@ void GateMatePacker::optimize_ff()
CellInfo &ci = *cell.second;
if (!ci.type.in(id_CC_DFF, id_CC_DLT))
continue;
if (ci.attrs.count(ctx->id("keep")))
continue;
NetInfo *q_net = ci.getPort(id_Q);
if (!q_net) {
@ -378,6 +384,19 @@ void GateMatePacker::repack_cpe()
flush_cells();
}
void GateMatePacker::remove_double_constrained()
{
for (auto &cell : ctx->cells) {
CellInfo &ci = *cell.second;
if (!ci.attrs.count(ctx->id("BEL")))
continue;
if (ci.cluster != ClusterId()) {
log_warning("Removing BEL attribute for cell '%s'.\n", ci.name.c_str(ctx));
ci.unsetAttr(ctx->id("BEL"));
}
}
}
void GateMateImpl::pack()
{
const ArchArgs &args = ctx->args;
@ -404,6 +423,7 @@ void GateMateImpl::pack()
packer.pack_cpe();
packer.copy_clocks();
packer.remove_constants();
packer.remove_double_constrained();
if (forced_die != IdString()) {
for (auto &cell : ctx->cells) {

1
himbaechel/uarch/gatemate/pack.h
View File

@ -64,6 +64,7 @@ struct GateMatePacker
void remove_constants();
void remove_clocking();
void remove_double_constrained();
void cleanup();
void repack_cpe();