From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 25 Sep 2021 12:35:36 +0000 (+0100)
Subject: add a SimRunner prepare_for_test and run_test function
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5bc2cf02f0df7639fbc6b2869b1d9cba71b9c8d2;p=soc.git

add a SimRunner prepare_for_test and run_test function
---

diff --git a/src/soc/simple/test/test_runner.py b/src/soc/simple/test/test_runner.py
index a8898bf5..f8fb84e4 100644
--- a/src/soc/simple/test/test_runner.py
+++ b/src/soc/simple/test/test_runner.py
@@ -261,6 +261,16 @@ class SimRunner(StateRunner):
         self.simdec2 = simdec2 = PowerDecode2(None, regreduce_en=regreduce_en)
         m.submodules.simdec2 = simdec2  # pain in the neck
 
+    def prepare_for_test(self, test):
+        self.test = test
+
+    def run_test(self, instructions, gen, insncode):
+        sim_states = yield from run_sim_state(self.dut, self.test,
+                                          self.simdec2,
+                                          instructions, gen,
+                                          insncode)
+        return sim_states
+
 
 class HDLRunner(StateRunner):
     def __init__(self, dut, m, pspec):
@@ -354,6 +364,9 @@ class TestRunner(FHDLTestCase):
                     ###### PREPARATION PHASE AT START OF TEST #######
                     # StateRunner.prepare_for_test()
 
+                    if self.run_sim:
+                        simrun.prepare_for_test(test)
+
                     if self.run_hdl:
                         # set up bigendian (TODO: don't do this, use MSR)
                         yield hdlrun.issuer.core_bigendian_i.eq(bigendian)
@@ -400,8 +413,7 @@ class TestRunner(FHDLTestCase):
                     ##########
 
                     if self.run_sim:
-                        sim_states = yield from run_sim_state(self, test,
-                                                          simrun.simdec2,
+                        sim_states = yield from simrun.run_test(
                                                           instructions, gen,
                                                           insncode)