Merge remote-tracking branch 'origin/estdelay' into redist_slack

Conflicts:
	ecp5/arch.cc
	generic/arch.cc
	ice40/arch.cc

2 files changed, 10 insertions, 0 deletions

diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index 36cefded..14b5b8f2 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -413,6 +413,15 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
     return 200 * (abs(src.location.x - dst.location.x) + abs(src.location.y - dst.location.y));
 }
 
+delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const;
+{
+    const auto& driver = net_info->driver;
+    auto driver_loc = getBelLocation(driver.cell->bel);
+    auto sink_loc = getBelLocation(sink.cell->bel);
+
+    return 200 * (abs(driver_loc.x - sink_loc.x) + abs(driver_loc.y - sink_loc.y));
+}
+
 delay_t Arch::getBudgetOverride(NetInfo *net_info, int user_idx, delay_t budget) const { return budget; }
 
 // -----------------------------------------------------------------------
diff --git a/ecp5/arch.h b/ecp5/arch.h
index df0df311..255bafc7 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -776,6 +776,7 @@ struct Arch : BaseCtx
     // -------------------------------------------------
 
     delay_t estimateDelay(WireId src, WireId dst) const;
+    delay_t predictDelay(const NetInfo *net_info, const PortRef &sink) const;
     delay_t getDelayEpsilon() const { return 20; }
     delay_t getRipupDelayPenalty() const { return 200; }
     float getDelayNS(delay_t v) const { return v * 0.001; }