use EQCombiner in PartitionedEq experiment

diff --git a/src/ieee754/part/partsig.py b/src/ieee754/part/partsig.py
index a4565c20ecbcc573ea20844a0aaa17de1e14c35a..7b2a7c5fe0880632d60e8f855fb510201ac04d1f 100644 (file)
--- a/src/ieee754/part/partsig.py
+++ b/src/ieee754/part/partsig.py
@@ -17,7 +17,7 @@ http://bugs.libre-riscv.org/show_bug.cgi?id=132
 """
 
 from ieee754.part_mul_add.adder import PartitionedAdder
-from ieee754.part_cmp.equal import PartitionedEq
+from ieee754.part_cmp.equal_ortree import PartitionedEq
 from ieee754.part_mul_add.partpoints import make_partition
 from operator import or_, xor, and_, not_
 

diff --git a/src/ieee754/part_cmp/equal_ortree.py b/src/ieee754/part_cmp/equal_ortree.py
index 24c88cf3c6b904dc657047373a81d771b6f11f3b..35730f634aa03a6e9c4e6c7542736c2a77b256e3 100644 (file)
--- a/src/ieee754/part_cmp/equal_ortree.py
+++ b/src/ieee754/part_cmp/equal_ortree.py
@@ -17,7 +17,7 @@ from nmigen import Signal, Module, Elaboratable, Cat, C, Mux, Repl
 from nmigen.cli import main
 
 from ieee754.part_mul_add.partpoints import PartitionPoints
-from ieee754.part_cmp.experiments.eq_combiner import Twomux
+from ieee754.part_cmp.experiments.eq_combiner import EQCombiner
 
 
 class PartitionedEq(Elaboratable):
@@ -37,6 +37,7 @@ class PartitionedEq(Elaboratable):
     def elaborate(self, platform):
         m = Module()
         comb = m.d.comb
+        m.submodules.eqc = eqc = EQCombiner(self.mwidth)
 
         # make a series of "not-eqs", splitting a and b into partition chunks
         nes = Signal(self.mwidth, reset_less=True)
@@ -49,22 +50,9 @@ class PartitionedEq(Elaboratable):
             start = end # for next time round loop
         comb += nes.eq(Cat(*nel))
 
-        # get the partition points (gates) as a signal
-
-        part_points = Signal(self.mwidth-1)
-        comb += part_points.eq(self.partition_points.as_sig())
-
-        prevresult = nes[-1]
-
-        for bit in range(self.mwidth-1, 0, -1): # counts down from mwidth-1 to 1
-            m.submodules["mux%d" % bit] = mux = Twomux()
-            comb += mux.ina.eq(prevresult)
-            comb += mux.inb.eq(0)
-            comb += mux.sel.eq(~part_points[bit-1])
-            comb += self.output[bit].eq(mux.outa ^ part_points[bit-1])
-            prevresult = mux.outb | nes[i-1]
-
-        comb += self.output[0].eq(~prevresult)
+        comb += eqc.gates.eq(self.partition_points.as_sig())
+        comb += eqc.neqs.eq(nes)
+        comb += self.output[0].eq(eqc.outputs)
         
 
         return m