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

gatemate: code cleanup and netlist fix (#1554)

This commit is contained in:
Miodrag Milanović 2025-09-10 14:04:42 +02:00 committed by GitHub
parent 9715a1d565
commit 8ac7ed161a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/place/placer_heap.cc
View File

@ -1116,7 +1116,9 @@ class HeAPPlacer
} }
for (auto &move : moves_made) { for (auto &move : moves_made) {
// Where we have ripped up cells; add them to the queue // Where we have ripped up cells; add them to the queue
if (move.second != nullptr && (move.second->cluster == ClusterId() || ctx->getClusterRootCell(move.second->cluster) == move.second)) if (move.second != nullptr &&
(move.second->cluster == ClusterId() ||
ctx->getClusterRootCell(move.second->cluster) == move.second))
remaining.emplace(chain_size[move.second->name] * remaining.emplace(chain_size[move.second->name] *
cfg.get_cell_legalisation_weight(ctx, move.second), cfg.get_cell_legalisation_weight(ctx, move.second),
move.second->name); move.second->name);

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

@ -100,11 +100,6 @@ void GateMateImpl::init_database(Arch *arch)
arch->set_speed_grade(speed_grade); arch->set_speed_grade(speed_grade);
} }
const GateMateTileExtraDataPOD *GateMateImpl::tile_extra_data(int tile) const
{
return reinterpret_cast<const GateMateTileExtraDataPOD *>(ctx->chip_info->tile_insts[tile].extra_data.get());
}
void GateMateImpl::init(Context *ctx) void GateMateImpl::init(Context *ctx)
{ {
HimbaechelAPI::init(ctx); HimbaechelAPI::init(ctx);
@ -373,7 +368,6 @@ void GateMateImpl::postRoute()
if (w.second.pip != PipId()) { if (w.second.pip != PipId()) {
const auto &extra_data = *pip_extra_data(w.second.pip); const auto &extra_data = *pip_extra_data(w.second.pip);
if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.flags & MUX_ROUTING)) { if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.flags & MUX_ROUTING)) {
this->cpe_bridges.insert({w.second.pip, ni->name});
nets_with_bridges.insert(ni->name); nets_with_bridges.insert(ni->name);
} }
} }
@ -456,7 +450,8 @@ void GateMateImpl::expandBoundingBox(BoundingBox &bb) const
bb.y1 = std::min((bb.y1 & 0xfffe) + 5, ctx->getGridDimY()); bb.y1 = std::min((bb.y1 & 0xfffe) + 5, ctx->getGridDimY());
} }
void GateMateImpl::configurePlacerHeap(PlacerHeapCfg &cfg) { void GateMateImpl::configurePlacerHeap(PlacerHeapCfg &cfg)
{
cfg.chainRipup = true; cfg.chainRipup = true;
cfg.placeAllAtOnce = true; cfg.placeAllAtOnce = true;
} }
@ -571,6 +566,11 @@ bool GateMateImpl::isPipInverting(PipId pip) const
return extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.flags & MUX_INVERT); return extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.flags & MUX_INVERT);
} }
const GateMateTileExtraDataPOD *GateMateImpl::tile_extra_data(int tile) const
{
return reinterpret_cast<const GateMateTileExtraDataPOD *>(ctx->chip_info->tile_insts[tile].extra_data.get());
}
const GateMateBelExtraDataPOD *GateMateImpl::bel_extra_data(BelId bel) const const GateMateBelExtraDataPOD *GateMateImpl::bel_extra_data(BelId bel) const
{ {
return reinterpret_cast<const GateMateBelExtraDataPOD *>(chip_bel_info(ctx->chip_info, bel).extra_data.get()); return reinterpret_cast<const GateMateBelExtraDataPOD *>(chip_bel_info(ctx->chip_info, bel).extra_data.get());

4
himbaechel/uarch/gatemate/gatemate.h
View File

@ -71,6 +71,7 @@ struct GateMateImpl : HimbaechelAPI
bool isPipInverting(PipId pip) const override; bool isPipInverting(PipId pip) const override;
const GateMateTileExtraDataPOD *tile_extra_data(int tile) const; const GateMateTileExtraDataPOD *tile_extra_data(int tile) const;
const GateMateBelExtraDataPOD *bel_extra_data(BelId bel) const;
const GateMatePipExtraDataPOD *pip_extra_data(PipId pip) const; const GateMatePipExtraDataPOD *pip_extra_data(PipId pip) const;
int get_dff_config(CellInfo *dff) const; int get_dff_config(CellInfo *dff) const;
@ -87,7 +88,6 @@ struct GateMateImpl : HimbaechelAPI
pool<IdString> multiplier_zero_drivers; pool<IdString> multiplier_zero_drivers;
std::vector<CellInfo *> multipliers; std::vector<CellInfo *> multipliers;
std::vector<bool> used_cpes; std::vector<bool> used_cpes;
dict<PipId, IdString> cpe_bridges;
int fpga_mode; int fpga_mode;
int timing_mode; int timing_mode;
@ -106,8 +106,6 @@ struct GateMateImpl : HimbaechelAPI
dict<WireId, IdString> &wire_to_net, int &num); dict<WireId, IdString> &wire_to_net, int &num);
void repack(); void repack();
const GateMateBelExtraDataPOD *bel_extra_data(BelId bel) const;
bool get_delay_from_tmg_db(IdString id, DelayQuad &delay) const; bool get_delay_from_tmg_db(IdString id, DelayQuad &delay) const;
void get_setuphold_from_tmg_db(IdString id_setup, IdString id_hold, DelayPair &setup, DelayPair &hold) const; void get_setuphold_from_tmg_db(IdString id_setup, IdString id_hold, DelayPair &setup, DelayPair &hold) const;
void get_setuphold_from_tmg_db(IdString id_setuphold, DelayPair &setup, DelayPair &hold) const; void get_setuphold_from_tmg_db(IdString id_setuphold, DelayPair &setup, DelayPair &hold) const;

