refactor: New member functions to replace design_utils

Signed-off-by: gatecat <gatecat@ds0.me>

6 files changed, 167 insertions, 172 deletions

diff --git a/common/basectx.cc b/common/basectx.cc
index b55cd072..83a2deea 100644
--- a/common/basectx.cc
+++ b/common/basectx.cc
@@ -22,7 +22,6 @@
 #include <boost/algorithm/string.hpp>
 
 #include "context.h"
-#include "design_utils.h"
 #include "log.h"
 
 NEXTPNR_NAMESPACE_BEGIN
@@ -223,13 +222,23 @@ void BaseCtx::connectPort(IdString net, IdString cell, IdString port)
 {
     NetInfo *net_info = getNetByAlias(net);
     CellInfo *cell_info = cells.at(cell).get();
-    connect_port(getCtx(), net_info, cell_info, port);
+    cell_info->connectPort(port, net_info);
 }
 
 void BaseCtx::disconnectPort(IdString cell, IdString port)
 {
     CellInfo *cell_info = cells.at(cell).get();
-    disconnect_port(getCtx(), cell_info, port);
+    cell_info->disconnectPort(port);
+}
+
+void BaseCtx::renameNet(IdString old_name, IdString new_name)
+{
+    NetInfo *net = nets.at(old_name).get();
+    NPNR_ASSERT(!nets.count(new_name));
+    nets[new_name];
+    std::swap(nets.at(net->name), nets.at(new_name));
+    nets.erase(net->name);
+    net->name = new_name;
 }
 
 void BaseCtx::ripupNet(IdString name)
diff --git a/common/basectx.h b/common/basectx.h
index 507f29cd..21d6d63a 100644
--- a/common/basectx.h
+++ b/common/basectx.h
@@ -226,6 +226,7 @@ struct BaseCtx
     void disconnectPort(IdString cell, IdString port);
     void ripupNet(IdString name);
     void lockNetRouting(IdString name);
+    void renameNet(IdString old_name, IdString new_name);
 
     CellInfo *createCell(IdString name, IdString type);
     void copyBelPorts(IdString cell, BelId bel);
diff --git a/common/design_utils.cc b/common/design_utils.cc
index 9432b6cd..f52cc304 100644
--- a/common/design_utils.cc
+++ b/common/design_utils.cc
@@ -25,42 +25,6 @@
 #include "util.h"
 NEXTPNR_NAMESPACE_BEGIN
 
-void replace_port(CellInfo *old_cell, IdString old_name, CellInfo *rep_cell, IdString rep_name)
-{
-    if (!old_cell->ports.count(old_name))
-        return;
-    PortInfo &old = old_cell->ports.at(old_name);
-
-    // Create port on the replacement cell if it doesn't already exist
-    if (!rep_cell->ports.count(rep_name)) {
-        rep_cell->ports[rep_name].name = rep_name;
-        rep_cell->ports[rep_name].type = old.type;
-    }
-
-    PortInfo &rep = rep_cell->ports.at(rep_name);
-    NPNR_ASSERT(old.type == rep.type);
-
-    rep.net = old.net;
-    old.net = nullptr;
-    if (rep.type == PORT_OUT) {
-        if (rep.net != nullptr) {
-            rep.net->driver.cell = rep_cell;
-            rep.net->driver.port = rep_name;
-        }
-    } else if (rep.type == PORT_IN) {
-        if (rep.net != nullptr) {
-            for (PortRef &load : rep.net->users) {
-                if (load.cell == old_cell && load.port == old_name) {
-                    load.cell = rep_cell;
-                    load.port = rep_name;
-                }
-            }
-        }
-    } else {
-        NPNR_ASSERT(false);
-    }
-}
-
 // Print utilisation of a design
 void print_utilisation(const Context *ctx)
 {
@@ -85,111 +49,4 @@ void print_utilisation(const Context *ctx)
     log_break();
 }
 
