From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 8 May 2020 20:54:19 +0000 (+0100)
Subject: working indexed version of LD/ST CompUnit
X-Git-Tag: div_pipeline~1329
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b38391f3a9696a2e83b446dd0c009841f6c78166;p=soc.git

working indexed version of LD/ST CompUnit
---

diff --git a/src/soc/experiment/compldst_multi.py b/src/soc/experiment/compldst_multi.py
index b4bc738b..1ad24443 100644
--- a/src/soc/experiment/compldst_multi.py
+++ b/src/soc/experiment/compldst_multi.py
@@ -575,6 +575,10 @@ def load(dut, src1, src2, imm, imm_ok=True):
 
 
 def scoreboard_sim(dut):
+
+    ###################
+    # immediate version
+
     # two STs (different addresses)
     yield from store(dut, 4, 0, 3, 2)
     yield from store(dut, 2, 0, 9, 2)
@@ -583,9 +587,14 @@ def scoreboard_sim(dut):
     data = yield from load(dut, 4, 0, 2)
     assert data == 0x0003, "returned %x" % data
     data = yield from load(dut, 2, 0, 2)
-    assert data == 0x0009
+    assert data == 0x0009, "returned %x" % data
     yield
 
+    # indexed version
+    yield from store(dut, 4, 5, 3, 0, imm_ok=False)
+    data = yield from load(dut, 4, 5, 0, imm_ok=False)
+    assert data == 0x0003, "returned %x" % data
+
 
 class TestLDSTCompUnit(LDSTCompUnit):