add (untested) TestRunner based on soc test_runner.py

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

diff --git a/src/openpower/decoder/isa/svshape.py b/src/openpower/decoder/isa/svshape.py
index c2e1968df2ad7c014bdfc8059c0d941766f5d85d..4d4cb1d23b99da11a1793a90183cd6266843f538 100644 (file)
--- a/src/openpower/decoder/isa/svshape.py
+++ b/src/openpower/decoder/isa/svshape.py
@@ -4,7 +4,9 @@ from openpower.decoder.isa.remapyield import iterate_indices
 from openpower.decoder.isa.remap_fft_yield import iterate_butterfly_indices
 from openpower.decoder.isa.remap_dct_yield import (
                                 iterate_dct_inner_butterfly_indices,
-                                iterate_dct_outer_butterfly_indices)
+                                iterate_dct_inner_costable_indices,
+                                iterate_dct_outer_butterfly_indices,
+                                iterate_dct_inner_halfswap_loadstore)
 from openpower.sv.svp64 import SVP64SHAPE
 import os
 from copy import deepcopy
@@ -24,7 +26,7 @@ class SVSHAPE(SelectableInt):
             fs = tuple(range(offs, end))
             v = FieldSelectableInt(self, fs)
             self.fsi[field] = v
-            #log("SVSHAPE setup field", field, offs, end)
+            log("SVSHAPE setup field", field, offs, end)
             offs = end
 
     @property
@@ -113,16 +115,21 @@ class SVSHAPE(SelectableInt):
         self.fsi['offset'].eq(value)
 
     def get_iterator(self):
+        log ("SVSHAPE get_iterator", self.mode, self.ydimsz)
         if self.mode == 0b00:
             iterate_fn = iterate_indices
-        elif self.mode == 0b01:
+        elif self.mode in [0b01, 0b11]:
             # further sub-selection
-            if self.submode2 == 0b000:
+            if self.ydimsz == 1:
                 iterate_fn = iterate_butterfly_indices
-            elif self.submode2 in [0b001, 0b010]:
+            elif self.ydimsz in [2, 4]:
                 iterate_fn = iterate_dct_inner_butterfly_indices
-            elif self.submode2 in [0b011, 0b100]:
+            elif self.ydimsz == 3:
                 iterate_fn = iterate_dct_outer_butterfly_indices
+            elif self.ydimsz in [5, 13]:
+                iterate_fn = iterate_dct_inner_costable_indices
+            elif self.ydimsz in [6, 14, 15]:
+                iterate_fn = iterate_dct_inner_halfswap_loadstore
         # create a **NEW** iterator each time this is called
         return iterate_fn(deepcopy(self))