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

gowin: use ctx->idf() a bit

Browse Source 
Replacing snprintf() with ctx->idf() in PLL commit, but not yet a
complete overhaul.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
This commit is contained in:
YRabbit 2022-11-11 09:19:16 +10:00
parent a84ded4793
commit 9013b2de50
2 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gowin/arch.cc
View File

@ -236,8 +236,7 @@ bool Arch::allocate_longwire(NetInfo *ni, int lw_idx)
}
// old driver -> bufs LW input net
snprintf(buf, sizeof(buf), "$PACKER_BUFS_%c", longwire + 'A');
auto net = std::make_unique<NetInfo>(id(buf));
auto net = std::make_unique<NetInfo>(idf("$PACKER_BUFS_%c", longwire + 'A'));
NetInfo *bufs_net = net.get();
nets[net->name] = std::move(net);
@ -1074,20 +1073,17 @@ void Arch::addMuxBels(const DatabasePOD *db, int row, int col)
void Arch::add_plla_ports(BelsPOD const *bel, IdString belname, int row, int col)
{
IdString portname;
char buf[40];
for (int pid : {ID_CLKIN, ID_CLKFB, ID_FBDSEL0, ID_FBDSEL1, ID_FBDSEL2, ID_FBDSEL3, ID_FBDSEL4, ID_FBDSEL5,
ID_IDSEL0, ID_IDSEL1, ID_IDSEL2, ID_IDSEL3, ID_IDSEL4, ID_IDSEL5, ID_ODSEL0, ID_ODSEL1,
ID_ODSEL2, ID_ODSEL3, ID_ODSEL4, ID_PSDA0, ID_PSDA1, ID_PSDA2, ID_PSDA3, ID_DUTYDA0,
ID_DUTYDA1, ID_DUTYDA2, ID_DUTYDA3, ID_FDLY0, ID_FDLY1, ID_FDLY2, ID_FDLY3}) {
portname = IdString(pairLookup(bel->ports.get(), bel->num_ports, pid)->src_id);
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
addBelInput(belname, IdString(pid), id(buf));
addBelInput(belname, IdString(pid), idf("R%dC%d_%s", row + 1, col + 1, portname.c_str(this)));
}
for (int pid : {ID_LOCK, ID_CLKOUT, ID_CLKOUTP, ID_CLKOUTD, ID_CLKOUTD3}) {
portname = IdString(pairLookup(bel->ports.get(), bel->num_ports, pid)->src_id);
snprintf(buf, 32, "R%dC%d_%s", row + 1, col + 1, portname.c_str(this));
addBelOutput(belname, IdString(pid), id(buf));
addBelOutput(belname, IdString(pid), idf("R%dC%d_%s", row + 1, col + 1, portname.c_str(this)));
}
}

48
gowin/cells.cc
View File

