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

Update FF params and ports first

This commit is contained in:
Miodrag Milanovic 2025-07-09 09:03:56 +02:00
parent ffe74b1629
commit cd1217efdb
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,6 +175,7 @@ void GateMatePacker::optimize_lut()
void GateMatePacker::cleanup()
{
log_info("Running cleanups..\n");
dff_update_params();
do {
count = 0;
remove_not_used();

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

@ -72,6 +72,7 @@ struct GateMatePacker
private:
void rename_param(CellInfo *cell, IdString name, IdString new_name, int width);
void dff_to_cpe(CellInfo *dff);
void dff_update_params();
void insert_bufg(CellInfo *cell, IdString port);
void disconnect_if_gnd(CellInfo *cell, IdString input);
void pll_out(CellInfo *cell, IdString origPort, Loc fixed);

14
himbaechel/uarch/gatemate/pack_cpe.cc
View File

@ -141,6 +141,16 @@ void GateMatePacker::dff_to_cpe(CellInfo *dff)
}
}
void GateMatePacker::dff_update_params()
{
for (auto &cell : ctx->cells) {
CellInfo &ci = *cell.second;
if (!ci.type.in(id_CC_DFF, id_CC_DLT))
continue;
dff_to_cpe(&ci);
}
}
void GateMatePacker::pack_cpe()
{
log_info("Packing CPEs..\n");
@ -205,7 +215,6 @@ void GateMatePacker::pack_cpe()
ci.constr_children.push_back(dff);
dff->renamePort(id_D, id_DIN);
dff->renamePort(id_Q, id_DOUT);
dff_to_cpe(dff);
dff->type = (dff->type == id_CC_DLT) ? id_CPE_LATCH : id_CPE_FF;
}
}
@ -290,7 +299,6 @@ void GateMatePacker::pack_cpe()
ci.constr_children.push_back(dff);
dff->renamePort(id_D, id_DIN);
dff->renamePort(id_Q, id_DOUT);
dff_to_cpe(dff);
dff->type = (dff->type == id_CC_DLT) ? id_CPE_LATCH : id_CPE_FF;
}
}
@ -325,7 +333,6 @@ void GateMatePacker::pack_cpe()
}
lt->params[id_INIT_L10] = Property(LUT_D0, 4);
ci.movePortTo(id_D, lt, id_IN1);
dff_to_cpe(&ci);
ci.type = (ci.type == id_CC_DLT) ? id_CPE_LATCH : id_CPE_FF;
NetInfo *conn = ctx->createNet(ctx->idf("%s$di", ci.name.c_str(ctx)));
lt->connectPort(id_OUT, conn);
@ -465,7 +472,6 @@ void GateMatePacker::pack_addf()
cell->constr_children.push_back(dff);
dff->renamePort(id_D, id_DIN);
dff->renamePort(id_Q, id_DOUT);
dff_to_cpe(dff);
dff->type = (dff->type == id_CC_DLT) ? id_CPE_LATCH : id_CPE_FF;
}
}