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

Add structure for clock sinks

Browse Source
This commit is contained in:
Miodrag Milanovic 2024-05-27 12:57:22 +02:00
parent 13e323d2cf
commit 04653621e8
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
himbaechel/uarch/ng-ultra/pack.cc
View File

@ -1069,11 +1069,7 @@ void NgUltraPacker::promote_globals()
// Count the number of clock ports // Count the number of clock ports
int glb_count = 0; int glb_count = 0;
for (const auto &usr : ni->users) { for (const auto &usr : ni->users) {
if (usr.cell->type == id_BEYOND_FE && usr.port == id_CK) if (clock_sinks.count(usr.cell->type) && clock_sinks[usr.cell->type].count(usr.port))
glb_count++;
if (usr.cell->type == id_RF && usr.port == id_WCK)
glb_count++;
if (usr.cell->type == id_XRF && usr.port.in(id_WCK1,id_WCK2))
glb_count++; glb_count++;
} }
if (glb_count > 0) if (glb_count > 0)
@ -1109,21 +1105,10 @@ void NgUltraPacker::promote_globals()
CellInfo *input_pad = ctx->getBoundBelCell(iotp_bel); CellInfo *input_pad = ctx->getBoundBelCell(iotp_bel);
NetInfo *iom_to_clk = ctx->createNet(ctx->id(std::string(net->name.c_str(ctx)) + "$iom")); NetInfo *iom_to_clk = ctx->createNet(ctx->id(std::string(net->name.c_str(ctx)) + "$iom"));
for (const auto &usr : net->users) { for (const auto &usr : net->users) {
if (usr.cell->type == id_BEYOND_FE && usr.port == id_CK) { if (clock_sinks.count(usr.cell->type) && clock_sinks[usr.cell->type].count(usr.port)) {
usr.cell->disconnectPort(id_CK); IdString port = usr.port;
usr.cell->connectPort(id_CK, iom_to_clk); usr.cell->disconnectPort(port);
} usr.cell->connectPort(port, iom_to_clk);
if (usr.cell->type == id_RF && usr.port == id_WCK) {
usr.cell->disconnectPort(id_WCK);
usr.cell->connectPort(id_WCK, iom_to_clk);
}
if (usr.cell->type == id_XRF && usr.port == id_WCK1) {
usr.cell->disconnectPort(id_WCK1);
usr.cell->connectPort(id_WCK1, iom_to_clk);
}
if (usr.cell->type == id_XRF && usr.port == id_WCK2) {
usr.cell->disconnectPort(id_WCK2);
usr.cell->connectPort(id_WCK2, iom_to_clk);
} }
} }
iom->connectPort(port, input_pad->getPort(id_O)); iom->connectPort(port, input_pad->getPort(id_O));
@ -1163,6 +1148,16 @@ void NgUltraPacker::pack_rams(void)
} }
} }
void NgUltraPacker::setup()
{
clock_sinks[id_BEYOND_FE].insert(id_CK);
clock_sinks[id_RF].insert(id_WCK);
clock_sinks[id_XRF].insert(id_WCK1);
clock_sinks[id_XRF].insert(id_WCK2);
clock_sinks[id_RAM].insert(id_ACK);
clock_sinks[id_RAM].insert(id_BCK);
}
void NgUltraImpl::pack() void NgUltraImpl::pack()
{ {
const ArchArgs &args = ctx->args; const ArchArgs &args = ctx->args;
@ -1170,6 +1165,7 @@ void NgUltraImpl::pack()
parse_csv(args.options.at("csv")); parse_csv(args.options.at("csv"));
} }
NgUltraPacker packer(ctx, this); NgUltraPacker packer(ctx, this);
packer.setup();
packer.pack_constants(); packer.pack_constants();
packer.update_lut_init(); packer.update_lut_init();
packer.update_dffs(); packer.update_dffs();

3
himbaechel/uarch/ng-ultra/pack.h
View File

@ -58,6 +58,8 @@ struct NgUltraPacker
void promote_globals(); void promote_globals();
void setup();
private: private:
void set_lut_input_if_constant(CellInfo *cell, IdString input); void set_lut_input_if_constant(CellInfo *cell, IdString input);
void lut_to_fe(CellInfo *lut, CellInfo *fe, bool no_dff, Property lut_table); void lut_to_fe(CellInfo *lut, CellInfo *fe, bool no_dff, Property lut_table);
@ -83,6 +85,7 @@ private:
pool<IdString> packed_cells; pool<IdString> packed_cells;
std::vector<std::unique_ptr<CellInfo>> new_cells; std::vector<std::unique_ptr<CellInfo>> new_cells;
dict<IdString,pool<IdString>> clock_sinks;
HimbaechelHelpers h; HimbaechelHelpers h;
}; };