1 files changed, 10 insertions, 85 deletions

diff --git a/common/place_common.cc b/common/place_common.cc
index 281e40a2..48416370 100644
--- a/common/place_common.cc
+++ b/common/place_common.cc
@@ -2,6 +2,7 @@
  *  nextpnr -- Next Generation Place and Route
  *
  *  Copyright (C) 2018  David Shah <david@symbioticeda.com>
+ *  Copyright (C) 2018  Serge Bazanski  <q3k@symbioticeda.com>
  *
  *  Permission to use, copy, modify, and/or distribute this software for any
  *  purpose with or without fee is hereby granted, provided that the above
@@ -24,84 +25,8 @@
 
 NEXTPNR_NAMESPACE_BEGIN
 
-// Get the total estimated wirelength for a net
-wirelen_t get_net_wirelength(const Context *ctx, const NetInfo *net, float &tns)
-{
-    wirelen_t wirelength = 0;
-    int driver_x, driver_y;
-    bool driver_gb;
-    CellInfo *driver_cell = net->driver.cell;
-    if (!driver_cell)
-        return 0;
-    if (driver_cell->bel == BelId())
-        return 0;
-    ctx->estimatePosition(driver_cell->bel, driver_x, driver_y, driver_gb);
-    WireId drv_wire = ctx->getWireBelPinUnlocked(driver_cell->bel, ctx->portPinFromId(net->driver.port));
-    if (driver_gb)
-        return 0;
-    float worst_slack = 1000;
-    int xmin = driver_x, xmax = driver_x, ymin = driver_y, ymax = driver_y;
-    for (auto load : net->users) {
-        if (load.cell == nullptr)
-            continue;
-        CellInfo *load_cell = load.cell;
-        if (load_cell->bel == BelId())
-            continue;
-        if (ctx->timing_driven) {
-            WireId user_wire = ctx->getWireBelPinUnlocked(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);
-            if (slack < 0)
-                tns += slack;
-            worst_slack = std::min(slack, worst_slack);
-        }
-
-        int load_x, load_y;
-        bool load_gb;
-        ctx->estimatePosition(load_cell->bel, load_x, load_y, load_gb);
-        if (load_gb)
-            continue;
-        xmin = std::min(xmin, load_x);
-        ymin = std::min(ymin, load_y);
-        xmax = std::max(xmax, load_x);
-        ymax = std::max(ymax, load_y);
-    }
-    if (ctx->timing_driven) {
-        wirelength = wirelen_t((((ymax - ymin) + (xmax - xmin)) * std::min(5.0, (1.0 + std::exp(-worst_slack / 5)))));
-    } else {
-        wirelength = wirelen_t((ymax - ymin) + (xmax - xmin));
-    }
-
-    return wirelength;
-}
-
-// Get the total wirelength for a cell
-wirelen_t get_cell_wirelength(const Context *ctx, const CellInfo *cell)
-{
-    std::set<IdString> nets;
-    for (auto p : cell->ports) {
-        if (p.second.net)
-            nets.insert(p.second.net->name);
-    }
-    wirelen_t wirelength = 0;
-    float tns = 0;
-    for (auto n : nets) {
-        wirelength += get_net_wirelength(ctx, ctx->nets.at(n).get(), tns);
-    }
-    return wirelength;
-}
-
-wirelen_t get_cell_wirelength_at_bel(const Context *ctx, CellInfo *cell, BelId bel)
-{
-    BelId oldBel = cell->bel;
-    cell->bel = bel;
-    wirelen_t wirelen = get_cell_wirelength(ctx, cell);
-    cell->bel = oldBel;
-    return wirelen;
-}
-
 // Placing a single cell
-bool place_single_cell(Context *ctx, CellInfo *cell, bool require_legality)
+bool place_single_cell(ArchRWProxy &proxy, Context *ctx, CellInfo *cell, bool require_legality)
 {
     bool all_placed = false;
     int iters = 25;
@@ -112,13 +37,13 @@ bool place_single_cell(Context *ctx, CellInfo *cell, bool require_legality)
         CellInfo *ripup_target = nullptr;
         BelId ripup_bel = BelId();
         if (cell->bel != BelId()) {
-            ctx->unbindBelUnlocked(cell->bel);
+            proxy.unbindBel(cell->bel);
         }
         BelType targetType = ctx->belTypeFromId(cell->type);
         for (auto bel : ctx->getBels()) {
-            if (ctx->getBelType(bel) == targetType && (!require_legality || ctx->isValidBelForCell(cell, bel))) {
-                if (ctx->checkBelAvailUnlocked(bel)) {
-                    wirelen_t wirelen = get_cell_wirelength_at_bel(ctx, cell, bel);
+            if (ctx->getBelType(bel) == targetType && (!require_legality || proxy.isValidBelForCell(cell, bel))) {
+                if (proxy.checkBelAvail(bel)) {
+                    wirelen_t wirelen = get_cell_wirelength_at_bel(proxy, ctx, cell, bel);
                     if (iters >= 4)
                         wirelen += ctx->rng(25);
                     if (wirelen <= best_wirelen) {
@@ -126,11 +51,11 @@ bool place_single_cell(Context *ctx, CellInfo *cell, bool require_legality)
                         best_bel = bel;
                     }
                 } else {
-                    wirelen_t wirelen = get_cell_wirelength_at_bel(ctx, cell, bel);
+                    wirelen_t wirelen = get_cell_wirelength_at_bel(proxy, ctx, cell, bel);
                     if (iters >= 4)
                         wirelen += ctx->rng(25);
                     if (wirelen <= best_ripup_wirelen) {
-                        ripup_target = ctx->cells.at(ctx->getBoundBelCellUnlocked(bel)).get();
+                        ripup_target = proxy.getCell(proxy.getBoundBelCell(bel));
                         if (ripup_target->belStrength < STRENGTH_STRONG) {
                             best_ripup_wirelen = wirelen;
                             ripup_bel = bel;
@@ -148,12 +73,12 @@ bool place_single_cell(Context *ctx, CellInfo *cell, bool require_legality)
                 log_error("failed to place cell '%s' of type '%s'\n", cell->name.c_str(ctx), cell->type.c_str(ctx));
             }
             --iters;
-            ctx->unbindBelUnlocked(ripup_target->bel);
+            proxy.unbindBel(ripup_target->bel);
             best_bel = ripup_bel;
         } else {
             all_placed = true;
         }
-        ctx->bindBelUnlocked(best_bel, cell->name, STRENGTH_WEAK);
+        proxy.bindBel(best_bel, cell->name, STRENGTH_WEAK);
 
         cell = ripup_target;
     }