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

ice40: add static placer support

Browse Source
This commit is contained in:
Lofty 2023-10-29 06:54:53 +00:00 committed by myrtle
parent d40c6e850d
commit d6f54fd9df
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/place/placer_static.cc
View File

@ -293,7 +293,7 @@ class StaticPlacer
{ {
if (ci->udata == -1) { if (ci->udata == -1) {
// not handled? // not handled?
NPNR_ASSERT(ci->bel != BelId()); // already fixed NPNR_ASSERT_MSG(ci->bel != BelId(), stringf("Cell %s of type %s has no bel", ci->name.c_str(ctx), ci->type.c_str(ctx)).c_str()); // already fixed
return RealPair(ctx->getBelLocation(ci->bel), 0.5f); return RealPair(ctx->getBelLocation(ci->bel), 0.5f);
} else { } else {
return ref ? mcells.at(ci->udata).ref_pos : mcells.at(ci->udata).pos; return ref ? mcells.at(ci->udata).ref_pos : mcells.at(ci->udata).pos;

42
ice40/arch.cc
View File

@ -27,6 +27,7 @@
#include "nextpnr.h" #include "nextpnr.h"
#include "placer1.h" #include "placer1.h"
#include "placer_heap.h" #include "placer_heap.h"
#include "placer_static.h"
#include "router1.h" #include "router1.h"
#include "router2.h" #include "router2.h"
#include "timing_opt.h" #include "timing_opt.h"
@ -650,6 +651,45 @@ bool Arch::place()
} else if (placer == "sa") { } else if (placer == "sa") {
if (!placer1(getCtx(), Placer1Cfg(getCtx()))) if (!placer1(getCtx(), Placer1Cfg(getCtx())))
return false; return false;
} else if (placer == "static") {
PlacerStaticCfg cfg(getCtx());
{
cfg.cell_groups.emplace_back();
auto &comb = cfg.cell_groups.back();
comb.name = getCtx()->id("COMB");
comb.cell_area[id_ICESTORM_LC] = StaticRect(1.0f, 0.125f);
comb.bel_area[id_ICESTORM_LC] = StaticRect(1.0f, 0.125f);
comb.spacer_rect = StaticRect(1.0f, 0.125f);
}
{
cfg.cell_groups.emplace_back();
auto &comb = cfg.cell_groups.back();
comb.name = getCtx()->id("RAM");
comb.cell_area[id_ICESTORM_RAM] = StaticRect(1.0f, 2.0f);
comb.bel_area[id_ICESTORM_RAM] = StaticRect(1.0f, 2.0f);
comb.spacer_rect = StaticRect(1.0f, 2.0f);
}
{
cfg.cell_groups.emplace_back();
auto &comb = cfg.cell_groups.back();
comb.name = getCtx()->id("GB");
comb.cell_area[id_SB_GB] = StaticRect(0.5f, 0.5f);
comb.bel_area[id_SB_GB] = StaticRect(0.5f, 0.5f);
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(1.0f, 1.0f);
comb.bel_area[id_SB_WARMBOOT] = StaticRect(1.0f, 1.0f);
comb.spacer_rect = StaticRect(1.0f, 1.0f);
}
if (!placer_static(getCtx(), cfg))
return false;
} else { } else {
log_error("iCE40 architecture does not support placer '%s'\n", placer.c_str()); log_error("iCE40 architecture does not support placer '%s'\n", placer.c_str());
} }
@ -1250,7 +1290,7 @@ BoundingBox Arch::getRouteBoundingBox(WireId src, WireId dst) const
const std::string Arch::defaultPlacer = "heap"; const std::string Arch::defaultPlacer = "heap";
const std::vector<std::string> Arch::availablePlacers = {"sa", "heap"}; const std::vector<std::string> Arch::availablePlacers = {"sa", "heap", "static"};
const std::string Arch::defaultRouter = "router1"; const std::string Arch::defaultRouter = "router1";
const std::vector<std::string> Arch::availableRouters = {"router1", "router2"}; const std::vector<std::string> Arch::availableRouters = {"router1", "router2"};