diff options
Diffstat (limited to 'machxo2')
| -rw-r--r-- | machxo2/arch.cc | 13 | ||||
| -rw-r--r-- | machxo2/arch.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/machxo2/arch.cc b/machxo2/arch.cc index a201adf1..6c0e48ce 100644 --- a/machxo2/arch.cc +++ b/machxo2/arch.cc @@ -387,16 +387,17 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const return (abs(dst.location.x - src.location.x) + abs(dst.location.y - src.location.y)) * (0.01 + 0.01); } -delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const +delay_t Arch::predictDelay(BelId src_bel, IdString src_pin, BelId dst_bel, IdString dst_pin) const { - BelId src = net_info->driver.cell->bel; - BelId dst = sink.cell->bel; + NPNR_UNUSED(src_pin); + NPNR_UNUSED(dst_pin); - NPNR_ASSERT(src != BelId()); - NPNR_ASSERT(dst != BelId()); + NPNR_ASSERT(src_bel != BelId()); + NPNR_ASSERT(dst_bel != BelId()); // TODO: Same deal applies here as with estimateDelay. - return (abs(dst.location.x - src.location.x) + abs(dst.location.y - src.location.y)) * (0.01 + 0.01); + return (abs(dst_bel.location.x - src_bel.location.x) + abs(dst_bel.location.y - src_bel.location.y)) * + (0.01 + 0.01); } ArcBounds Arch::getRouteBoundingBox(WireId src, WireId dst) const diff --git a/machxo2/arch.h b/machxo2/arch.h index f5ccb4f6..29d8c3ff 100644 --- a/machxo2/arch.h +++ b/machxo2/arch.h @@ -626,7 +626,7 @@ struct Arch : BaseArch<ArchRanges> // Delay delay_t estimateDelay(WireId src, WireId dst) const override; - delay_t predictDelay(const NetInfo *net_info, const PortRef &sink) const override; + delay_t predictDelay(BelId src_bel, IdString src_pin, BelId dst_bel, IdString dst_pin) const override; delay_t getDelayEpsilon() const override { return 0.001; } delay_t getRipupDelayPenalty() const override { return 0.015; } float getDelayNS(delay_t v) const override { return v; } |