yowasp-yosys 0.48.0.0.post834__py3-none-any.whl → 0.50.0.0.post858__py3-none-any.whl

yowasp_yosys/share/include/frontends/ast/ast.h

@@ -177,7 +177,7 @@ namespace AST
 	{
 		// for dict<> and pool<>
 		unsigned int hashidx_;
-		unsigned int hash() const { return hashidx_; }
+		[[nodiscard]] Hasher hash_into(Hasher h) const { h.eat(hashidx_); return h; }
 
 		// this nodes type
 		AstNodeType type;

yowasp_yosys/share/include/kernel/bitpattern.h

@@ -30,7 +30,7 @@ struct BitPatternPool
 	int width;
 	struct bits_t {
 		std::vector<RTLIL::State> bitdata;
-		mutable unsigned int cached_hash;
+		mutable Hasher::hash_t cached_hash;
 		bits_t(int width = 0) : bitdata(width), cached_hash(0) { }
 		RTLIL::State &operator[](int index) {
 			return bitdata[index];
@@ -39,14 +39,15 @@ struct BitPatternPool
 			return bitdata[index];
 		}
 		bool operator==(const bits_t &other) const {
-			if (hash() != other.hash())
+			if (run_hash(*this) != run_hash(other))
 				return false;
 			return bitdata == other.bitdata;
 		}
-		unsigned int hash() const {
+		[[nodiscard]] Hasher hash_into(Hasher h) const {
 			if (!cached_hash)
-				cached_hash = hash_ops<std::vector<RTLIL::State>>::hash(bitdata);
-			return cached_hash;
+				cached_hash = run_hash(bitdata);
+			h.eat(cached_hash);
+			return h;
 		}
 	};
 	pool<bits_t> database;

yowasp_yosys/share/include/kernel/cellaigs.h

@@ -34,7 +34,7 @@ struct AigNode
 
 	AigNode();
 	bool operator==(const AigNode &other) const;
-	unsigned int hash() const;
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 };
 
 struct Aig
@@ -44,7 +44,7 @@ struct Aig
 	Aig(Cell *cell);
 
 	bool operator==(const Aig &other) const;
-	unsigned int hash() const;
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 };
 
 YOSYS_NAMESPACE_END

yowasp_yosys/share/include/kernel/consteval.h

@@ -315,9 +315,6 @@ struct ConstEval
 			Macc macc;
 			macc.from_cell(cell);
 
-			if (!eval(macc.bit_ports, undef, cell))
-				return false;
-
 			for (auto &port : macc.ports) {
 				if (!eval(port.in_a, undef, cell))
 					return false;

yowasp_yosys/share/include/kernel/drivertools.h

@@ -74,10 +74,8 @@ struct DriveBitWire
 		return offset < other.offset;
 	}
 
-	unsigned int hash() const
-	{
-		return mkhash_add(wire->name.hash(), offset);
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
+
 
 	operator SigBit() const
 	{
@@ -107,10 +105,8 @@ struct DriveBitPort
 		return offset < other.offset;
 	}
 
-	unsigned int hash() const
-	{
-		return mkhash_add(mkhash(cell->name.hash(), port.hash()), offset);
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
+
 };
 
 
@@ -133,10 +129,7 @@ struct DriveBitMarker
 		return offset < other.offset;
 	}
 
-	unsigned int hash() const
-	{
-		return mkhash_add(marker, offset);
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 
 };
 
@@ -171,10 +164,7 @@ public:
 		return multiple_ == other.multiple_;
 	}
 
-	unsigned int hash() const
-	{
-	   return multiple_.hash();
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 };
 
 struct DriveBit
@@ -362,35 +352,7 @@ public:
 		return *this;
 	}
 
-	unsigned int hash() const
-	{
-		unsigned int inner = 0;
-		switch (type_)
-		{
-			case DriveType::NONE:
-				inner = 0;
-				break;
-			case DriveType::CONSTANT:
-				inner = constant_;
-				break;
-			case DriveType::WIRE:
-				inner = wire_.hash();
-				break;
-			case DriveType::PORT:
-				inner = port_.hash();
-				break;
-			case DriveType::MARKER:
-				inner = marker_.hash();
-				break;
-			case DriveType::MULTIPLE:
-				inner = multiple_.hash();
-				break;
-			default:
-				log_abort();
-				break;
-		}
-		return mkhash((unsigned int)type_, inner);
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 
 	bool operator==(const DriveBit &other) const
 	{
@@ -511,10 +473,7 @@ struct DriveChunkWire
 		return offset < other.offset;
 	}
 
-	unsigned int hash() const
-	{
-		return mkhash_add(mkhash(wire->name.hash(), width), offset);
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 
 	explicit operator SigChunk() const
 	{
@@ -572,10 +531,7 @@ struct DriveChunkPort
 		return offset < other.offset;
 	}
 
-	unsigned int hash() const
-	{
-		return mkhash_add(mkhash(mkhash(cell->name.hash(), port.hash()), width), offset);
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 };
 
 
@@ -616,10 +572,7 @@ struct DriveChunkMarker
 		return offset < other.offset;
 	}
 
-	unsigned int hash() const
-	{
-		return mkhash_add(mkhash(marker, width), offset);
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 };
 
 struct DriveChunkMultiple
@@ -659,10 +612,7 @@ public:
 		return false; // TODO implement, canonicalize order
 	}
 
-	unsigned int hash() const
-	{
-	   return mkhash(width_, multiple_.hash());
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 };
 
 struct DriveChunk
