Getting rid of users of old IdString API

Signed-off-by: Clifford Wolf <clifford@clifford.at>

6 files changed, 50 insertions, 48 deletions

diff --git a/common/design_utils.cc b/common/design_utils.cc
index f2ce2285..b0c87484 100644
--- a/common/design_utils.cc
+++ b/common/design_utils.cc
@@ -58,7 +58,7 @@ void print_utilisation(const Context *ctx)
     // Sort by Bel type
     std::map<BelType, int> used_types;
     for (auto cell : ctx->cells) {
-        used_types[belTypeFromId(cell.second->type)]++;
+        used_types[ctx->belTypeFromId(cell.second->type)]++;
     }
     std::map<BelType, int> available_types;
     for (auto bel : ctx->getBels()) {
@@ -66,7 +66,7 @@ void print_utilisation(const Context *ctx)
     }
     log("\nDesign utilisation:\n");
     for (auto type : available_types) {
-        log("\t%20s: %5d/%5d\n", belTypeToId(type.first).c_str(),
+        log("\t%20s: %5d/%5d\n", ctx->belTypeToId(type.first).c_str(),
             get_or_default(used_types, type.first, 0), type.second);
     }
 }
diff --git a/common/place_sa.cc b/common/place_sa.cc
index 19588d27..e49cff7a 100644
--- a/common/place_sa.cc
+++ b/common/place_sa.cc
@@ -84,7 +84,7 @@ static void place_initial(Context *ctx, CellInfo *cell, rnd_state &rnd)
             ctx->unbindBel(cell->bel);
             cell->bel = BelId();
         }
