github.com/YosysHQ.nextpnr
1
0
Fork 0
mirror of https://github.com/YosysHQ/nextpnr.git synced 2026-05-21 04:43:11 +00:00
Code Issues Releases Wiki Activity

ice40: Static config tweaks

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat
2026-05-20 10:48:37 +02:00
parent 2894e53934
commit d5b1068b29
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/place/placer_static.cc
View File

@@ -1237,14 +1237,13 @@ class StaticPlacer
void legalise_step(bool dsp_bram)
{
// assume DSP and BRAM are all groups 2+ for now
for (int i = 0; i < int(ccells.size()); i++) {
auto &mc = mcells.at(i);
auto &cc = ccells.at(i);
mc.solver_pos = mc.pos;
if (dsp_bram && mc.group < 2)
if (dsp_bram && mc.group < cfg.logic_groups)
continue;
if (!dsp_bram && mc.group >= 2)
if (!dsp_bram && mc.group >= cfg.logic_groups)
continue;
if (cc.macro_idx != -1 && i != macros.at(cc.macro_idx).root->udata)
continue; // not macro root

37
ice40/arch.cc
View File

@@ -703,15 +703,6 @@ bool Arch::place()
comb.spacer_rect = StaticRect(0.5f, 0.5f);
}
{
cfg.cell_groups.emplace_back();
auto &comb = cfg.cell_groups.back();
comb.name = getCtx()->id("WARMBOOT");
comb.cell_area[id_SB_WARMBOOT] = StaticRect(0.5f, 1.0f);
comb.bel_area[id_SB_WARMBOOT] = StaticRect(0.5f, 1.0f);
comb.spacer_rect = StaticRect(0.5f, 1.0f);
}
{
cfg.cell_groups.emplace_back();
auto &comb = cfg.cell_groups.back();
@@ -720,6 +711,34 @@ bool Arch::place()
comb.bel_area[id_SB_IO] = StaticRect(0.5f, 0.5f);
comb.spacer_rect = StaticRect(0.5f, 0.5f);
}
if (args.type == ArchArgs::HX1K || args.type == ArchArgs::HX4K || args.type == ArchArgs::HX8K) {
cfg.timing_c = 1000;
cfg.timing_mx = 60;
cfg.timing_my = 60;
} else if (args.type == ArchArgs::LP384 || args.type == ArchArgs::LP1K || args.type == ArchArgs::LP4K ||
args.type == ArchArgs::LP8K) {
cfg.timing_c = 1600;
cfg.timing_mx = 90;
cfg.timing_my = 90;
} else if (args.type == ArchArgs::UP3K || args.type == ArchArgs::UP5K || args.type == ArchArgs::U1K ||
args.type == ArchArgs::U2K || args.type == ArchArgs::U4K) {
cfg.timing_c = 2400;
cfg.timing_mx = 130;
cfg.timing_my = 130;
}
cfg.get_cell_area_override = [](Context *ctx, const CellInfo *ci) -> std::optional<StaticRect> {
if (ci->type != id_ICESTORM_LC)
return {};
// FFs have control sets, so don't pack quite as well. model this with a slightly bigger area
if (ci->lcInfo.dffEnable && ci->cluster == ClusterId()) {
return {StaticRect(1.0f, 0.2f)};
} else {
return {StaticRect(1.0f, 0.125f)};
}
};
if (!placer_static(getCtx(), cfg))
return false;
} else {