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

refactor extra data usage

Browse Source
This commit is contained in:
Miodrag Milanovic 2024-11-27 18:26:18 +01:00
parent cb94a0f632
commit f88532147b
4 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
himbaechel/uarch/ng-ultra/bitstream.cc
View File

@ -133,7 +133,7 @@ struct BitstreamJsonBackend
if (w.second.pip != PipId()) { if (w.second.pip != PipId()) {
PipId pip = w.second.pip; PipId pip = w.second.pip;
auto &pd = chip_pip_info(ctx->chip_info, pip); auto &pd = chip_pip_info(ctx->chip_info, pip);
const auto &extra_data = *reinterpret_cast<const NGUltraPipExtraDataPOD *>(pd.extra_data.get()); const auto &extra_data = *uarch->pip_extra_data(pip);
WireId swire = ctx->getPipSrcWire(pip); WireId swire = ctx->getPipSrcWire(pip);
IdString src = ctx->getWireName(swire)[1]; IdString src = ctx->getWireName(swire)[1];
IdString src_type = ctx->getWireType(swire); IdString src_type = ctx->getWireType(swire);
@ -516,8 +516,7 @@ struct BitstreamJsonBackend
for (auto &w : ni->wires) { for (auto &w : ni->wires) {
if (w.second.pip != PipId()) { if (w.second.pip != PipId()) {
PipId pip = w.second.pip; PipId pip = w.second.pip;
const auto &pip_data = chip_pip_info(ctx->chip_info, w.second.pip); const auto &extra_data = *uarch->pip_extra_data(w.second.pip);
const auto &extra_data = *reinterpret_cast<const NGUltraPipExtraDataPOD *>(pip_data.extra_data.get());
if (!extra_data.name || extra_data.type != PipExtra::PIP_EXTRA_INTERCONNECT) continue; if (!extra_data.name || extra_data.type != PipExtra::PIP_EXTRA_INTERCONNECT) continue;
auto &pd = chip_pip_info(ctx->chip_info, pip); auto &pd = chip_pip_info(ctx->chip_info, pip);
IdString src = IdString(chip_tile_info(ctx->chip_info, pip.tile).wires[pd.src_wire].name); IdString src = IdString(chip_tile_info(ctx->chip_info, pip.tile).wires[pd.src_wire].name);

34
himbaechel/uarch/ng-ultra/ng_ultra.cc
View File

@ -220,6 +220,16 @@ const NGUltraTileInstExtraDataPOD *NgUltraImpl::tile_extra_data(int tile) const
return reinterpret_cast<const NGUltraTileInstExtraDataPOD *>(ctx->chip_info->tile_insts[tile].extra_data.get()); return reinterpret_cast<const NGUltraTileInstExtraDataPOD *>(ctx->chip_info->tile_insts[tile].extra_data.get());
} }
const NGUltraPipExtraDataPOD *NgUltraImpl::pip_extra_data(PipId pip) const
{
return reinterpret_cast<const NGUltraPipExtraDataPOD *>(chip_pip_info(ctx->chip_info, pip).extra_data.get());
}
const NGUltraBelExtraDataPOD *NgUltraImpl::bel_extra_data(BelId bel) const
{
return reinterpret_cast<const NGUltraBelExtraDataPOD *>(chip_bel_info(ctx->chip_info, bel).extra_data.get());
}
IdString NgUltraImpl::tile_name_id(int tile) const IdString NgUltraImpl::tile_name_id(int tile) const
{ {
const auto &data = *tile_extra_data(tile); const auto &data = *tile_extra_data(tile);
@ -253,8 +263,7 @@ bool NgUltraImpl::get_mux_data(WireId wire, uint8_t *value)
for (PipId pip : ctx->getPipsUphill(wire)) { for (PipId pip : ctx->getPipsUphill(wire)) {
if (!ctx->getBoundPipNet(pip)) if (!ctx->getBoundPipNet(pip))
continue; continue;
const auto &pip_data = chip_pip_info(ctx->chip_info, pip); const auto &extra_data = *pip_extra_data(pip);
const auto &extra_data = *reinterpret_cast<const NGUltraPipExtraDataPOD *>(pip_data.extra_data.get());
if (!extra_data.name) continue; if (!extra_data.name) continue;
if (extra_data.type == PipExtra::PIP_EXTRA_MUX) { if (extra_data.type == PipExtra::PIP_EXTRA_MUX) {
*value = extra_data.input; *value = extra_data.input;
@ -266,8 +275,7 @@ bool NgUltraImpl::get_mux_data(WireId wire, uint8_t *value)
bool NgUltraImpl::update_bff_to_csc(CellInfo *cell, BelId bel, PipId dst_pip) bool NgUltraImpl::update_bff_to_csc(CellInfo *cell, BelId bel, PipId dst_pip)
{ {
const auto &bel_data = chip_bel_info(ctx->chip_info, bel); const auto &extra_data = *bel_extra_data(bel);
const auto &extra_data = *reinterpret_cast<const NGUltraBelExtraDataPOD *>(bel_data.extra_data.get());
// Check if CSC mode only if FE is capable // Check if CSC mode only if FE is capable
if (extra_data.flags & BEL_EXTRA_FE_CSC) { if (extra_data.flags & BEL_EXTRA_FE_CSC) {
WireId dwire = ctx->getPipDstWire(dst_pip); WireId dwire = ctx->getPipDstWire(dst_pip);
@ -290,8 +298,7 @@ bool NgUltraImpl::update_bff_to_csc(CellInfo *cell, BelId bel, PipId dst_pip)
bool NgUltraImpl::update_bff_to_scc(CellInfo *cell, BelId bel, PipId dst_pip) bool NgUltraImpl::update_bff_to_scc(CellInfo *cell, BelId bel, PipId dst_pip)
{ {
const auto &bel_data = chip_bel_info(ctx->chip_info, bel); const auto &extra_data = *bel_extra_data(bel);
const auto &extra_data = *reinterpret_cast<const NGUltraBelExtraDataPOD *>(bel_data.extra_data.get());
// Check if SCC mode only if FE is capable // Check if SCC mode only if FE is capable
if (extra_data.flags & BEL_EXTRA_FE_SCC) { if (extra_data.flags & BEL_EXTRA_FE_SCC) {
WireId dwire = ctx->getPipDstWire(dst_pip); WireId dwire = ctx->getPipDstWire(dst_pip);
@ -322,8 +329,7 @@ void NgUltraImpl::postRoute()
NetInfo *ni = net.second.get(); NetInfo *ni = net.second.get();
for (auto &w : ni->wires) { for (auto &w : ni->wires) {
if (w.second.pip != PipId()) { if (w.second.pip != PipId()) {
const auto &pip_data = chip_pip_info(ctx->chip_info, w.second.pip); const auto &extra_data = *pip_extra_data(w.second.pip);
const auto &extra_data = *reinterpret_cast<const NGUltraPipExtraDataPOD *>(pip_data.extra_data.get());
if (!extra_data.name) continue; if (!extra_data.name) continue;
if (extra_data.type == PipExtra::PIP_EXTRA_BYPASS) { if (extra_data.type == PipExtra::PIP_EXTRA_BYPASS) {
IdStringList id = ctx->getPipName(w.second.pip); IdStringList id = ctx->getPipName(w.second.pip);
@ -395,8 +401,7 @@ void NgUltraImpl::postRoute()
for (PipId pip : ctx->getPipsUphill(pin_wire)) { for (PipId pip : ctx->getPipsUphill(pin_wire)) {
if (!ctx->getBoundPipNet(pip)) if (!ctx->getBoundPipNet(pip))
continue; continue;
const auto &pip_data = chip_pip_info(ctx->chip_info, pip); const auto &extra_data = *pip_extra_data(pip);
const auto &extra_data = *reinterpret_cast<const NGUltraPipExtraDataPOD *>(pip_data.extra_data.get());
if (!extra_data.name) continue; if (!extra_data.name) continue;
if (extra_data.type == PipExtra::PIP_EXTRA_LUT_PERMUTATION) { if (extra_data.type == PipExtra::PIP_EXTRA_LUT_PERMUTATION) {
NPNR_ASSERT(extra_data.output == i); NPNR_ASSERT(extra_data.output == i);
@ -477,8 +482,7 @@ struct SectionFEWorker
if (!check_assign_sig(clk, ff->getPort(id_CK))) if (!check_assign_sig(clk, ff->getPort(id_CK)))
return false; return false;
} }
const auto &bel_data = chip_bel_info(ctx->chip_info, bel); const auto &extra_data = *impl->bel_extra_data(bel);
const auto &extra_data = *reinterpret_cast<const NGUltraBelExtraDataPOD *>(bel_data.extra_data.get());
std::string type = str_or_default(cell->params, id_type, ""); std::string type = str_or_default(cell->params, id_type, "");
if (type=="CSC" && (extra_data.flags & BEL_EXTRA_FE_CSC) == 0) return false; // No CSC capability on FE if (type=="CSC" && (extra_data.flags & BEL_EXTRA_FE_CSC) == 0) return false; // No CSC capability on FE
if (type=="SCC" && (extra_data.flags & BEL_EXTRA_FE_SCC) == 0) return false; // No SCC capability on FE if (type=="SCC" && (extra_data.flags & BEL_EXTRA_FE_SCC) == 0) return false; // No SCC capability on FE
@ -765,14 +769,12 @@ void NgUltraImpl::fixup_crossbars()
{ {
auto is_crossbar_pip = [&] (PipId pip) { auto is_crossbar_pip = [&] (PipId pip) {
const auto &pd = chip_pip_info(ctx->chip_info, pip); const auto &extra_data = *pip_extra_data(pip);
const auto &extra_data = *reinterpret_cast<const NGUltraPipExtraDataPOD *>(pd.extra_data.get());
return (extra_data.name && extra_data.type == PipExtra::PIP_EXTRA_CROSSBAR); return (extra_data.name && extra_data.type == PipExtra::PIP_EXTRA_CROSSBAR);
}; };
auto crossbar_key = [&] (PipId pip) { auto crossbar_key = [&] (PipId pip) {
auto &pd = chip_pip_info(ctx->chip_info, pip); const auto &extra_data = *pip_extra_data(pip);
const auto &extra_data = *reinterpret_cast<const NGUltraPipExtraDataPOD *>(pd.extra_data.get());
return std::make_pair(pip.tile, IdString(extra_data.name)); return std::make_pair(pip.tile, IdString(extra_data.name));
}; };

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

@ -86,6 +86,9 @@ public:
bool is_ring_clock_source(const PortRef &ref); bool is_ring_clock_source(const PortRef &ref);
bool is_tube_clock_source(const PortRef &ref); bool is_tube_clock_source(const PortRef &ref);
const NGUltraPipExtraDataPOD *pip_extra_data(PipId pip) const;
const NGUltraBelExtraDataPOD *bel_extra_data(BelId bel) const;
dict<IdString,BelId> iom_bels; dict<IdString,BelId> iom_bels;
dict<std::string, std::string> bank_voltage; dict<std::string, std::string> bank_voltage;
dict<BelId,IdString> global_capable_bels; dict<BelId,IdString> global_capable_bels;

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

@ -907,8 +907,7 @@ void NgUltraPacker::pack_iobs(void)
if (!ddfr_mode && ctx->getBelType(bel)==id_DDFR) { if (!ddfr_mode && ctx->getBelType(bel)==id_DDFR) {
WireId dwire = ctx->getBelPinWire(bel, id_O); WireId dwire = ctx->getBelPinWire(bel, id_O);
for (PipId pip : ctx->getPipsDownhill(dwire)) { for (PipId pip : ctx->getPipsDownhill(dwire)) {
const auto &pip_data = chip_pip_info(ctx->chip_info, pip); const auto &extra_data = *uarch->pip_extra_data(pip);
const auto &extra_data = *reinterpret_cast<const NGUltraPipExtraDataPOD *>(pip_data.extra_data.get());
if (!extra_data.name) continue; if (!extra_data.name) continue;
if (extra_data.type != PipExtra::PIP_EXTRA_MUX) continue; if (extra_data.type != PipExtra::PIP_EXTRA_MUX) continue;
if (bfr_mode && extra_data.input == 2) { if (bfr_mode && extra_data.input == 2) {
@ -2330,8 +2329,7 @@ void NgUltraImpl::postPlace()
for (auto &cell : ctx->cells) { for (auto &cell : ctx->cells) {
CellInfo &ci = *cell.second; CellInfo &ci = *cell.second;
if (ci.type == id_BEYOND_FE) { if (ci.type == id_BEYOND_FE) {
const auto &bel_data = chip_bel_info(ctx->chip_info, ci.bel); const auto &extra_data = *bel_extra_data(ci.bel);
const auto &extra_data = *reinterpret_cast<const NGUltraBelExtraDataPOD *>(bel_data.extra_data.get());
// Check if CSC mode only if FE is capable // Check if CSC mode only if FE is capable
if ((extra_data.flags & BEL_EXTRA_FE_CSC)) { if ((extra_data.flags & BEL_EXTRA_FE_CSC)) {
if (str_or_default(ci.params, id_type, "")=="CSC") continue; if (str_or_default(ci.params, id_type, "")=="CSC") continue;