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

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

8 files changed, 52 insertions, 26 deletions

diff --git a/common/nextpnr.cc b/common/nextpnr.cc
index cf1b5982..4a97bd93 100644
--- a/common/nextpnr.cc
+++ b/common/nextpnr.cc
@@ -93,7 +93,9 @@ delay_t Context::getNetinfoRouteDelay(NetInfo *net_info, int user_idx) const
     WireId src_wire = getNetinfoSourceWire(net_info);
     if (src_wire == WireId())
         return 0;
-    WireId cursor = getNetinfoSinkWire(net_info, user_idx);
+
+    WireId dst_wire = getNetinfoSinkWire(net_info, user_idx);
+    WireId cursor = dst_wire;
     delay_t delay = 0;
 
     while (cursor != WireId() && cursor != src_wire) {
@@ -107,11 +109,9 @@ delay_t Context::getNetinfoRouteDelay(NetInfo *net_info, int user_idx) const
     }
 
     if (cursor == src_wire)
-        delay += getWireDelay(src_wire).maxDelay();
-    else
-        delay += estimateDelay(src_wire, cursor);
+        return delay + getWireDelay(src_wire).maxDelay();
 
-    return delay;
+    return predictDelay(net_info, net_info->users[user_idx]);
 }
 
 static uint32_t xorshift32(uint32_t x)
diff --git a/common/place_common.cc b/common/place_common.cc
index 5673c847..3c19a733 100644
--- a/common/place_common.cc
+++ b/common/place_common.cc
@@ -37,10 +37,9 @@ wirelen_t get_net_metric(const Context *ctx, const NetInfo *net, MetricType type
         return 0;
     driver_gb = ctx->getBelGlobalBuf(driver_cell->bel);
     driver_loc = ctx->getBelLocation(driver_cell->bel);
-    WireId drv_wire = ctx->getBelPinWire(driver_cell->bel, ctx->portPinFromId(net->driver.port));
     if (driver_gb)
         return 0;
-    float worst_slack = 1000;
+    delay_t worst_slack = std::numeric_limits<delay_t>::max();
     int xmin = driver_loc.x, xmax = driver_loc.x, ymin = driver_loc.y, ymax = driver_loc.y;
     for (auto load : net->users) {
         if (load.cell == nullptr)
@@ -49,9 +48,8 @@ wirelen_t get_net_metric(const Context *ctx, const NetInfo *net, MetricType type
         if (load_cell->bel == BelId())
             continue;
         if (ctx->timing_driven && type == MetricType::COST) {
-            WireId user_wire = ctx->getBelPinWire(load_cell->bel, ctx->portPinFromId(load.port));
-            delay_t raw_wl = ctx->estimateDelay(drv_wire, user_wire);
-            float slack = ctx->getDelayNS(load.budget) - ctx->getDelayNS(raw_wl);
+            delay_t net_delay = ctx->predictDelay(net, load);
+            auto slack = load.budget - net_delay;
             if (slack < 0)
                 tns += slack;
             worst_slack = std::min(slack, worst_slack);
@@ -72,6 +70,7 @@ wirelen_t get_net_metric(const Context *ctx, const NetInfo *net, MetricType type
         wirelength = wirelen_t((ymax - ymin) + (xmax - xmin));
     }
 
+    tns = ctx->getDelayNS(tns);
     return wirelength;
 }
 
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; }
diff --git a/generic/arch.cc b/generic/arch.cc
index daaa8118..43015685 100644
--- a/generic/arch.cc
+++ b/generic/arch.cc
@@ -403,6 +403,17 @@ 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 Arch::getBudgetOverride(NetInfo *net_info, int user_idx, delay_t budget) const { return budget; }
 
 // ---------------------------------------------------------------
diff --git a/generic/arch.h b/generic/arch.h
index de06f730..154a2352 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -194,6 +194,7 @@ 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; }
diff --git a/ice40/arch.cc b/ice40/arch.cc
index e15abdd1..bdfb13fe 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -613,27 +613,31 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
     int xd = x2 - x1, yd = y2 - y1;
     int xscale = 120, yscale = 120, offset = 0;
 
+    return xscale * abs(xd) + yscale * abs(yd) + offset;
+}
+
+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);
+
+    if (driver.port == id_cout) {
+        if (driver_loc.y == sink_loc.y)
+            return 0;
+        return 250;
+    }
+
+    int xd = sink_loc.x - driver_loc.x, yd = sink_loc.y - driver_loc.y;
+    int xscale = 120, yscale = 120, offset = 0;
+
     // if (chip_info->wire_data[src.index].type == WIRE_TYPE_SP4_VERT) {
     //     yd = yd < -4 ? yd + 4 : (yd < 0 ? 0 : yd);
     //     offset = 500;
     // }
 
-    // Estimate for output mux
-    for (const auto &bp : getWireBelPins(src)) {
-        if (bp.pin == PIN_O && getBelType(bp.bel) == TYPE_ICESTORM_LC) {
-            offset += 330;
-            break;
-        }
-    }
-
-    // Estimate for input mux
-    for (const auto &bp : getWireBelPins(dst)) {
-        if ((bp.pin == PIN_I0 || bp.pin == PIN_I1 || bp.pin == PIN_I2 || bp.pin == PIN_I3) &&
-            getBelType(bp.bel) == TYPE_ICESTORM_LC) {
-            offset += 260;
-            break;
-        }
-    }
+    if (driver.port == id_o) offset += 330;
+    if (sink.port == id_i0 || sink.port == id_i1 || sink.port == id_i2 || sink.port == id_i3) offset += 260;
 
     return xscale * abs(xd) + yscale * abs(yd) + offset;
 }
diff --git a/ice40/arch.h b/ice40/arch.h
index f81fd21d..92698b4d 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -697,6 +697,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; }