bug 676: tidy up pseudocode

[openpower-isa.git] / src / openpower / decoder / isa / test_caller_svp64_maxloc.py

diff --git a/src/openpower/decoder/isa/test_caller_svp64_maxloc.py b/src/openpower/decoder/isa/test_caller_svp64_maxloc.py
index 3a38449965eab80aad9e2b210adb5debe56b2073..1395d3fb2c39739259ef8f7727fc0f876cb107e3 100644 (file)
--- a/src/openpower/decoder/isa/test_caller_svp64_maxloc.py
+++ b/src/openpower/decoder/isa/test_caller_svp64_maxloc.py
@@ -55,7 +55,7 @@ class DDFFirstTestCase(FHDLTestCase):
             self.assertEqual(sim.gpr(i), SelectableInt(expected[i], 64))
 
     def test_sv_maxloc_1(self):
-        self.sv_maxloc([0,6,1,7])
+        self.sv_maxloc([1,3,3,3])
 
     def tst_sv_maxloc_2(self):
         self.sv_maxloc([3,4,1,5])
@@ -81,22 +81,22 @@ class DDFFirstTestCase(FHDLTestCase):
                 #"addi 5, 4, 0",             # copy m(r4) to r5
                 # VL = MIN(CTR,MAXVL=4)
                 "mtcrf 255,0",              # clear CR entirely
-                "setvl 3,0,4,0,1,1",        # set MVL=4, VL=MIN(MVL,CTR)
-                # load VL bytes (update r4 addr) but compressed (dw=8)
-                #"addi 6, 0, 0",             # initialise r6 to zero
-                #"sv.lbzu/pi/dw=8 *6, 1(4)", # should be /lf here as well
+                "setvl 2,0,4,0,1,1",        # set MVL=4, VL=MIN(MVL,CTR)
                 # while (i<n and a[i]<=m) : i += 1
-                "sv.minmax./ff=ge/m=ge *5, *10, *4, 1", # scalar RB=RT
-                "sv.mcrf/m=ge *4,*0", # masked-copy CR0-CR3 to CR4-CR7
-                "setvl 3,0,4,0,1,1",        # set MVL=4, VL=MIN(MVL,CTR)
-                "sv.addi/mr/m=lt 4, *5, 0", # r4 = last non-masked value
-                "mtcrf 128, 0",       # clear CR0
-                "sv.minmax./ff=lt/m=ge/vli 4, *10, 4, 1", # scalar RB=RT
-                "sv.svstep/mr 2, 0, 6, 1",  # svstep: get vector dststep
-                "sv.creqv *16,*16,*16", # masked-copy CR0-CR3 to CR4-CR7
-                "bc 12,0, -0x3c"            # CR0 lt bit clear, branch back
-                #"setvl 3,0,4,0,1,1",        # set MVL=4, VL=MIN(MVL,CTR)
-                #"sv.bc/all/m=ge 16, 19, -0x3c", # until r10[i]>r4 (and dec CTR)
+                "sv.cmp/ff=gt/m=ge *0,0,*10,4", # truncates VL to min
+                "sv.creqv *16,*16,*16", # set mask on already-tested
+                "setvl 2,0,4,0,1,1",        # set MVL=4, VL=MIN(MVL,CTR)
+                "mtcrf 128, 0",       # clear CR0 (in case VL=0?)
+                # while (i<n and a[i]>m):
+                "sv.minmax./ff=le/m=ge 4, *10, 4, 1", # uses r4 as accumulator
+                #"crternlogi 0,1,2,127"  # test greater/equal or VL=0
+                "cror 0,1,0",           # test for greater or equal, or VL=0
+                "cror 0,2,0",           # test for greater or equal, or VL=0
+                "sv.creqv *19,*16,*16", # set mask on already-tested
+                "sv.crand *19,*19,0",   # clear if CR0=0
+                "sv.svstep/mr/m=so 1, 0, 6, 1",  # svstep: get vector dststep
+                "sv.creqv *16,*16,*16", # set mask on already-tested
+                "bc 12,0, -0x4c"            # CR0 lt bit clear, branch back
                         ])
         lst = list(lst)