From: Tobias Platen <tplaten@posteo.de>
Date: Mon, 13 Dec 2021 18:04:40 +0000 (+0100)
Subject: try to get multi test running
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03d1434d267d136534f80ca2d18e4ab2afe245b2;p=soc.git

try to get multi test running
---

diff --git a/src/soc/experiment/test/test_loadstore1.py b/src/soc/experiment/test/test_loadstore1.py
index fee0d8eb..bafa51d9 100644
--- a/src/soc/experiment/test/test_loadstore1.py
+++ b/src/soc/experiment/test/test_loadstore1.py
@@ -184,8 +184,7 @@ def _test_loadstore1_ifetch_multi(dut, mem):
     yield
     # TODO fetch instructions from multiple addresses
     # should cope with some addresses being invalid
-    #addrs = [0x10200,0x10204,10208,10200]
-    addrs = [0,4,8,0]
+    addrs = [0,4,8,0,0x10200,0x10204,0x10208,0x10200]
 
     mem[0x10200]=0xFF00FF00EE00EE00EE
     mem[0]=0xFF00FF00EE00EE00EE
@@ -200,7 +199,7 @@ def _test_loadstore1_ifetch_multi(dut, mem):
         insn = yield from read_from_addr(icache, addr, stall=False)
 
         nia   = yield i_out.nia  # NO, must use FetchUnitInterface
-        print ("fetched %x from addr %x" % (insn, nia))
+        print ("TEST_MULTI: fetched %x from addr %x == %x" % (insn, nia,addr))
 
     wbget.stop = True
 
@@ -811,7 +810,7 @@ def test_loadstore1_ifetch_multi():
     # add two wb_get processes onto the *same* memory dictionary.
     # this shouuuld work.... cross-fingers...
     sim.add_sync_process(wrap(wb_get(cmpi.wb_bus(), mem)))
-    sim.add_sync_process(wrap(wb_get(icache.bus, mem)))
+    sim.add_sync_process(wrap(wb_get(icache.ibus, mem))) # ibus not bus
     with sim.write_vcd('test_loadstore1_ifetch_multi.vcd',
                       traces=[m.debug_status]): # include extra debug
         sim.run()