From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 12 Feb 2021 15:02:43 +0000 (+0000)
Subject: validate all registers to make sure no damage occurs in SVP64 ISACaller
X-Git-Tag: convert-csv-opcode-to-binary~241
X-Git-Url: https://git.libre-soc.org/?p=soc.git;a=commitdiff_plain;h=3a940211d59b532fb0b5d06890bbe1eb75cbcd4e

validate all registers to make sure no damage occurs in SVP64 ISACaller
---

diff --git a/src/soc/decoder/isa/test_caller_svp64.py b/src/soc/decoder/isa/test_caller_svp64.py
index c164b91c..c5b9d92c 100644
--- a/src/soc/decoder/isa/test_caller_svp64.py
+++ b/src/soc/decoder/isa/test_caller_svp64.py
@@ -12,10 +12,14 @@ from soc.decoder.orderedset import OrderedSet
 from soc.decoder.isa.all import ISA
 from soc.decoder.isa.test_caller import Register, run_tst
 from soc.sv.trans.svp64 import SVP64Asm
-
+from copy import deepcopy
 
 class DecoderTestCase(FHDLTestCase):
 
+    def _check_regs(self, sim, expected):
+        for i in range(32):
+            self.assertEqual(sim.gpr(i), SelectableInt(expected[i], 64))
+
     def test_sv_add(self):
         # adds:
         #       1 = 5 + 9   => 0x5555 = 0x4321+0x1234
@@ -34,10 +38,14 @@ class DecoderTestCase(FHDLTestCase):
         svstate.vl[0:7] = 2 # VL
         svstate.maxvl[0:7] = 2 # MAXVL
         print ("SVSTATE", bin(svstate.spr.asint()))
+        # copy before running
+        expected_regs = deepcopy(initial_regs)
+        expected_regs[1] = 0x5555
+        expected_regs[2] = 0x3334
+
         with Program(lst, bigendian=False) as program:
             sim = self.run_tst_program(program, initial_regs, svstate)
-            self.assertEqual(sim.gpr(1), SelectableInt(0x5555, 64))
-            self.assertEqual(sim.gpr(2), SelectableInt(0x3334, 64))
+            self._check_regs(sim, expected_regs)
 
     def test_sv_add_2(self):
         # adds:
@@ -57,10 +65,13 @@ class DecoderTestCase(FHDLTestCase):
         svstate.vl[0:7] = 2 # VL
         svstate.maxvl[0:7] = 2 # MAXVL
         print ("SVSTATE", bin(svstate.spr.asint()))
+        # copy before running
+        expected_regs = deepcopy(initial_regs)
+        expected_regs[1] = 0x5555
+
         with Program(lst, bigendian=False) as program:
             sim = self.run_tst_program(program, initial_regs, svstate)
-            self.assertEqual(sim.gpr(1), SelectableInt(0x5555, 64))
-            self.assertEqual(sim.gpr(2), SelectableInt(0, 64))
+            self._check_regs(sim, expected_regs)
 
     def test_sv_add_3(self):
         # adds:
@@ -80,10 +91,14 @@ class DecoderTestCase(FHDLTestCase):
         svstate.vl[0:7] = 2 # VL
         svstate.maxvl[0:7] = 2 # MAXVL
         print ("SVSTATE", bin(svstate.spr.asint()))
+        # copy before running
+        expected_regs = deepcopy(initial_regs)
+        expected_regs[1] = 0x5555
+        expected_regs[2] = 0x5432
+
         with Program(lst, bigendian=False) as program:
             sim = self.run_tst_program(program, initial_regs, svstate)
-            self.assertEqual(sim.gpr(1), SelectableInt(0x5555, 64))
-            self.assertEqual(sim.gpr(2), SelectableInt(0x5432, 64))
+            self._check_regs(sim, expected_regs)
 
     def run_tst_program(self, prog, initial_regs=[0] * 32,
                               svstate=None):