-        BelType targetType = belTypeFromId(cell->type);
+        BelType targetType = ctx->belTypeFromId(cell->type);
         for (auto bel : ctx->getBels()) {
             if (ctx->getBelType(bel) == targetType &&
                 isValidBelForCell(ctx, cell, bel)) {
@@ -140,7 +140,7 @@ struct SAState
 };
 
 // Get the total estimated wirelength for a net
-static float get_wirelength(Arch *chip, NetInfo *net)
+static float get_wirelength(Context *ctx, NetInfo *net)
 {
     float wirelength = 0;
     int driver_x = 0, driver_y = 0;
@@ -151,9 +151,9 @@ static float get_wirelength(Arch *chip, NetInfo *net)
     if (driver_cell->bel == BelId())
         return 0;
     consider_driver =
-            chip->estimatePosition(driver_cell->bel, driver_x, driver_y);
-    WireId drv_wire = chip->getWireBelPin(driver_cell->bel,
-                                          portPinFromId(net->driver.port));
+            ctx->estimatePosition(driver_cell->bel, driver_x, driver_y);
+    WireId drv_wire = ctx->getWireBelPin(driver_cell->bel,
+                                         ctx->portPinFromId(net->driver.port));
     if (!consider_driver)
         return 0;
     for (auto load : net->users) {
@@ -162,12 +162,12 @@ static float get_wirelength(Arch *chip, NetInfo *net)
         CellInfo *load_cell = load.cell;
         if (load_cell->bel == BelId())
             continue;
-        // chip->estimatePosition(load_cell->bel, load_x, load_y);
-        WireId user_wire =
-                chip->getWireBelPin(load_cell->bel, portPinFromId(load.port));
+        // ctx->estimatePosition(load_cell->bel, load_x, load_y);
+        WireId user_wire = ctx->getWireBelPin(load_cell->bel,
+                                              ctx->portPinFromId(load.port));
         // wirelength += std::abs(load_x - driver_x) + std::abs(load_y -
         // driver_y);
-        wirelength += chip->estimateDelay(drv_wire, user_wire);
+        wirelength += ctx->estimateDelay(drv_wire, user_wire);
     }
     return wirelength;
 }
@@ -262,7 +262,7 @@ swap_fail:
 BelId random_bel_for_cell(Context *ctx, CellInfo *cell, SAState &state,
                           rnd_state &rnd)
 {
-    BelType targetType = belTypeFromId(cell->type);
+    BelType targetType = ctx->belTypeFromId(cell->type);
     int x = 0, y = 0;
     ctx->estimatePosition(cell->bel, x, y);
     while (true) {
@@ -305,10 +305,10 @@ void place_design_sa(Context *ctx, int seed)
             }
 
             BelType bel_type = ctx->getBelType(bel);
-            if (bel_type != belTypeFromId(cell->type)) {
+            if (bel_type != ctx->belTypeFromId(cell->type)) {
                 log_error("Bel \'%s\' of type \'%s\' does not match cell "
                           "\'%s\' of type \'%s\'",
-                          loc_name.c_str(), belTypeToId(bel_type).c_str(),
+                          loc_name.c_str(), ctx->belTypeToId(bel_type).c_str(),
                           cell->name.c_str(), cell->type.c_str());
             }
 
diff --git a/common/route.cc b/common/route.cc
index e1b60f84..cc7684b5 100644
--- a/common/route.cc
+++ b/common/route.cc
@@ -93,7 +93,8 @@ struct Router
         if (driver_port_it != net_info->driver.cell->pins.end())
             driver_port = driver_port_it->second;
 
-        auto src_wire = ctx->getWireBelPin(src_bel, portPinFromId(driver_port));
+        auto src_wire =
+                ctx->getWireBelPin(src_bel, ctx->portPinFromId(driver_port));
 
         if (src_wire == WireId())
             log_error("No wire found for port %s (pin %s) on source cell %s "
@@ -134,7 +135,7 @@ struct Router
                 user_port = user_port_it->second;
 
             auto dst_wire =
-                    ctx->getWireBelPin(dst_bel, portPinFromId(user_port));
+                    ctx->getWireBelPin(dst_bel, ctx->portPinFromId(user_port));
 
             if (dst_wire == WireId())
                 log_error("No wire found for port %s (pin %s) on destination "
@@ -335,7 +336,8 @@ bool route_design(Context *ctx, bool verbose)
         if (driver_port_it != net_info->driver.cell->pins.end())
             driver_port = driver_port_it->second;
 
-        auto src_wire = ctx->getWireBelPin(src_bel, portPinFromId(driver_port));
+        auto src_wire =
+                ctx->getWireBelPin(src_bel, ctx->portPinFromId(driver_port));
 
         if (src_wire == WireId())
             continue;
@@ -354,7 +356,7 @@ bool route_design(Context *ctx, bool verbose)
                 user_port = user_port_it->second;
 
             auto dst_wire =
-                    ctx->getWireBelPin(dst_bel, portPinFromId(user_port));
+                    ctx->getWireBelPin(dst_bel, ctx->portPinFromId(user_port));
 
             if (dst_wire == WireId())
                 continue;
diff --git a/dummy/arch.h b/dummy/arch.h
index 9bd09f9d..865536dc 100644
--- a/dummy/arch.h
+++ b/dummy/arch.h
@@ -47,12 +47,6 @@ struct DelayInfo
 typedef IdString BelType;
 typedef IdString PortPin;
 
-static inline IdString belTypeToId(BelType type) { return type; }
-static inline IdString portPinToId(PortPin type) { return type; }
-
-static inline BelType belTypeFromId(IdString id) { return id; }
-static inline PortPin portPinFromId(IdString id) { return id; }
-
 typedef IdString BelId;
 typedef IdString WireId;
 typedef IdString PipId;
@@ -76,6 +70,12 @@ struct Arch
     virtual IdString id(const std::string &s) const { abort(); }
     virtual IdString id(const char *s) const { abort(); }
 
+    IdString belTypeToId(BelType type) const { return type; }
+    IdString portPinToId(PortPin type) const { return type; }
+
+    BelType belTypeFromId(IdString id) const { return id; }
+    PortPin portPinFromId(IdString id) const { return id; }
+
     BelId getBelByName(IdString name) const;
     IdString getBelName(BelId bel) const;
     void bindBel(BelId bel, IdString cell);
diff --git a/ice40/arch.cc b/ice40/arch.cc
index 197ce746..83a6e542 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -26,28 +26,28 @@ NEXTPNR_NAMESPACE_BEGIN
 
 // -----------------------------------------------------------------------
 
-IdString belTypeToId(BelType type)
+IdString Arch::belTypeToId(BelType type) const
 {
     if (type == TYPE_ICESTORM_LC)
-        return "ICESTORM_LC";
+        return id("ICESTORM_LC");
     if (type == TYPE_ICESTORM_RAM)
-        return "ICESTORM_RAM";
+        return id("ICESTORM_RAM");
     if (type == TYPE_SB_IO)
-        return "SB_IO";
+        return id("SB_IO");
     if (type == TYPE_SB_GB)
-        return "SB_GB";
+        return id("SB_GB");
     return IdString();
 }
 
-BelType belTypeFromId(IdString id)
+BelType Arch::belTypeFromId(IdString type) const
 {
-    if (id == "ICESTORM_LC")
+    if (type == id("ICESTORM_LC"))
         return TYPE_ICESTORM_LC;
-    if (id == "ICESTORM_RAM")
+    if (type == id("ICESTORM_RAM"))
         return TYPE_ICESTORM_RAM;
-    if (id == "SB_IO")
+    if (type == id("SB_IO"))
         return TYPE_SB_IO;
-    if (id == "SB_GB")
+    if (type == id("SB_GB"))
         return TYPE_SB_GB;
     return TYPE_NONE;
 }
@@ -61,7 +61,7 @@ void IdString::initialize_arch(const Context *ctx)
 #undef X
 }
 
-IdString portPinToId(PortPin type)
+IdString Arch::portPinToId(PortPin type) const
 {
     IdString ret;
     if (type > 0 && type < PIN_MAXIDX)
@@ -69,10 +69,10 @@ IdString portPinToId(PortPin type)
     return ret;
 }
 
-PortPin portPinFromId(IdString id)
+PortPin Arch::portPinFromId(IdString type) const
 {
-    if (id.index > 0 && id.index < PIN_MAXIDX)
-        return PortPin(id.index);
+    if (type.index > 0 && type.index < PIN_MAXIDX)
+        return PortPin(type.index);
     return PIN_NONE;
 }
 
@@ -163,7 +163,7 @@ BelId Arch::getBelByName(IdString name) const
 
     if (bel_by_name.empty()) {
         for (int i = 0; i < chip_info->num_bels; i++)
-            bel_by_name[chip_info->bel_data[i].name.get()] = i;
+            bel_by_name[id(chip_info->bel_data[i].name.get())] = i;
     }
 
     auto it = bel_by_name.find(name);
@@ -220,7 +220,7 @@ WireId Arch::getWireByName(IdString name) const
 
     if (wire_by_name.empty()) {
         for (int i = 0; i < chip_info->num_wires; i++)
-            wire_by_name[chip_info->wire_data[i].name.get()] = i;
+            wire_by_name[id(chip_info->wire_data[i].name.get())] = i;
     }
 
     auto it = wire_by_name.find(name);
@@ -266,8 +266,8 @@ IdString Arch::getPipName(PipId pip) const
             chip_info->wire_data[chip_info->pip_data[pip.index].dst].name.get();
     std::replace(dst_name.begin(), dst_name.end(), '/', '.');
 
-    return "X" + std::to_string(x) + "/Y" + std::to_string(y) + "/" + src_name +
-           ".->." + dst_name;
+    return id("X" + std::to_string(x) + "/Y" + std::to_string(y) + "/" +
+              src_name + ".->." + dst_name);
 }
 
 // -----------------------------------------------------------------------
diff --git a/ice40/arch.h b/ice40/arch.h
index b49451b9..2702e70e 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -55,9 +55,6 @@ enum BelType : int32_t
     TYPE_SB_GB
 };
 
-IdString belTypeToId(BelType type);
-BelType belTypeFromId(IdString id);
-
 enum PortPin : int32_t
 {
     PIN_NONE,
@@ -67,9 +64,6 @@ enum PortPin : int32_t
     PIN_MAXIDX
 };
 
-IdString portPinToId(PortPin type);
-PortPin portPinFromId(IdString id);
-
 // -----------------------------------------------------------------------
 
 /**** Everything in this section must be kept in sync with chipdb.py ****/
@@ -480,6 +474,12 @@ struct Arch
     virtual IdString id(const std::string &s) const { abort(); }
     virtual IdString id(const char *s) const { abort(); }
 
+    IdString belTypeToId(BelType type) const;
+    BelType belTypeFromId(IdString id) const;
+
+    IdString portPinToId(PortPin type) const;
+    PortPin portPinFromId(IdString id) const;
+
     // -------------------------------------------------
 
     BelId getBelByName(IdString name) const;