end SVP64 "Vertical First" mode on rollover when end of svstep reached

diff --git a/src/openpower/decoder/isa/caller.py b/src/openpower/decoder/isa/caller.py
index d8f4d3fcab27f53b70bb58953a383579cffd8b7b..62bfb6cebc2b50dda94a0ca47459cbadf8005d00 100644 (file)
--- a/src/openpower/decoder/isa/caller.py
+++ b/src/openpower/decoder/isa/caller.py
@@ -1442,11 +1442,14 @@ class ISACaller:
             yield from self.svstate_pre_inc()
             pre = yield from self.update_new_svstate_steps()
             if pre:
+                # reset at end of loop including exit Vertical Mode
                 log ("SVSTATE_NEXT: end of loop, reset")
                 self.svp64_reset_loop()
+                self.msr[MSRb.SVF] = 0
                 self.update_nia()
-                results = [SelectableInt(0, 64)]
-                self.handle_comparison(results) # CR0
+                if rc_en:
+                    results = [SelectableInt(0, 64)]
+                    self.handle_comparison(results) # CR0
             else:
                 log ("SVSTATE_NEXT: post-inc")
                 srcstep, dststep = self.new_srcstep, self.new_dststep
@@ -1466,7 +1469,10 @@ class ISACaller:
                     results = [SelectableInt(endtest, 64)]
                     self.handle_comparison(results) # CR0
                 if end_src or end_dst:
+                    # reset at end of loop including exit Vertical Mode
+                    log ("SVSTATE_NEXT: after increments, reset")
                     self.svp64_reset_loop()
+                    self.msr[MSRb.SVF] = 0
 
         elif self.is_svp64_mode:
             yield from self.svstate_post_inc()

diff --git a/src/openpower/decoder/isa/test_caller_setvl.py b/src/openpower/decoder/isa/test_caller_setvl.py
index f4c17058fd16bcca45c7346c441139486c9b174a..c6633ee48b95a79a5b0731c9ed31a2846baa5c56 100644 (file)
--- a/src/openpower/decoder/isa/test_caller_setvl.py
+++ b/src/openpower/decoder/isa/test_caller_setvl.py
@@ -78,8 +78,9 @@ class DecoderTestCase(FHDLTestCase):
             self.assertEqual(sim.svstate.dststep.asint(True), 0)
             print("      gpr1", sim.gpr(0))
             self.assertEqual(sim.gpr(0), SelectableInt(0, 64))
+            # when end reached, vertical mode is exited
             print("      msr", bin(sim.msr.value))
-            self.assertEqual(sim.msr, SelectableInt(1<<(63-6), 64))
+            self.assertEqual(sim.msr, SelectableInt(0<<(63-6), 64))
             CR0 = sim.crl[0]
             print("      CR0", bin(CR0.get_range().value))
             self.assertEqual(CR0[CRFields.EQ], 1)