@@ -913,35 +863,7 @@ public:
 	bool try_append(DriveBit const &bit);
 	bool try_append(DriveChunk const &chunk);
 
-	unsigned int hash() const
-	{
-		unsigned int inner = 0;
-		switch (type_)
-		{
-			case DriveType::NONE:
-				inner = 0;
-				break;
-			case DriveType::CONSTANT:
-				inner = constant_.hash();
-				break;
-			case DriveType::WIRE:
-				inner = wire_.hash();
-				break;
-			case DriveType::PORT:
-				inner = port_.hash();
-				break;
-			case DriveType::MARKER:
-				inner = marker_.hash();
-				break;
-			case DriveType::MULTIPLE:
-				inner = multiple_.hash();
-				break;
-			default:
-				log_abort();
-				break;
-		}
-		return mkhash((unsigned int)type_, inner);
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 
 	bool operator==(const DriveChunk &other) const
 	{
@@ -1144,17 +1066,20 @@ public:
 	DriveSpec &operator=(DriveBitMarker const &bit) { return *this = DriveBit(bit); }
 	DriveSpec &operator=(DriveBitMultiple const &bit) { return *this = DriveBit(bit); }
 
-	unsigned int hash() const {
-		if (hash_ != 0) return hash_;
-
+	void updhash() const {
+		if (hash_ != 0)
+			return;
 		pack();
-		hash_ = hash_ops<std::vector<DriveChunk>>().hash(chunks_);
+		hash_ = run_hash(chunks_);
 		hash_ |= (hash_ == 0);
-		return hash_;
 	}
 
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
+
 	bool operator==(DriveSpec const &other) const {
-		if (size() != other.size() || hash() != other.hash())
+		updhash();
+		other.updhash();
+		if (size() != other.size() || hash_ != other.hash_)
 			return false;
 		return chunks() == other.chunks();
 	}
@@ -1187,7 +1112,7 @@ private:
 		bool operator==(const DriveBitId &other) const { return id == other.id; }
 		bool operator!=(const DriveBitId &other) const { return id != other.id; }
 		bool operator<(const DriveBitId &other) const { return id < other.id; }
-		unsigned int hash() const { return id; }
+		[[nodiscard]] Hasher hash_into(Hasher h) const;
 	};
 	// Essentially a dict<DriveBitId, pool<DriveBitId>> but using less memory
 	// and fewer allocations
@@ -1333,6 +1258,131 @@ private:
 	}
 };
 
+inline Hasher DriveBitWire::hash_into(Hasher h) const
+{
+	h.eat(wire->name);
+	h.eat(offset);
+	return h;
+}
+
+inline Hasher DriveBitPort::hash_into(Hasher h) const
+{
+	h.eat(cell->name);
+	h.eat(port);
+	h.eat(offset);
+	return h;
+}
+
+inline Hasher DriveBitMarker::hash_into(Hasher h) const
+{
+	h.eat(marker);
+	h.eat(offset);
+	return h;
+}
+
+inline Hasher DriveBitMultiple::hash_into(Hasher h) const
+{
+	h.eat(multiple_);
+	return h;
+}
+
+inline Hasher DriveBit::hash_into(Hasher h) const
+{
+	switch (type_) {
+	case DriveType::NONE:
+		h.eat(0);
+		break;
+	case DriveType::CONSTANT:
+		h.eat(constant_);
+		break;
+	case DriveType::WIRE:
+		h.eat(wire_);
+		break;
+	case DriveType::PORT:
+		h.eat(port_);
+		break;
+	case DriveType::MARKER:
+		h.eat(marker_);
+		break;
+	case DriveType::MULTIPLE:
+		h.eat(multiple_);
+		break;
+	}
+	h.eat(type_);
+	return h;
+}
+
+inline Hasher DriveChunkWire::hash_into(Hasher h) const
+{
+	h.eat(wire->name);
+	h.eat(width);
+	h.eat(offset);
+	return h;
+}
+
+inline Hasher DriveChunkPort::hash_into(Hasher h) const
+{
+	h.eat(cell->name);
+	h.eat(port);
+	h.eat(width);
+	h.eat(offset);
+	return h;
+}
+
+inline Hasher DriveChunkMarker::hash_into(Hasher h) const
+{
+	h.eat(marker);
+	h.eat(width);
+	h.eat(offset);
+	return h;
+}
+
+inline Hasher DriveChunkMultiple::hash_into(Hasher h) const
+{
+	h.eat(width_);
+	h.eat(multiple_);
+	return h;
+}
+
+inline Hasher DriveChunk::hash_into(Hasher h) const
+{
+	switch (type_) {
+	case DriveType::NONE:
+		h.eat(0);
+		break;
+	case DriveType::CONSTANT:
+		h.eat(constant_);
+		break;
+	case DriveType::WIRE:
+		h.eat(wire_);
+		break;
+	case DriveType::PORT:
+		h.eat(port_);
+		break;
+	case DriveType::MARKER:
+		h.eat(marker_);
+		break;
+	case DriveType::MULTIPLE:
+		h.eat(multiple_);
+		break;
+	}
+	h.eat(type_);
+	return h;
+}
+
+inline Hasher DriveSpec::hash_into(Hasher h) const
+{
+	updhash();
+	h.eat(hash_);
+	return h;
+}
+
+inline Hasher DriverMap::DriveBitId::hash_into(Hasher h) const
+{
+	h.eat(id);
+	return h;
+}
+
 YOSYS_NAMESPACE_END
 
 #endif