From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 25 May 2020 10:43:28 +0000 (+0100)
Subject: must not do rd-req checking when both imm and zero mode are enabled
X-Git-Tag: div_pipeline~848
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e2489a3ef25b5bab6041b51304a86d130fe003af;p=soc.git

must not do rd-req checking when both imm and zero mode are enabled
---

diff --git a/src/soc/experiment/compalu_multi.py b/src/soc/experiment/compalu_multi.py
index c1a555d1..2f6754c3 100644
--- a/src/soc/experiment/compalu_multi.py
+++ b/src/soc/experiment/compalu_multi.py
@@ -315,15 +315,15 @@ def op_sim(dut, a, b, op, inv_a=0, imm=0, imm_ok=0, zero_a=0):
     yield
     yield dut.issue_i.eq(0)
     yield
-    yield dut.rd.go.eq(0b11)
-    while True:
-        yield
-        rd_rel_o = yield dut.rd.rel
-        print ("rd_rel", rd_rel_o)
-        if rd_rel_o:
-            break
-    yield
-    yield dut.rd.go.eq(0)
+    if not imm_ok or not zero_a:
+        yield dut.rd.go.eq(0b11)
+        while True:
+            yield
+            rd_rel_o = yield dut.rd.rel
+            print ("rd_rel", rd_rel_o)
+            if rd_rel_o:
+                break
+        yield dut.rd.go.eq(0)
     req_rel_o = yield dut.wr.rel
     result = yield dut.data_o
     print ("req_rel", req_rel_o, result)
@@ -354,11 +354,9 @@ def scoreboard_sim(dut):
     result = yield from op_sim(dut, 5, 2, InternalOp.OP_ADD, inv_a=1)
     assert result == 65532
 
-    # XXX - immediate and zero is not a POWER mode (and won't work anyway)
-    # reason: no actual operands.
-    #result = yield from op_sim(dut, 5, 2, InternalOp.OP_ADD, zero_a=1,
-    #                                imm=8, imm_ok=1)
-    #assert result == 8
+    result = yield from op_sim(dut, 5, 2, InternalOp.OP_ADD, zero_a=1,
+                                    imm=8, imm_ok=1)
+    assert result == 8
 
     result = yield from op_sim(dut, 5, 2, InternalOp.OP_ADD, zero_a=1)
     assert result == 2