aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5
diff options
context:
space:
mode:
Diffstat (limited to 'ecp5')
-rw-r--r--ecp5/arch.cc6
-rw-r--r--ecp5/arch.h38
-rw-r--r--ecp5/archdefs.h12
3 files changed, 28 insertions, 28 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index b40b0002..fc618dac 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -124,9 +124,9 @@ Arch::Arch(ArchArgs args) : args(args)
for(IdString bel_type : bel_types) {
cell_types.push_back(bel_type);
- PartitionId partition;
- partition.name = bel_type;
- partitions.push_back(partition);
+ BelBucketId bucket;
+ bucket.name = bel_type;
+ buckets.push_back(bucket);
}
}
diff --git a/ecp5/arch.h b/ecp5/arch.h
index 921cbc29..e91def74 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -958,36 +958,36 @@ struct Arch : BaseCtx
return cell_types;
}
- std::vector<PartitionId> getPartitions() const {
- return partitions;
+ std::vector<BelBucketId> getBelBuckets() const {
+ return buckets;
}
- IdString getPartitionName(PartitionId partition) const {
- return partition.name;
+ IdString getBelBucketName(BelBucketId bucket) const {
+ return bucket.name;
}
- PartitionId getPartitionByName(IdString name) const {
- PartitionId partition;
- partition.name = name;
- return partition;
+ BelBucketId getBelBucketByName(IdString name) const {
+ BelBucketId bucket;
+ bucket.name = name;
+ return bucket;
}
- PartitionId getPartitionForBel(BelId bel) const {
- PartitionId partition;
- partition.name = getBelType(bel);
- return partition;
+ BelBucketId getBelBucketForBel(BelId bel) const {
+ BelBucketId bucket;
+ bucket.name = getBelType(bel);
+ return bucket;
}
- PartitionId getPartitionForCellType(IdString cell_type) const {
- PartitionId partition;
- partition.name = cell_type;
- return partition;
+ BelBucketId getBelBucketForCellType(IdString cell_type) const {
+ BelBucketId bucket;
+ bucket.name = cell_type;
+ return bucket;
}
- std::vector<BelId> getBelsForPartition(PartitionId partition) const {
+ std::vector<BelId> getBelsInBucket(BelBucketId bucket) const {
std::vector<BelId> bels;
for(BelId bel : getBels()) {
- if(getBelType(bel) == partition.name) {
+ if(getBelType(bel) == bucket.name) {
bels.push_back(bel);
}
}
@@ -1068,7 +1068,7 @@ struct Arch : BaseCtx
static const std::vector<std::string> availableRouters;
std::vector<IdString> cell_types;
- std::vector<PartitionId> partitions;
+ std::vector<BelBucketId> buckets;
};
NEXTPNR_NAMESPACE_END
diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h
index 5bfe13d2..f766dee2 100644
--- a/ecp5/archdefs.h
+++ b/ecp5/archdefs.h
@@ -126,12 +126,12 @@ struct PipId
}
};
-struct PartitionId {
+struct BelBucketId {
IdString name;
- bool operator==(const PartitionId &other) const { return (name == other.name); }
- bool operator!=(const PartitionId &other) const { return (name != other.name); }
- bool operator<(const PartitionId &other) const
+ bool operator==(const BelBucketId &other) const { return (name == other.name); }
+ bool operator!=(const BelBucketId &other) const { return (name != other.name); }
+ bool operator<(const BelBucketId &other) const
{
return name < other.name;
}
@@ -273,9 +273,9 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId>
}
};
-template <> struct hash<NEXTPNR_NAMESPACE_PREFIX PartitionId>
+template <> struct hash<NEXTPNR_NAMESPACE_PREFIX BelBucketId>
{
- std::size_t operator()(const NEXTPNR_NAMESPACE_PREFIX PartitionId &partition) const noexcept
+ std::size_t operator()(const NEXTPNR_NAMESPACE_PREFIX BelBucketId &partition) const noexcept
{
std::size_t seed = 0;
boost::hash_combine(seed, hash<NEXTPNR_NAMESPACE_PREFIX IdString>()(partition.name));