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

Place at LOC

Browse Source
This commit is contained in:
Miodrag Milanovic 2024-06-14 07:58:42 +02:00
parent c2ce766503
commit d3d3b56b25
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,9 +64,7 @@ void NgUltraImpl::init(Context *ctx)
global_capable_bels.emplace(bel,id_P19RI); global_capable_bels.emplace(bel,id_P19RI);
} }
} }
if (ctx->getBelType(bel).in(id_PLL, id_WFG)) { locations.emplace(stringf("%s:%s",tile_name(bel.tile).c_str(), ctx->getBelName(bel)[1].c_str(ctx)),bel);
locations.emplace(stringf("%s:%s",tile_name(bel.tile).c_str(), ctx->getBelName(bel)[1].c_str(ctx)),bel);
}
} }
} }

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

@ -279,6 +279,18 @@ void NgUltraPacker::dff_to_fe(CellInfo *dff, CellInfo *fe, bool pass_thru_lut)
} }
} }
void NgUltraPacker::bind_attr_loc(CellInfo *cell, dict<IdString, Property> *attrs)
{
if (attrs->count(id_LOC)) {
std::string name = attrs->at(id_LOC).as_string();
if (!uarch->locations.count(name)) {
log_error("Unable to find location %s\n", name.c_str());
}
BelId bel = uarch->locations.at(name);
ctx->bindBel(bel, cell, PlaceStrength::STRENGTH_LOCKED);
}
}
void NgUltraPacker::pack_lut_dffs(void) void NgUltraPacker::pack_lut_dffs(void)
{ {
log_info("Pack LUT-DFFs...\n"); log_info("Pack LUT-DFFs...\n");
@ -293,6 +305,7 @@ void NgUltraPacker::pack_lut_dffs(void)
std::unique_ptr<CellInfo> packed = create_cell(id_BEYOND_FE, ctx->id(ci.name.str(ctx) + "$fe")); std::unique_ptr<CellInfo> packed = create_cell(id_BEYOND_FE, ctx->id(ci.name.str(ctx) + "$fe"));
packed_cells.insert(ci.name); packed_cells.insert(ci.name);
bind_attr_loc(packed.get(), &ci.attrs);
bool packed_dff = false; bool packed_dff = false;
NetInfo *o = ci.getPort(id_O); NetInfo *o = ci.getPort(id_O);
@ -333,6 +346,7 @@ void NgUltraPacker::pack_dffs(void)
std::unique_ptr<CellInfo> packed = create_cell(id_BEYOND_FE, ctx->id(ci.name.str(ctx) + "$fe")); std::unique_ptr<CellInfo> packed = create_cell(id_BEYOND_FE, ctx->id(ci.name.str(ctx) + "$fe"));
packed_cells.insert(ci.name); packed_cells.insert(ci.name);
dff_to_fe(&ci, packed.get(), true); dff_to_fe(&ci, packed.get(), true);
bind_attr_loc(packed.get(), &ci.attrs);
++dff_only; ++dff_only;
new_cells.push_back(std::move(packed)); new_cells.push_back(std::move(packed));
} }
@ -677,6 +691,7 @@ void NgUltraPacker::pack_cys(void)
CellInfo *ci = cell.second.get(); CellInfo *ci = cell.second.get();
if (ci->type != id_NX_CY) if (ci->type != id_NX_CY)
continue; continue;
bind_attr_loc(ci, &ci->attrs);
NetInfo *ci_net = ci->getPort(id_CI); NetInfo *ci_net = ci->getPort(id_CI);
if (!ci_net || !ci_net->driver.cell || ci_net->driver.cell->type != id_NX_CY) { if (!ci_net || !ci_net->driver.cell || ci_net->driver.cell->type != id_NX_CY) {
root_cys.push_back(ci); root_cys.push_back(ci);
@ -876,6 +891,7 @@ void NgUltraPacker::pack_rfs(void)
log_error("Unknown mode %d for cell '%s'.\n", mode, ci.name.c_str(ctx)); log_error("Unknown mode %d for cell '%s'.\n", mode, ci.name.c_str(ctx));
} }
ci.cluster = ci.name; ci.cluster = ci.name;
bind_attr_loc(&ci, &ci.attrs);
for (int i = 1; i <= 18; i++) { for (int i = 1; i <= 18; i++) {
connect_gnd_if_unconnected(&ci, ctx->idf("I%d",i)); connect_gnd_if_unconnected(&ci, ctx->idf("I%d",i));
@ -1212,6 +1228,7 @@ void NgUltraPacker::pack_rams(void)
if (!ci.type.in(id_NX_RAM)) if (!ci.type.in(id_NX_RAM))
continue; continue;
ci.type = id_RAM; ci.type = id_RAM;
bind_attr_loc(&ci, &ci.attrs);
// These ACKx and BCKx exists for NX_RAM, but are not available on NX_ULTRA // These ACKx and BCKx exists for NX_RAM, but are not available on NX_ULTRA
ci.disconnectPort(id_ACKC); ci.disconnectPort(id_ACKC);
ci.disconnectPort(id_ACKD); ci.disconnectPort(id_ACKD);

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

@ -81,6 +81,7 @@ private:
void mandatory_param(CellInfo *cell, IdString param); void mandatory_param(CellInfo *cell, IdString param);
void disconnect_unused(CellInfo *cell, IdString port); void disconnect_unused(CellInfo *cell, IdString port);
void bind_attr_loc(CellInfo *cell, dict<IdString, Property> *attrs);
// General helper functions // General helper functions
void flush_cells(); void flush_cells();