Simplify and use Arch::getNetinfoRouteDelay() for update_budget()

3 files changed, 26 insertions, 73 deletions

diff --git a/common/router1.cc b/common/router1.cc
index 431770da..f4f0d75b 100644
--- a/common/router1.cc
+++ b/common/router1.cc
@@ -613,38 +613,10 @@ bool router1(Context *ctx)
 
             std::unordered_set<IdString> normalRouteNets, ripupQueue;
 
-            if (iterCnt == 1) {
-                if (ctx->verbose)
-                    log_info("routing queue contains %d jobs.\n", int(jobQueue.size()));
-            } else {
-                static auto actual_delay = [](Context *ctx, WireId src, WireId dst) {
-                    delay_t total_delay = 0;
-                    WireId last = dst;
-                    auto net_name = ctx->getBoundWireNet(src);
-                    if (net_name != IdString()) {
-                        auto net = ctx->nets.at(net_name).get();
-                        while (last != src) {
-                            total_delay += ctx->getWireDelay(last).maxDelay();
-                            auto pip = net->wires.at(last).pip;
-                            NPNR_ASSERT(ctx->getBoundPipNet(pip) == net_name);
-                            total_delay += ctx->getPipDelay(pip).maxDelay();
-                            last = ctx->getPipSrcWire(pip);
-                            if (ctx->getBoundWireNet(last) != net_name) {
-                                log_warning("Wire %s bound to %s not %s!\n", ctx->getWireName(last).c_str(ctx), ctx->getBoundWireNet(last).c_str(ctx), net_name.c_str(ctx));
-                                break;
-                            }
-                            NPNR_ASSERT(ctx->getBoundWireNet(last) == net_name);
-                        }
-                        NPNR_ASSERT(last != WireId());
-                    }
-                    if (last != src)
-                        total_delay += ctx->estimateDelay(src, last);
-                    else
-                        total_delay += ctx->getWireDelay(last).maxDelay();
-                    return total_delay;
-                };
-                update_budget(ctx, actual_delay);
-            }
+            if (iterCnt == 1 && ctx->verbose)
+                log_info("routing queue contains %d jobs.\n", int(jobQueue.size()));
+
+            update_budget(ctx);
 
             bool printNets = ctx->verbose && (jobQueue.size() < 10);
 
diff --git a/common/timing.cc b/common/timing.cc
index 0e84dded..dd0bf52a 100644
--- a/common/timing.cc
+++ b/common/timing.cc
@@ -116,12 +116,11 @@ void assign_budget(Context *ctx)
 }
 
 typedef std::unordered_map<const PortInfo*, delay_t> updates_t;
-typedef std::unordered_map<const PortInfo*, delay_t> delays_t;
 
-static delay_t follow_net_update(Context *ctx, NetInfo *net, int path_length, delay_t slack, const delays_t& delays, updates_t& updates);
+static delay_t follow_net_update(Context *ctx, NetInfo *net, int path_length, delay_t slack, updates_t& updates);
 
 // Follow a path, returning budget to annotate
