Modify predictDelay signature

2 files changed, 8 insertions, 6 deletions

diff --git a/generic/arch.cc b/generic/arch.cc
index 8ef37716..4469a828 100644
--- a/generic/arch.cc
+++ b/generic/arch.cc
@@ -403,12 +403,14 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
     return (dx + dy) * grid_distance_to_delay;
 }
 
-delay_t Arch::predictDelay(WireId src, WireId dst) const
+delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const;
 {
-    const WireInfo &s = wires.at(src);
-    const WireInfo &d = wires.at(dst);
-    int dx = abs(s.x - d.x);
-    int dy = abs(s.y - d.y);
+    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;
 }
 
diff --git a/generic/arch.h b/generic/arch.h
index 60220fbe..f02649f6 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -194,7 +194,7 @@ struct Arch : BaseCtx
     const std::vector<GroupId> &getGroupGroups(GroupId group) const;
 
     delay_t estimateDelay(WireId src, WireId dst) const;
-    delay_t predictDelay(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; }