diff options
| author | gatecat <gatecat@ds0.me> | 2021-02-09 11:30:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 11:30:23 +0000 |
| commit | f67d474edc3f95e830ec23156a90327ae446ce6f (patch) | |
| tree | 7df5d4022a40969adcbbbc8fc7fdd841e09db2cc /ecp5 | |
| parent | 1febb80a1e519719762aa471d34c3f9acbbe1751 (diff) | |
| parent | 11db5a2f1df589ea8c5ba3c0b1cbbfaac77e3580 (diff) | |
| download | nextpnr-f67d474edc3f95e830ec23156a90327ae446ce6f.tar.gz nextpnr-f67d474edc3f95e830ec23156a90327ae446ce6f.tar.bz2 nextpnr-f67d474edc3f95e830ec23156a90327ae446ce6f.zip | |
Merge pull request #573 from YosysHQ/gatecat/basearchranges
Add BaseArchRanges for default ArchRanges types
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/arch.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h index 49582a6e..de8b225e 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -435,35 +435,20 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DelayKey> } // namespace std NEXTPNR_NAMESPACE_BEGIN -struct ArchRanges +struct ArchRanges : BaseArchRanges { using ArchArgsT = ArchArgs; // Bels using AllBelsRangeT = BelRange; using TileBelsRangeT = BelRange; - using BelAttrsRangeT = std::vector<std::pair<IdString, std::string>>; using BelPinsRangeT = std::vector<IdString>; // Wires using AllWiresRangeT = WireRange; using DownhillPipRangeT = PipRange; using UphillPipRangeT = PipRange; using WireBelPinRangeT = BelPinRange; - using WireAttrsRangeT = std::vector<std::pair<IdString, std::string>>; // Pips using AllPipsRangeT = AllPipRange; - using PipAttrsRangeT = std::vector<std::pair<IdString, std::string>>; - // Groups - using AllGroupsRangeT = std::vector<GroupId>; - using GroupBelsRangeT = std::vector<BelId>; - using GroupWiresRangeT = std::vector<WireId>; - using GroupPipsRangeT = std::vector<PipId>; - using GroupGroupsRangeT = std::vector<GroupId>; - // Decals - using DecalGfxRangeT = std::vector<GraphicElement>; - // Placement validity - using CellTypeRangeT = const std::vector<IdString> &; - using BelBucketRangeT = const std::vector<BelBucketId> &; - using BucketBelRangeT = const std::vector<BelId> &; }; struct Arch : BaseArch<ArchRanges> |