@ -197,35 +197,18 @@ void reconnect_rplla(Context *ctx, CellInfo *pll, CellInfo *plla)
{
pll->movePortTo(id_CLKIN, plla, id_CLKIN);
pll->movePortTo(id_CLKFB, plla, id_CLKFB);
pll->movePortTo(ctx->id("FBDSEL[0]"), plla, id_FBDSEL0);
pll->movePortTo(ctx->id("FBDSEL[1]"), plla, id_FBDSEL1);
pll->movePortTo(ctx->id("FBDSEL[2]"), plla, id_FBDSEL2);
pll->movePortTo(ctx->id("FBDSEL[3]"), plla, id_FBDSEL3);
pll->movePortTo(ctx->id("FBDSEL[4]"), plla, id_FBDSEL4);
pll->movePortTo(ctx->id("FBDSEL[5]"), plla, id_FBDSEL5);
pll->movePortTo(ctx->id("IDSEL[0]"), plla, id_IDSEL0);
pll->movePortTo(ctx->id("IDSEL[1]"), plla, id_IDSEL1);
pll->movePortTo(ctx->id("IDSEL[2]"), plla, id_IDSEL2);
pll->movePortTo(ctx->id("IDSEL[3]"), plla, id_IDSEL3);
pll->movePortTo(ctx->id("IDSEL[4]"), plla, id_IDSEL4);
pll->movePortTo(ctx->id("IDSEL[5]"), plla, id_IDSEL5);
pll->movePortTo(ctx->id("ODSEL[0]"), plla, id_ODSEL0);
pll->movePortTo(ctx->id("ODSEL[1]"), plla, id_ODSEL1);
pll->movePortTo(ctx->id("ODSEL[2]"), plla, id_ODSEL2);
pll->movePortTo(ctx->id("ODSEL[3]"), plla, id_ODSEL3);
pll->movePortTo(ctx->id("ODSEL[4]"), plla, id_ODSEL4);
pll->movePortTo(ctx->id("PSDA[0]"), plla, id_PSDA0);
pll->movePortTo(ctx->id("PSDA[1]"), plla, id_PSDA1);
pll->movePortTo(ctx->id("PSDA[2]"), plla, id_PSDA2);
pll->movePortTo(ctx->id("PSDA[3]"), plla, id_PSDA3);
pll->movePortTo(ctx->id("DUTYDA[0]"), plla, id_DUTYDA0);
pll->movePortTo(ctx->id("DUTYDA[1]"), plla, id_DUTYDA1);
pll->movePortTo(ctx->id("DUTYDA[2]"), plla, id_DUTYDA2);
pll->movePortTo(ctx->id("DUTYDA[3]"), plla, id_DUTYDA3);
pll->movePortTo(ctx->id("FDLY[0]"), plla, id_FDLY0);
pll->movePortTo(ctx->id("FDLY[1]"), plla, id_FDLY1);
pll->movePortTo(ctx->id("FDLY[2]"), plla, id_FDLY2);
pll->movePortTo(ctx->id("FDLY[3]"), plla, id_FDLY3);
for (int i = 0; i < 6; ++i) {
pll->movePortTo(ctx->idf("FBDSEL[%d]", i), plla, ctx->idf("FBDSEL%d", i));
pll->movePortTo(ctx->idf("IDSEL[%d]", i), plla, ctx->idf("IDSEL%d", i));
if (i < 5) {
pll->movePortTo(ctx->idf("ODSEL[%d]", i), plla, ctx->idf("ODSEL%d", i));
}
if (i < 4) {
pll->movePortTo(ctx->idf("PSDA[%d]", i), plla, ctx->idf("PSDA%d", i));
pll->movePortTo(ctx->idf("DUTYDA[%d]", i), plla, ctx->idf("DUTYDA%d", i));
pll->movePortTo(ctx->idf("FDLY[%d]", i), plla, ctx->idf("FDLY%d", i));
}
}
pll->movePortTo(id_CLKOUT, plla, id_CLKOUT);
pll->movePortTo(id_CLKOUTP, plla, id_CLKOUTP);
pll->movePortTo(id_CLKOUTD, plla, id_CLKOUTD);
@ -260,15 +243,12 @@ void sram_to_ramw_split(Context *ctx, CellInfo *ram, CellInfo *ramw)
void sram_to_slice(Context *ctx, CellInfo *ram, CellInfo *slice, int index)
{
char buf1[32];
if (slice->hierpath == IdString())
slice->hierpath = slice->hierpath;
snprintf(buf1, 32, "INIT_%d", index);
slice->params[id_INIT] = ram->params[ctx->id(buf1)];
slice->params[id_INIT] = ram->params[ctx->idf("INIT_%d", index)];
snprintf(buf1, 32, "DO[%d]", index);
ram->movePortTo(ctx->id(buf1), slice, id_F);
ram->movePortTo(ctx->idf("DO[%d]", index), slice, id_F);
ram->copyPortTo(ctx->id("RAD[0]"), slice, id_A);
ram->copyPortTo(ctx->id("RAD[1]"), slice, id_B);