-// Connect a net to a port
-void connect_port(const Context *ctx, NetInfo *net, CellInfo *cell, IdString port_name)
-{
-    if (net == nullptr)
-        return;
-    PortInfo &port = cell->ports.at(port_name);
-    NPNR_ASSERT(port.net == nullptr);
-    port.net = net;
-    if (port.type == PORT_OUT) {
-        NPNR_ASSERT(net->driver.cell == nullptr);
-        net->driver.cell = cell;
-        net->driver.port = port_name;
-    } else if (port.type == PORT_IN || port.type == PORT_INOUT) {
-        PortRef user;
-        user.cell = cell;
-        user.port = port_name;
-        net->users.push_back(user);
-    } else {
-        NPNR_ASSERT_FALSE("invalid port type for connect_port");
-    }
-}
-
-void disconnect_port(const Context *ctx, CellInfo *cell, IdString port_name)
-{
-    if (!cell->ports.count(port_name))
-        return;
-    PortInfo &port = cell->ports.at(port_name);
-    if (port.net != nullptr) {
-        port.net->users.erase(std::remove_if(port.net->users.begin(), port.net->users.end(),
-                                             [cell, port_name](const PortRef &user) {
-                                                 return user.cell == cell && user.port == port_name;
-                                             }),
-                              port.net->users.end());
-        if (port.net->driver.cell == cell && port.net->driver.port == port_name)
-            port.net->driver.cell = nullptr;
-        port.net = nullptr;
-    }
-}
-
-void connect_ports(Context *ctx, CellInfo *cell1, IdString port1_name, CellInfo *cell2, IdString port2_name)
-{
-    PortInfo &port1 = cell1->ports.at(port1_name);
-    if (port1.net == nullptr) {
-        // No net on port1; need to create one
-        NetInfo *p1net = ctx->createNet(ctx->id(cell1->name.str(ctx) + "$conn$" + port1_name.str(ctx)));
-        connect_port(ctx, p1net, cell1, port1_name);
-    }
-    connect_port(ctx, port1.net, cell2, port2_name);
-}
-
-void rename_port(Context *ctx, CellInfo *cell, IdString old_name, IdString new_name)
-{
-    if (!cell->ports.count(old_name))
-        return;
-    PortInfo pi = cell->ports.at(old_name);
-    if (pi.net != nullptr) {
-        if (pi.net->driver.cell == cell && pi.net->driver.port == old_name)
-            pi.net->driver.port = new_name;
-        for (auto &usr : pi.net->users)
-            if (usr.cell == cell && usr.port == old_name)
-                usr.port = new_name;
-    }
-    cell->ports.erase(old_name);
-    pi.name = new_name;
-    cell->ports[new_name] = pi;
-}
-
-void rename_net(Context *ctx, NetInfo *net, IdString new_name)
-{
-    if (net == nullptr)
-        return;
-    NPNR_ASSERT(!ctx->nets.count(new_name));
-    ctx->nets[new_name];
-    std::swap(ctx->nets.at(net->name), ctx->nets.at(new_name));
-    ctx->nets.erase(net->name);
-    net->name = new_name;
-}
-
-void replace_bus(Context *ctx, CellInfo *old_cell, IdString old_name, int old_offset, bool old_brackets,
-                 CellInfo *new_cell, IdString new_name, int new_offset, bool new_brackets, int width)
-{
-    for (int i = 0; i < width; i++) {
-        IdString old_port = ctx->id(stringf(old_brackets ? "%s[%d]" : "%s%d", old_name.c_str(ctx), i + old_offset));
-        IdString new_port = ctx->id(stringf(new_brackets ? "%s[%d]" : "%s%d", new_name.c_str(ctx), i + new_offset));
-        replace_port(old_cell, old_port, new_cell, new_port);
-    }
-}
-
-void copy_port(Context *ctx, CellInfo *old_cell, IdString old_name, CellInfo *new_cell, IdString new_name)
-{
-    if (!old_cell->ports.count(old_name))
-        return;
-    new_cell->ports[new_name].name = new_name;
-    new_cell->ports[new_name].type = old_cell->ports.at(old_name).type;
-    connect_port(ctx, old_cell->ports.at(old_name).net, new_cell, new_name);
-}
-
-void copy_bus(Context *ctx, CellInfo *old_cell, IdString old_name, int old_offset, bool old_brackets,
-              CellInfo *new_cell, IdString new_name, int new_offset, bool new_brackets, int width)
-{
-    for (int i = 0; i < width; i++) {
-        IdString old_port = ctx->id(stringf(old_brackets ? "%s[%d]" : "%s%d", old_name.c_str(ctx), i + old_offset));
-        IdString new_port = ctx->id(stringf(new_brackets ? "%s[%d]" : "%s%d", new_name.c_str(ctx), i + new_offset));
-        copy_port(ctx, old_cell, old_port, new_cell, new_port);
-    }
-}
-
 NEXTPNR_NAMESPACE_END
diff --git a/common/design_utils.h b/common/design_utils.h
index 82c9ac45..63cb71d7 100644
--- a/common/design_utils.h
+++ b/common/design_utils.h
@@ -89,34 +89,8 @@ inline bool port_used(CellInfo *cell, IdString port_name)
     return port_fnd != cell->ports.end() && port_fnd->second.net != nullptr;
 }
 
