cleanup test_loadstore1.py

diff --git a/src/soc/experiment/test/test_loadstore1.py b/src/soc/experiment/test/test_loadstore1.py
index 4e7ee7fe885ea0047dc1404ce668ff058150c94a..a4a821775b6b9a12383602c0d20ecfdd46714d4b 100644 (file)
--- a/src/soc/experiment/test/test_loadstore1.py
+++ b/src/soc/experiment/test/test_loadstore1.py
@@ -424,20 +424,12 @@ def _test_loadstore1_ifetch_invalid(dut, mem):
     yield
     yield
 
-    # some more cycles for gtkwave debugging
-    yield
-    yield
-    yield
-
-    wbget.stop = True
-    return
-    # TODO: implement rest
-
     # miss, stalls for a bit
     yield i_in.req.eq(1)
     yield i_in.nia.eq(addr)
     yield
     valid = yield i_out.valid
+    nia   = yield i_out.nia
     while not valid:
         yield
         valid = yield i_out.valid
@@ -445,6 +437,7 @@ def _test_loadstore1_ifetch_invalid(dut, mem):
 
     nia   = yield i_out.nia
     insn  = yield i_out.insn
+
     yield
     yield
 
@@ -491,6 +484,8 @@ def _test_loadstore1_ifetch_invalid(dut, mem):
     yield
     yield
 
+    wbget.stop = True
+
 
 def test_loadstore1_ifetch():
 
@@ -566,7 +561,8 @@ def test_loadstore1_ifetch_invalid():
 
 
 if __name__ == '__main__':
-    #test_loadstore1()
-    #test_loadstore1_invalid()
-    #test_loadstore1_ifetch()
+    test_loadstore1()
+    test_loadstore1_invalid()
+    test_loadstore1_ifetch()
     test_loadstore1_ifetch_invalid()
+