enable general test cases in test_issuer
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 18 Jun 2020 17:05:59 +0000 (18:05 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 18 Jun 2020 17:05:59 +0000 (18:05 +0100)
src/soc/simple/test/test_issuer.py

index f5fc6dc8971b1108fac31547eece8fad01dc529f..0bd2b5adba5c375e0eaff8618edd4232ee6f70f7 100644 (file)
@@ -103,7 +103,7 @@ class TestRunner(FHDLTestCase):
                     ins, code = instructions[index]
 
                     print("instruction: 0x{:X}".format(ins & 0xffffffff))
-                    print(code)
+                    print(index, code)
 
                     # start the instruction
                     yield go_insn_i.eq(1)
@@ -119,6 +119,7 @@ class TestRunner(FHDLTestCase):
                     # call simulated operation
                     opname = code.split(' ')[0]
                     yield from sim.call(opname)
+                    yield Settle()
                     index = sim.pc.CIA.value//4
 
                     # register check
@@ -136,7 +137,7 @@ class TestRunner(FHDLTestCase):
 if __name__ == "__main__":
     unittest.main(exit=False)
     suite = unittest.TestSuite()
-    #suite.addTest(TestRunner(GeneralTestCases.test_data))
+    suite.addTest(TestRunner(GeneralTestCases.test_data))
     suite.addTest(TestRunner(LDSTTestCase.test_data))
     suite.addTest(TestRunner(CRTestCase.test_data))
     suite.addTest(TestRunner(ShiftRotTestCase.test_data))