experimenting with dual add

diff --git a/src/add/dual_add_experiment.py b/src/add/dual_add_experiment.py
index a70c93356bdf946b426a6acb8a6ddba1e001c69f..815192c4f37ae601df346bb5f2abcdd008077dfd 100644 (file)
--- a/src/add/dual_add_experiment.py
+++ b/src/add/dual_add_experiment.py
@@ -36,6 +36,7 @@ class ALU:
         self.b   = FPOp(width)
         self.c   = FPOp(width)
         self.z   = FPOp(width)
+        self.int_stb = Signal()
 
         self.add1 = FPADD(width)
         self.add2 = FPADD(width)
@@ -54,6 +55,8 @@ class ALU:
         m.d.comb += self.add2.in_b.chain_from(self.add1.out_z)
         # join output from add2 to z: z = add2.out_z
         m.d.comb += self.z.chain_from(self.add2.out_z)
+        # get at add1's stb signal
+        m.d.comb += self.int_stb.eq(self.add1.out_z.stb)
         #with m.If(self.op):
         #    m.d.comb += self.o.eq(self.sub.o)
         #with m.Else():

diff --git a/src/add/fpbase.py b/src/add/fpbase.py
index 6a1357056f44d40387b3b9c34cf5b15d173f1272..5bf8e8c46573806ad32201d5d5d5f42c756e3652 100644 (file)
--- a/src/add/fpbase.py
+++ b/src/add/fpbase.py
@@ -339,12 +339,15 @@ class FPOp:
         self.width = width
 
         self.v   = Signal(width)
-        self.stb = Signal()
+        self.stb = Signal(reset=0)
         self.ack = Signal()
 
-    def chain_from(self, in_op):
+    def chain_from(self, in_op, extra=None):
+        stb = in_op.stb
+        if extra is not None:
+            stb = stb & extra
         return [self.v.eq(in_op.v),          # receive value
-                self.stb.eq(in_op.stb),      # receive STB
+                self.stb.eq(stb),      # receive STB
                 in_op.ack.eq(self.ack), # send ACK
                ]
 

diff --git a/src/add/test_dual.py b/src/add/test_dual.py
index 55facb12653425b7a609b7348b82a22a740f5c45..8e3a9d84753ef73039a7b02e424de413294dc668 100644 (file)
--- a/src/add/test_dual.py
+++ b/src/add/test_dual.py
@@ -4,13 +4,6 @@ from dual_add_experiment import ALU
 
 
 def get_case(dut, a, b, c):
-    yield dut.c.v.eq(c)
-    yield dut.c.stb.eq(1)
-    yield
-    yield
-    c_ack = (yield dut.c.ack)
-    assert c_ack == 0
-
     yield dut.a.v.eq(a)
     yield dut.a.stb.eq(1)
     yield
@@ -25,6 +18,20 @@ def get_case(dut, a, b, c):
     b_ack = (yield dut.b.ack)
     assert b_ack == 0
 
+    while True:
+        out_z_stb = (yield dut.int_stb)
+        if not out_z_stb:
+            yield
+            continue
+        break
+
+    yield dut.c.v.eq(c)
+    yield dut.c.stb.eq(1)
+    yield
+    yield
+    c_ack = (yield dut.c.ack)
+    assert c_ack == 0
+
     while True:
         yield
         out_z_stb = (yield dut.z.stb)
@@ -33,13 +40,19 @@ def get_case(dut, a, b, c):
 
         out_z = yield dut.z.v
 
-        yield dut.z.ack.eq(1)
+        yield dut.z.ack.eq(0)
         yield dut.a.stb.eq(0)
         yield dut.b.stb.eq(0)
         yield dut.c.stb.eq(0)
         yield
         yield
-        yield dut.z.ack.eq(0)
+        yield
+        yield
+        yield
+        yield
+        yield dut.z.ack.eq(1)
+        yield
+        yield
         yield
         yield
         break

diff --git a/src/add/unit_test_single.py b/src/add/unit_test_single.py
index c6d7861f731e0fd6a0fc597b3a8194d4e2a00875..ca5c14aa14f5365c2b2e0168fcab7a4aace5fffb 100644 (file)
--- a/src/add/unit_test_single.py
+++ b/src/add/unit_test_single.py
@@ -53,16 +53,14 @@ def get_case(dut, a, b):
         out_z_stb = (yield dut.out_z.stb)
         if not out_z_stb:
             continue
+        out_z = yield dut.out_z.v
+        yield dut.out_z.ack.eq(0)
         yield dut.in_a.stb.eq(0)
         yield dut.in_b.stb.eq(0)
-        yield dut.out_z.ack.eq(1)
-        yield
-        yield dut.out_z.ack.eq(0)
-        yield
         yield
+        yield dut.out_z.ack.eq(1)
         break
 
-    out_z = yield dut.out_z.v
     return out_z
 
 def check_case(dut, a, b, z):