Merge branch 'master' of github.com:YosysHQ/nextpnr into router_improve

1 files changed, 15 insertions, 5 deletions

diff --git a/common/placer1.cc b/common/placer1.cc
index 363b4d58..0d7c0701 100644
--- a/common/placer1.cc
+++ b/common/placer1.cc
@@ -81,7 +81,8 @@ class SAPlacer
         }
     }
 
-    ~SAPlacer() {
+    ~SAPlacer()
+    {
         for (auto &net : ctx->nets)
             net.second->udata = old_udata[net.second->udata];
     }
@@ -117,6 +118,12 @@ class SAPlacer
                               loc_name.c_str(), bel_type.c_str(ctx), cell->name.c_str(ctx), cell->type.c_str(ctx));
                 }
 
+                auto bound_cell = ctx->getBoundBelCell(bel);
+                if (bound_cell) {
+                    log_error("Cell \'%s\' cannot be bound to bel \'%s\' since it is already bound to cell \'%s\'\n",
+                              cell->name.c_str(ctx), loc_name.c_str(), bound_cell->name.c_str(ctx));
+                }
+
                 ctx->bindBel(bel, cell, STRENGTH_USER);
                 locked_bels.insert(bel);
                 placed_cells++;
@@ -351,7 +358,7 @@ class SAPlacer
     // Attempt a SA position swap, return true on success or false on failure
     bool try_swap_position(CellInfo *cell, BelId newBel)
     {
-        static std::vector<NetInfo*> updates;
+        static std::vector<NetInfo *> updates;
         updates.clear();
         BelId oldBel = cell->bel;
         CellInfo *other_cell = ctx->getBoundBelCell(newBel);
@@ -371,7 +378,8 @@ class SAPlacer
         for (const auto &port : cell->ports) {
             if (port.second.net != nullptr) {
                 auto &cost = costs[port.second.net->udata];
-                if (cost.new_cost == 0) continue;
+                if (cost.new_cost == 0)
+                    continue;
                 cost.new_cost = 0;
                 updates.emplace_back(port.second.net);
             }
@@ -381,7 +389,8 @@ class SAPlacer
             for (const auto &port : other_cell->ports)
                 if (port.second.net != nullptr) {
                     auto &cost = costs[port.second.net->udata];
-                    if (cost.new_cost == 0) continue;
+                    if (cost.new_cost == 0)
+                        continue;
                     cost.new_cost = 0;
                     updates.emplace_back(port.second.net);
                 }
@@ -483,7 +492,8 @@ class SAPlacer
     const float post_legalise_dia_scale = 1.5;
     Placer1Cfg cfg;
 
-    struct CostChange {
+    struct CostChange
+    {
         wirelen_t curr_cost;
         wirelen_t new_cost;
     };