-// Connect a net to a port
-void connect_port(const Context *ctx, NetInfo *net, CellInfo *cell, IdString port_name);
-
-// Disconnect a net from a port
-void disconnect_port(const Context *ctx, CellInfo *cell, IdString port_name);
-
-// Connect two ports together
-void connect_ports(Context *ctx, CellInfo *cell1, IdString port1_name, CellInfo *cell2, IdString port2_name);
-
-// Rename a port if it exists on a cell
-void rename_port(Context *ctx, CellInfo *cell, IdString old_name, IdString new_name);
-
-// Rename a net without invalidating pointers to it
-void rename_net(Context *ctx, NetInfo *net, IdString new_name);
-
 void print_utilisation(const Context *ctx);
 
-// Disconnect a bus of nets (if connected) from old, and connect it to the new ports
-void replace_bus(Context *ctx, CellInfo *old_cell, IdString old_name, int old_offset, bool old_brackets,
-                 CellInfo *new_cell, IdString new_name, int new_offset, bool new_brackets, int width);
-
-// Copy a bus of nets (if connected) from old, and connect it to the new ports
-void copy_bus(Context *ctx, CellInfo *old_cell, IdString old_name, int old_offset, bool old_brackets,
-              CellInfo *new_cell, IdString new_name, int new_offset, bool new_brackets, int width);
-
-// Copy a port from one cell to another
-void copy_port(Context *ctx, CellInfo *old_cell, IdString old_name, CellInfo *new_cell, IdString new_name);
-
 NEXTPNR_NAMESPACE_END
 
 #endif
diff --git a/common/nextpnr_types.cc b/common/nextpnr_types.cc
index 3deed46f..c89a0071 100644
--- a/common/nextpnr_types.cc
+++ b/common/nextpnr_types.cc
@@ -18,6 +18,8 @@
  */
 
 #include "nextpnr_types.h"
+#include "context.h"
+#include "log.h"
 
 #include "nextpnr_namespaces.h"
 
@@ -49,4 +51,135 @@ bool CellInfo::testRegion(BelId bel) const
     return region == nullptr || !region->constr_bels || region->bels.count(bel);
 }
 