-static delay_t follow_user_port_update(Context *ctx, PortRef &user, int path_length, delay_t slack, const delays_t& delays, updates_t& updates)
+static delay_t follow_user_port_update(Context *ctx, PortRef &user, int path_length, delay_t slack, updates_t& updates)
 {
     delay_t value;
     if (ctx->getPortClock(user.cell, user.port) != IdString()) {
@@ -140,7 +139,7 @@ static delay_t follow_user_port_update(Context *ctx, PortRef &user, int path_len
                 if (is_path) {
                     NetInfo *net = port.second.net;
                     if (net) {
-                        delay_t path_budget = follow_net_update(ctx, net, path_length, slack - comb_delay, delays, updates);
+                        delay_t path_budget = follow_net_update(ctx, net, path_length, slack - comb_delay, updates);
                         value = std::min(value, path_budget);
                     }
                 }
@@ -155,55 +154,36 @@ static delay_t follow_user_port_update(Context *ctx, PortRef &user, int path_len
     return value;
 }
 
-static delay_t follow_net_update(Context *ctx, NetInfo *net, int path_length, delay_t slack, const delays_t& delays,updates_t& updates)
+static delay_t follow_net_update(Context *ctx, NetInfo *net, int path_length, delay_t slack, updates_t& updates)
 {
     delay_t net_budget = slack / (path_length + 1);
-    for (auto& usr : net->users) {
-        net_budget = std::min(net_budget, follow_user_port_update(ctx, usr, path_length + 1, slack - get_or_default(delays, &usr.cell->ports.at(usr.port), 0.), delays, updates));
+    for (size_t i = 0; i < net->users.size(); ++i) {
+        auto& usr = net->users[i];
+        net_budget = std::min(net_budget, follow_user_port_update(ctx, usr, path_length + 1, slack - ctx->getNetinfoRouteDelay(net, i), updates));
     }
     return net_budget;
 }
 
-void update_budget(Context *ctx, std::function<delay_t(Context*,WireId,WireId)> delay_fn)
+void update_budget(Context *ctx)
 {
-    delays_t delays;
     updates_t updates;
 
-    // Compute the delay for every pin on every net
-    for (auto &n : ctx->nets) {
-        auto net = n.second.get();
-
-        int driver_x, driver_y;
-        bool driver_gb;
-        CellInfo *driver_cell = net->driver.cell;
-        if (!driver_cell)
-            continue;
-        if (driver_cell->bel == BelId())
-            continue;
-        ctx->estimatePosition(driver_cell->bel, driver_x, driver_y, driver_gb);
-        WireId drv_wire = ctx->getWireBelPin(driver_cell->bel, ctx->portPinFromId(net->driver.port));
-        if (driver_gb)
-            continue;
-        for (auto& load : net->users) {
-            if (load.cell == nullptr)
-                continue;
-            CellInfo *load_cell = load.cell;
-            if (load_cell->bel == BelId())
-                continue;
-            WireId user_wire = ctx->getWireBelPin(load_cell->bel, ctx->portPinFromId(load.port));
-            delay_t raw_wl = delay_fn(ctx, drv_wire, user_wire);
-            delays.emplace(&load_cell->ports.at(load.port), raw_wl);
-        }
-    }
-
     // Go through all clocked drivers and distribute the available path slack evenly into every budget
     for (auto &cell : ctx->cells) {
         for (auto& port : cell.second->ports) {
             if (port.second.type == PORT_OUT) {
                 IdString clock_domain = ctx->getPortClock(cell.second.get(), port.first);
                 if (clock_domain != IdString()) {
-                    if (port.second.net)
-                        follow_net_update(ctx, port.second.net, 0, delay_t(1.0e12 / ctx->target_freq) - get_or_default(delays, &port.second, 0.), delays, updates);
+                    auto net = port.second.net;
+                    if (net) {
+                        delay_t delay = 0;
+                        if (port.second.name != net->driver.port) {
+                            const auto& users = net->users;
+                            auto it = std::find_if(users.begin(), users.end(), [&port](const PortRef& pr) { return pr.port == port.second.name; });
+                            delay = ctx->getNetinfoRouteDelay(net, std::distance(users.begin(), it));
+                        }
+                        follow_net_update(ctx, net, 0, delay_t(1.0e12 / ctx->target_freq - delay), updates);
+                    }
                 }
             }
         }
@@ -211,11 +191,12 @@ void update_budget(Context *ctx, std::function<delay_t(Context*,WireId,WireId)>
 
     // Update the budgets
     for (auto &net : ctx->nets) {
-        for (auto& user : net.second->users) {
+        for (size_t i = 0; i < net.second->users.size(); ++i) {
+            auto user = net.second->users[i];
             auto pi = &user.cell->ports.at(user.port);
             auto it = updates.find(pi);
             if (it == updates.end()) continue;
-            auto budget = delays.at(pi) + it->second;
+            auto budget = ctx->getNetinfoRouteDelay(net.second.get(), i) + it->second;
             user.budget = ctx->getBudgetOverride(net.second->driver, budget);
 
             // Post-update check
diff --git a/common/timing.h b/common/timing.h
index 8c098963..b5574392 100644
--- a/common/timing.h
+++ b/common/timing.h
@@ -27,7 +27,7 @@ NEXTPNR_NAMESPACE_BEGIN
 // Assign "budget" values for all user ports in the design
 void assign_budget(Context *ctx);
 
-void update_budget(Context *ctx, std::function<delay_t(Context*,WireId,WireId)> delay_fn=&Context::estimateDelay);
+void update_budget(Context *ctx);
 
 NEXTPNR_NAMESPACE_END