1 files changed, 7 insertions, 0 deletions
diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h
index 2b4590e5..57168af3 100644
--- a/ecp5/archdefs.h
+++ b/ecp5/archdefs.h
@@ -24,6 +24,7 @@
 #include <boost/functional/hash.hpp>
 
 #include "base_clusterinfo.h"
+#include "hashlib.h"
 #include "idstring.h"
 #include "nextpnr_namespaces.h"
 
@@ -63,6 +64,7 @@ struct Location
     bool operator==(const Location &other) const { return x == other.x && y == other.y; }
     bool operator!=(const Location &other) const { return x != other.x || y != other.y; }
     bool operator<(const Location &other) const { return y == other.y ? x < other.x : y < other.y; }
+    unsigned int hash() const { return mkhash(x, y); }
 };
 
 inline Location operator+(const Location &a, const Location &b) { return Location(a.x + b.x, a.y + b.y); }
@@ -78,6 +80,7 @@ struct BelId
     {
         return location == other.location ? index < other.index : location < other.location;
     }
+    unsigned int hash() const { return mkhash(location.hash(), index); }
 };
 
 struct WireId
@@ -91,6 +94,7 @@ struct WireId
     {
         return location == other.location ? index < other.index : location < other.location;
     }
+    unsigned int hash() const { return mkhash(location.hash(), index); }
 };
 
 struct PipId
@@ -104,6 +108,7 @@ struct PipId
     {
         return location == other.location ? index < other.index : location < other.location;
     }
+    unsigned int hash() const { return mkhash(location.hash(), index); }
 };
 
 typedef IdString BelBucketId;
@@ -119,6 +124,7 @@ struct GroupId
 
     bool operator==(const GroupId &other) const { return (type == other.type) && (location == other.location); }
     bool operator!=(const GroupId &other) const { return (type != other.type) || (location != other.location); }
+    unsigned int hash() const { return mkhash(location.hash(), int(type)); }
 };
 
 struct DecalId
@@ -142,6 +148,7 @@ struct DecalId
     {
         return type != other.type || location != other.location || z != other.z || active != other.active;
     }
+    unsigned int hash() const { return mkhash(location.hash(), mkhash(z, int(type))); }
 };
 
 struct ArchNetInfo