27
himbaechel/uarch/gatemate/pack_clocking.cc
View File

@ -136,8 +136,7 @@ void GateMatePacker::pack_bufg()
int index = pad_info->flags - 1; int index = pad_info->flags - 1;
die = uarch->tile_extra_data(in_net->driver.cell->bel.tile)->die; die = uarch->tile_extra_data(in_net->driver.cell->bel.tile)->die;
if (!clkin[die]->getPort(ctx->idf("CLK%d", index))) { if (!clkin[die]->getPort(ctx->idf("CLK%d", index))) {
CellInfo *gpio = in_net->driver.cell->getPort(id_GPIO_IN)->driver.cell; clkin[die]->connectPort(ctx->idf("CLK%d", index), in_net->driver.cell->getPort(id_Y));
clkin[die]->connectPort(ctx->idf("CLK%d", index), gpio->getPort(id_I));
} }
} }
} }
@ -313,7 +312,7 @@ void GateMatePacker::insert_pll_bufg()
void GateMatePacker::remove_clocking() void GateMatePacker::remove_clocking()
{ {
log_info("Remove unused clocking cells..\n"); log_info("Remove unused clocking cells..\n");
auto remove_unused_cells = [&](std::vector<CellInfo *> &cells, const char *type) { auto remove_unused_cells = [&](std::vector<CellInfo *> &cells) {
for (auto cell : cells) { for (auto cell : cells) {
bool used = false; bool used = false;
for (auto port : cell->ports) { for (auto port : cell->ports) {
@ -330,8 +329,8 @@ void GateMatePacker::remove_clocking()
} }
} }
}; };
remove_unused_cells(clkin, "CLKIN"); remove_unused_cells(clkin);
remove_unused_cells(glbout, "GLBOUT"); remove_unused_cells(glbout);
flush_cells(); flush_cells();
} }
@ -376,15 +375,7 @@ void GateMatePacker::pack_pll()
} }
} }
ci.cluster = ci.name; if (pll_index[die] >= 4)
ci.constr_abs_z = true;
ci.constr_z = 2 + pll_index[die]; // Position to a proper Z location
Loc fixed_loc = uarch->locations[std::make_pair(ctx->idf("PLL%d", pll_index[die]), die)];
BelId pll_bel = ctx->getBelByLocation(fixed_loc);
ctx->bindBel(pll_bel, &ci, PlaceStrength::STRENGTH_FIXED);
if (pll_index[die] > 4)
log_error("Used more than available PLLs.\n"); log_error("Used more than available PLLs.\n");
if (ci.getPort(id_CLK_REF) == nullptr && ci.getPort(id_USR_CLK_REF) == nullptr) if (ci.getPort(id_CLK_REF) == nullptr && ci.getPort(id_USR_CLK_REF) == nullptr)
@ -393,6 +384,14 @@ void GateMatePacker::pack_pll()
if (ci.getPort(id_CLK_REF) != nullptr && ci.getPort(id_USR_CLK_REF) != nullptr) if (ci.getPort(id_CLK_REF) != nullptr && ci.getPort(id_USR_CLK_REF) != nullptr)
log_error("CLK_REF and USR_CLK_REF are not allowed to be set in same time.\n"); log_error("CLK_REF and USR_CLK_REF are not allowed to be set in same time.\n");
ci.cluster = ci.name;
ci.constr_abs_z = true;
ci.constr_z = 2 + pll_index[die]; // Position to a proper Z location
Loc fixed_loc = uarch->locations[std::make_pair(ctx->idf("PLL%d", pll_index[die]), die)];
BelId pll_bel = ctx->getBelByLocation(fixed_loc);
ctx->bindBel(pll_bel, &ci, PlaceStrength::STRENGTH_FIXED);
clk = ci.getPort(id_CLK_REF); clk = ci.getPort(id_CLK_REF);
delay_t period = ctx->getDelayFromNS(1.0e9 / ctx->setting<float>("target_freq")); delay_t period = ctx->getDelayFromNS(1.0e9 / ctx->setting<float>("target_freq"));
if (clk) { if (clk) {