diff options
| author | gatecat <gatecat@ds0.me> | 2021-06-03 09:04:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 09:04:34 +0100 |
| commit | a3d8b4f9d198226ec0903e34a8d290b376b45c0b (patch) | |
| tree | ada2c6a5d48e766fa523e633aaa28179baea3273 /nexus/arch.h | |
| parent | 589ca8ded5da2012e4388a3ec4c8fae74dff75e4 (diff) | |
| parent | dcbb322447a7fb59cabe197ec1dd2307acfa3681 (diff) | |
| download | nextpnr-a3d8b4f9d198226ec0903e34a8d290b376b45c0b.tar.gz nextpnr-a3d8b4f9d198226ec0903e34a8d290b376b45c0b.tar.bz2 nextpnr-a3d8b4f9d198226ec0903e34a8d290b376b45c0b.zip | |
Merge pull request #718 from YosysHQ/gatecat/hashlib
Moving from unordered_{map, set} to hashlib
Diffstat (limited to 'nexus/arch.h')
| -rw-r--r-- | nexus/arch.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nexus/arch.h b/nexus/arch.h index b3558413..a669be0d 100644 --- a/nexus/arch.h +++ b/nexus/arch.h @@ -916,7 +916,7 @@ struct Arch : BaseArch<ArchRanges> // fast access to X and Y IdStrings for building object names std::vector<IdString> x_ids, y_ids; // inverse of the above for name->object mapping - std::unordered_map<IdString, int> id_to_x, id_to_y; + dict<IdString, int> id_to_x, id_to_y; // ------------------------------------------------- @@ -1181,7 +1181,7 @@ struct Arch : BaseArch<ArchRanges> // for better DSP bounding boxes void pre_routing(); - std::unordered_set<WireId> dsp_wires, lram_wires; + pool<WireId> dsp_wires, lram_wires; // ------------------------------------------------- @@ -1271,9 +1271,9 @@ struct Arch : BaseArch<ArchRanges> // ------------------------------------------------- - typedef std::unordered_map<IdString, CellPinStyle> CellPinsData; + typedef dict<IdString, CellPinStyle> CellPinsData; - std::unordered_map<IdString, CellPinsData> cell_pins_db; + dict<IdString, CellPinsData> cell_pins_db; CellPinStyle get_cell_pin_style(const CellInfo *cell, IdString port) const; void init_cell_pin_data(); @@ -1361,7 +1361,7 @@ struct Arch : BaseArch<ArchRanges> // ------------------------------------------------- // Data about different IO standard, mostly used by bitgen - static const std::unordered_map<std::string, IOTypeData> io_types; + static const dict<std::string, IOTypeData> io_types; int get_io_type_vcc(const std::string &io_type) const; bool is_io_type_diff(const std::string &io_type) const; bool is_io_type_ref(const std::string &io_type) const; @@ -1388,7 +1388,7 @@ struct Arch : BaseArch<ArchRanges> // ------------------------------------------------- // List of IO constraints, used by PDC parser - std::unordered_map<IdString, std::unordered_map<IdString, Property>> io_attr; + dict<IdString, dict<IdString, Property>> io_attr; void read_pdc(std::istream &in); |