Reduce hashops verbiage in OptMergePass

Author: rocallahan

kernel/hashlib.h

@@ -114,7 +114,7 @@ class HasherDJB32 {
 		return;
 	}
 	[[nodiscard]]
-	hash_t yield() {
+	hash_t yield() const {
 		return (hash_t)state;
 	}
 
@@ -373,11 +373,20 @@ class commutative_hash {
 	commutative_hash() {
 		buckets.fill(0);
 	}
-	void eat(Hasher h) {
+	template <typename T>
+	void eat(const T &obj) {
+		eat(hash_ops<T>::hash(obj));
+	}
+	template <>
+	void eat(const Hasher &h) {
 		Hasher::hash_t v = h.yield();
 		size_t index = v & (buckets.size() - 1);
 		buckets[index] += v;
 	}
+	template <typename T, typename U>
+	void eat_pair(const T &v, const U &u) {
+		eat(hash_ops<std::pair<T, U>>::hash(v, u));
+	}
 	[[nodiscard]] Hasher hash_into(Hasher h) const {
 		for (auto b : buckets)
 			h.eat(b);

passes/opt/opt_merge.cc

@@ -51,7 +51,7 @@ struct OptMergeWorker
 
 		hashlib::commutative_hash comm;
 		for (int i = 0; i < s_width; i++)
-			comm.eat(hash_ops<std::pair<SigBit, SigSpec>>::hash({sig_s[i], sig_b.extract(i*width, width)}));
+			comm.eat_pair(sig_s[i], sig_b.extract(i*width, width));
 
 		return comm.hash_into(h);
 	}
@@ -86,8 +86,8 @@ struct OptMergeWorker
 		if (cell->type.in(ID($and), ID($or), ID($xor), ID($xnor), ID($add), ID($mul),
 				ID($logic_and), ID($logic_or), ID($_AND_), ID($_OR_), ID($_XOR_))) {
 			hashlib::commutative_hash comm;
-			comm.eat(hash_ops<RTLIL::SigSpec>::hash(assign_map(cell->getPort(ID::A))));
-			comm.eat(hash_ops<RTLIL::SigSpec>::hash(assign_map(cell->getPort(ID::B))));
+			comm.eat(assign_map(cell->getPort(ID::A)));
+			comm.eat(assign_map(cell->getPort(ID::B)));
 			h = comm.hash_into(h);
 		} else if (cell->type.in(ID($reduce_xor), ID($reduce_xnor))) {
 			SigSpec a = assign_map(cell->getPort(ID::A));
@@ -107,7 +107,7 @@ struct OptMergeWorker
 			for (const auto& [port, sig] : cell->connections()) {
 				if (cell->output(port))
 					continue;
-				comm.eat(hash_ops<std::pair<IdString, SigSpec>>::hash(port, assign_map(sig)));
+				comm.eat_pair(port, assign_map(sig));
 			}
 			h = comm.hash_into(h);
 			if (RTLIL::builtin_ff_cell_types().count(cell->type))
@@ -120,7 +120,7 @@ struct OptMergeWorker
 	{
 		hashlib::commutative_hash comm;
 		for (const auto& param : cell->parameters) {
-			comm.eat(hash_ops<std::pair<IdString, Const>>::hash(param));
+			comm.eat(param);
 		}
 		return comm.hash_into(h);
 	}