diff options
| author | David Shah <dave@ds0.me> | 2019-03-24 11:10:20 +0000 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2019-03-24 11:10:20 +0000 |
| commit | 02ae21d8fc3bc1375848f40702cd4bb7f6700595 (patch) | |
| tree | db9e1fc5f4329285c9c5c5a5eb1c615418530138 /ecp5/arch.cc | |
| parent | 52e05f4a0706b1c108221e600ff11e654f6e85a5 (diff) | |
| download | nextpnr-02ae21d8fc3bc1375848f40702cd4bb7f6700595.tar.gz nextpnr-02ae21d8fc3bc1375848f40702cd4bb7f6700595.tar.bz2 nextpnr-02ae21d8fc3bc1375848f40702cd4bb7f6700595.zip | |
Add --placer option and refactor placer selection
Signed-off-by: David Shah <dave@ds0.me>
Diffstat (limited to 'ecp5/arch.cc')
| -rw-r--r-- | ecp5/arch.cc | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index d4b53f47..9da8abdf 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -508,21 +508,21 @@ bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay bool Arch::place() { - // HeAP is the default unless overriden or not built -#ifdef WITH_HEAP - if (bool_or_default(settings, id("sa_placer"), false)) { -#endif - if (!placer1(getCtx(), Placer1Cfg(getCtx()))) - return false; -#ifdef WITH_HEAP - } else { + std::string placer = str_or_default(settings, id("placer"), defaultPlacer); + + if (placer == "heap") { PlacerHeapCfg cfg(getCtx()); cfg.criticalityExponent = 7; cfg.ioBufTypes.insert(id_TRELLIS_IO); if (!placer_heap(getCtx(), cfg)) return false; + } else if (placer == "sa") { + if (!placer1(getCtx(), Placer1Cfg(getCtx()))) + return false; + } else { + log_error("ECP5 architecture does not support placer '%s'\n", placer.c_str()); } -#endif + permute_luts(); return true; } @@ -986,4 +986,16 @@ WireId Arch::getBankECLK(int bank, int eclk) return getWireByLocAndBasename(Location(0, 0), "G_BANK" + std::to_string(bank) + "ECLK" + std::to_string(eclk)); } +#ifdef WITH_HEAP +const std::string Arch::defaultPlacer = "heap"; +#else +const std::string Arch::defaultPlacer = "sa"; +#endif + +const std::vector<std::string> Arch::availablePlacers = {"sa", +#ifdef WITH_HEAP + "heap" +#endif +}; + NEXTPNR_NAMESPACE_END |