diff options
| author | David Shah <davey1576@gmail.com> | 2018-08-06 21:25:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-06 21:25:30 +0200 |
| commit | 88d2c49440c952a097107b6299fd09034532a8db (patch) | |
| tree | 1729562bd277e25e15fa328900af210bf393968b /ice40 | |
| parent | 0b1c67cad348d0470d81aa6d6e72b25a4972f525 (diff) | |
| parent | 9addcac09cd9e95a1078b938c92290c453e53160 (diff) | |
| download | nextpnr-88d2c49440c952a097107b6299fd09034532a8db.tar.gz nextpnr-88d2c49440c952a097107b6299fd09034532a8db.tar.bz2 nextpnr-88d2c49440c952a097107b6299fd09034532a8db.zip | |
Merge pull request #40 from eddiehung/fix_budget_overrides
Fix budget overrides
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/arch.cc | 27 | ||||
| -rw-r--r-- | ice40/arch.h | 2 |
2 files changed, 23 insertions, 6 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index 0b168383..fcc9d798 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -637,17 +637,34 @@ std::vector<GroupId> Arch::getGroupGroups(GroupId group) const // ----------------------------------------------------------------------- -delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const +bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const { const auto &driver = net_info->driver; - if (driver.port == id_cout) { + if (driver.port == id_cout && sink.port == id_cin) { auto driver_loc = getBelLocation(driver.cell->bel); auto sink_loc = getBelLocation(sink.cell->bel); if (driver_loc.y == sink_loc.y) - return 0; - return 250; + budget = 0; + else switch (args.type) { +#ifndef ICE40_HX1K_ONLY + case ArchArgs::HX8K: +#endif + case ArchArgs::HX1K: + budget = 190; break; +#ifndef ICE40_HX1K_ONLY + case ArchArgs::LP384: + case ArchArgs::LP1K: + case ArchArgs::LP8K: + budget = 290; break; + case ArchArgs::UP5K: + budget = 560; break; +#endif + default: + log_error("Unsupported iCE40 chip type.\n"); + } + return true; } - return budget; + return false; } // ----------------------------------------------------------------------- diff --git a/ice40/arch.h b/ice40/arch.h index 236f73f1..328950df 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -766,7 +766,7 @@ struct Arch : BaseCtx delay_t getRipupDelayPenalty() const { return 200; } float getDelayNS(delay_t v) const { return v * 0.001; } uint32_t getDelayChecksum(delay_t v) const { return v; } - delay_t getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const; + bool getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t &budget) const; // ------------------------------------------------- |