aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5
diff options
context:
space:
mode:
authorgatecat <gatecat@ds0.me>2022-08-10 10:57:17 +0100
committergatecat <gatecat@ds0.me>2022-08-10 10:57:46 +0100
commit77c82b0fbf15892b0c8222bac89564f3f024493e (patch)
tree8b189e44b65afabfaddb3402ab8aac544df9ba83 /ecp5
parent06ce27ed38279cfa3455e248ea2b2c773cdf6324 (diff)
downloadnextpnr-77c82b0fbf15892b0c8222bac89564f3f024493e.tar.gz
nextpnr-77c82b0fbf15892b0c8222bac89564f3f024493e.tar.bz2
nextpnr-77c82b0fbf15892b0c8222bac89564f3f024493e.zip
refactor: id(stringf(...)) to new idf(...) helper
Signed-off-by: gatecat <gatecat@ds0.me>
Diffstat (limited to 'ecp5')
-rw-r--r--ecp5/arch.cc8
-rw-r--r--ecp5/pack.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index d98ee54c..0b763612 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -121,17 +121,17 @@ Arch::Arch(ArchArgs args) : args(args)
BaseArch::init_bel_buckets();
for (int i = 0; i < chip_info->width; i++)
- x_ids.push_back(id(stringf("X%d", i)));
+ x_ids.push_back(idf("X%d", i));
for (int i = 0; i < chip_info->height; i++)
- y_ids.push_back(id(stringf("Y%d", i)));
+ y_ids.push_back(idf("Y%d", i));
for (int i = 0; i < chip_info->width; i++) {
- IdString x_id = id(stringf("X%d", i));
+ IdString x_id = idf("X%d", i);
x_ids.push_back(x_id);
id_to_x[x_id] = i;
}
for (int i = 0; i < chip_info->height; i++) {
- IdString y_id = id(stringf("Y%d", i));
+ IdString y_id = idf("Y%d", i);
y_ids.push_back(y_id);
id_to_y[y_id] = i;
}
diff --git a/ecp5/pack.cc b/ecp5/pack.cc
index 7aa9b4c4..4cd33dee 100644
--- a/ecp5/pack.cc
+++ b/ecp5/pack.cc
@@ -801,7 +801,7 @@ class Ecp5Packer
ci->disconnectPort(id_WRE);
for (int i = 0; i < 4; i++)
- ci->disconnectPort(ctx->id(stringf("RAD[%d]", i)));
+ ci->disconnectPort(ctx->idf("RAD[%d]", i));
// Setup placement constraints
// Use the 0th bit as an anchor