From ddb084e9a8a0cba10536951236cde824526e8071 Mon Sep 17 00:00:00 2001 From: gatecat Date: Sun, 19 Dec 2021 16:41:34 +0000 Subject: archapi: Use arbitrary rather than actual placement in predictDelay This makes predictDelay be based on an arbitrary belpin pair rather than a arc of a net based on cell placement. This way 'what-if' decisions can be evaluated without actually changing placement; potentially useful for parallel placement. A new helper predictArcDelay behaves like the old predictDelay to minimise the impact on existing passes; only arches need be updated. Signed-off-by: gatecat --- ice40/arch.h | 2 +- ice40/delay.cc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ice40') diff --git a/ice40/arch.h b/ice40/arch.h index 5162285c..3563baad 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -784,7 +784,7 @@ struct Arch : BaseArch // ------------------------------------------------- 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 20; } delay_t getRipupDelayPenalty() const override { return 200; } float getDelayNS(delay_t v) const override { return v * 0.001; } diff --git a/ice40/delay.cc b/ice40/delay.cc index 740057f1..a00cc259 100644 --- a/ice40/delay.cc +++ b/ice40/delay.cc @@ -188,13 +188,13 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const return v; } -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 { - const auto &driver = net_info->driver; - auto driver_loc = getBelLocation(driver.cell->bel); - auto sink_loc = getBelLocation(sink.cell->bel); + NPNR_UNUSED(dst_pin); + auto driver_loc = getBelLocation(src_bel); + auto sink_loc = getBelLocation(dst_bel); - if (driver.port == id_COUT) { + if (src_pin == id_COUT) { if (driver_loc.y == sink_loc.y) return 0; return 250; -- cgit v1.2.3