Merge branch 'redist_slack' into 'master'

Update budgets throughout placement and routing

See merge request SymbioticEDA/nextpnr!16

2 files changed, 15 insertions, 0 deletions

diff --git a/generic/arch.cc b/generic/arch.cc
index 892bb0fd..b1905e6f 100644
--- a/generic/arch.cc
+++ b/generic/arch.cc
@@ -403,6 +403,19 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
     return (dx + dy) * grid_distance_to_delay;
 }
 
+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);
+
+    int dx = abs(driver_loc.x - driver_loc.x);
+    int dy = abs(sink_loc.y - sink_locy);
+    return (dx + dy) * grid_distance_to_delay;
+}
+
+delay_t getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const { return budget; }
+
 // ---------------------------------------------------------------
 
 bool Arch::place() { return placer1(getCtx()); }
diff --git a/generic/arch.h b/generic/arch.h
index 9a0da75b..17d62ec3 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -194,10 +194,12 @@ struct Arch : BaseCtx
     const std::vector<GroupId> &getGroupGroups(GroupId group) const;
 
     delay_t estimateDelay(WireId src, WireId dst) const;
+    delay_t predictDelay(const NetInfo *net_info, const PortRef &sink) const;
     delay_t getDelayEpsilon() const { return 0.01; }
     delay_t getRipupDelayPenalty() const { return 1.0; }
     float getDelayNS(delay_t v) const { return v; }
     uint32_t getDelayChecksum(delay_t v) const { return 0; }
+    delay_t getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const;
 
     bool pack() { return true; }
     bool place();