+void CellInfo::connectPort(IdString port_name, NetInfo *net)
+{
+    if (net == nullptr)
+        return;
+    PortInfo &port = ports.at(port_name);
+    NPNR_ASSERT(port.net == nullptr);
+    port.net = net;
+    if (port.type == PORT_OUT) {
+        NPNR_ASSERT(net->driver.cell == nullptr);
+        net->driver.cell = this;
+        net->driver.port = port_name;
+    } else if (port.type == PORT_IN || port.type == PORT_INOUT) {
+        PortRef user;
+        user.cell = this;
+        user.port = port_name;
+        net->users.push_back(user);
+    } else {
+        NPNR_ASSERT_FALSE("invalid port type for connect_port");
+    }
+}
+
+void CellInfo::disconnectPort(IdString port_name)
+{
+    if (!ports.count(port_name))
+        return;
+    PortInfo &port = ports.at(port_name);
+    if (port.net != nullptr) {
+        port.net->users.erase(std::remove_if(port.net->users.begin(), port.net->users.end(),
+                                             [this, port_name](const PortRef &user) {
+                                                 return user.cell == this && user.port == port_name;
+                                             }),
+                              port.net->users.end());
+        if (port.net->driver.cell == this && port.net->driver.port == port_name)
+            port.net->driver.cell = nullptr;
+        port.net = nullptr;
+    }
+}
+
+void CellInfo::connectPorts(IdString port, CellInfo *other, IdString other_port)
+{
+    PortInfo &port1 = ports.at(port);
+    if (port1.net == nullptr) {
+        // No net on port1; need to create one
+        NetInfo *p1net = ctx->createNet(ctx->id(name.str(ctx) + "$conn$" + port.str(ctx)));
+        connectPort(port, p1net);
+    }
+    other->connectPort(other_port, port1.net);
+}
+
+void CellInfo::movePortTo(IdString port, CellInfo *other, IdString other_port)
+{
+    if (!ports.count(port))
+        return;
+    PortInfo &old = ports.at(port);
+
+    // Create port on the replacement cell if it doesn't already exist
+    if (!other->ports.count(other_port)) {
+        other->ports[other_port].name = other_port;
+        other->ports[other_port].type = old.type;
+    }
+
+    PortInfo &rep = other->ports.at(other_port);
+    NPNR_ASSERT(old.type == rep.type);
+
+    rep.net = old.net;
+    old.net = nullptr;
+    if (rep.type == PORT_OUT) {
+        if (rep.net != nullptr) {
+            rep.net->driver.cell = other;
+            rep.net->driver.port = other_port;
+        }
+    } else if (rep.type == PORT_IN) {
+        if (rep.net != nullptr) {
+            for (PortRef &load : rep.net->users) {
+                if (load.cell == this && load.port == port) {
+                    load.cell = other;
+                    load.port = other_port;
+                }
+            }
+        }
+    } else {
+        NPNR_ASSERT(false);
+    }
+}
+
+void CellInfo::renamePort(IdString old_name, IdString new_name)
+{
+    if (!ports.count(old_name))
+        return;
+    PortInfo pi = ports.at(old_name);
+    if (pi.net != nullptr) {
+        if (pi.net->driver.cell == this && pi.net->driver.port == old_name)
+            pi.net->driver.port = new_name;
+        for (auto &usr : pi.net->users)
+            if (usr.cell == this && usr.port == old_name)
+                usr.port = new_name;
+    }
+    ports.erase(old_name);
+    pi.name = new_name;
+    ports[new_name] = pi;
+}
+
+void CellInfo::movePortBusTo(IdString old_name, int old_offset, bool old_brackets, CellInfo *new_cell,
+                             IdString new_name, int new_offset, bool new_brackets, int width)
+{
+    for (int i = 0; i < width; i++) {
+        IdString old_port = ctx->id(stringf(old_brackets ? "%s[%d]" : "%s%d", old_name.c_str(ctx), i + old_offset));
+        IdString new_port = ctx->id(stringf(new_brackets ? "%s[%d]" : "%s%d", new_name.c_str(ctx), i + new_offset));
+        movePortTo(old_port, new_cell, new_port);
+    }
+}
+
+void CellInfo::copyPortTo(IdString port, CellInfo *other, IdString other_port)
+{
+    if (!ports.count(port))
+        return;
+    other->ports[other_port].name = other_port;
+    other->ports[other_port].type = ports.at(port).type;
+    other->connectPort(other_port, ports.at(port).net);
+}
+
+void CellInfo::copyPortBusTo(IdString old_name, int old_offset, bool old_brackets, CellInfo *new_cell,
+                             IdString new_name, int new_offset, bool new_brackets, int width)
+{
+    for (int i = 0; i < width; i++) {
+        IdString old_port = ctx->id(stringf(old_brackets ? "%s[%d]" : "%s%d", old_name.c_str(ctx), i + old_offset));
+        IdString new_port = ctx->id(stringf(new_brackets ? "%s[%d]" : "%s%d", new_name.c_str(ctx), i + new_offset));
+        copyPortTo(old_port, new_cell, new_port);
+    }
+}
+
 NEXTPNR_NAMESPACE_END
diff --git a/common/nextpnr_types.h b/common/nextpnr_types.h
index 6debd2b8..cf93a071 100644
--- a/common/nextpnr_types.h
+++ b/common/nextpnr_types.h
@@ -187,6 +187,27 @@ struct CellInfo : ArchCellInfo
     void unsetAttr(IdString name);
     // check whether a bel complies with the cell's region constraint
     bool testRegion(BelId bel) const;
+
+    NetInfo *getPort(IdString name)
+    {
+        auto found = ports.find(name);
+        return (found == ports.end()) ? nullptr : found->second.net;
+    }
+    const NetInfo *getPort(IdString name) const
+    {
+        auto found = ports.find(name);
+        return (found == ports.end()) ? nullptr : found->second.net;
+    }
+    void connectPort(IdString port, NetInfo *net);
+    void disconnectPort(IdString port);
+    void connectPorts(IdString port, CellInfo *other, IdString other_port);
+    void movePortTo(IdString port, CellInfo *other, IdString other_port);
+    void renamePort(IdString old_name, IdString new_name);
+    void movePortBusTo(IdString old_name, int old_offset, bool old_brackets, CellInfo *new_cell, IdString new_name,
+                       int new_offset, bool new_brackets, int width);
+    void copyPortTo(IdString port, CellInfo *other, IdString other_port);
+    void copyPortBusTo(IdString old_name, int old_offset, bool old_brackets, CellInfo *new_cell, IdString new_name,
+                       int new_offset, bool new_brackets, int width);
 };
 
 enum TimingPortClass