From 3fa7ba28c3ff08833bc75effcacff579eba26d92 Mon Sep 17 00:00:00 2001
From: Cesar Strauss <cestrauss@gmail.com>
Date: Sat, 22 May 2021 17:31:00 -0300
Subject: [PATCH] Move the reset code outside of the sub-test

Even if a sub-test fails, the core still needs to be reset.
This code does not check any assertions, so it's safe to move it outside.
---
 src/soc/simple/test/test_runner.py | 38 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/soc/simple/test/test_runner.py b/src/soc/simple/test/test_runner.py
index 7db90efd..cb4ca458 100644
--- a/src/soc/simple/test/test_runner.py
+++ b/src/soc/simple/test/test_runner.py
@@ -306,30 +306,30 @@ class TestRunner(FHDLTestCase):
                         if terminated:
                             break
 
-                    # stop at end
-                    yield from set_dmi(dmi, DBGCore.CTRL, 1<<DBGCtrl.STOP)
-                    yield
-                    yield
+                # stop at end
+                yield from set_dmi(dmi, DBGCore.CTRL, 1<<DBGCtrl.STOP)
+                yield
+                yield
 
-                    # get CR
-                    cr = yield from get_dmi(dmi, DBGCore.CR)
-                    print("after test %s cr value %x" % (test.name, cr))
+                # get CR
+                cr = yield from get_dmi(dmi, DBGCore.CR)
+                print("after test %s cr value %x" % (test.name, cr))
 
-                    # get XER
-                    xer = yield from get_dmi(dmi, DBGCore.XER)
-                    print("after test %s XER value %x" % (test.name, xer))
+                # get XER
+                xer = yield from get_dmi(dmi, DBGCore.XER)
+                print("after test %s XER value %x" % (test.name, xer))
 
-                    # test of dmi reg get
-                    for int_reg in range(32):
-                        yield from set_dmi(dmi, DBGCore.GSPR_IDX, int_reg)
-                        value = yield from get_dmi(dmi, DBGCore.GSPR_DATA)
+                # test of dmi reg get
+                for int_reg in range(32):
+                    yield from set_dmi(dmi, DBGCore.GSPR_IDX, int_reg)
+                    value = yield from get_dmi(dmi, DBGCore.GSPR_DATA)
 
-                        print("after test %s reg %2d value %x" %
-                              (test.name, int_reg, value))
+                    print("after test %s reg %2d value %x" %
+                          (test.name, int_reg, value))
 
-                    # pull a reset
-                    yield from set_dmi(dmi, DBGCore.CTRL, 1<<DBGCtrl.RESET)
-                    yield
+                # pull a reset
+                yield from set_dmi(dmi, DBGCore.CTRL, 1<<DBGCtrl.RESET)
+                yield
 
         styles = {
             'dec': {'base': 'dec'},
-- 
2.30.2