From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 21 Sep 2022 14:46:46 +0000 (+0100)
Subject: whoops stride already has +1 from SVSTATE class
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d726201f19acaa2c2db490ff9b2949c4961745a;p=openpower-isa.git

whoops stride already has +1 from SVSTATE class
---

diff --git a/src/openpower/decoder/isa/remap_dct_yield.py b/src/openpower/decoder/isa/remap_dct_yield.py
index e0e899e0..b3a3e421 100644
--- a/src/openpower/decoder/isa/remap_dct_yield.py
+++ b/src/openpower/decoder/isa/remap_dct_yield.py
@@ -48,7 +48,7 @@ def iterate_dct_inner_halfswap_loadstore(SVSHAPE):
     # get indices to iterate over, in the required order
     n = SVSHAPE.lims[0]
     mode = SVSHAPE.lims[1]
-    stride = SVSHAPE.lims[2] + 1
+    stride = SVSHAPE.lims[2]
     print ("inner halfswap loadstore", n, mode, SVSHAPE.skip,
             "submode", SVSHAPE.submode2, "stride", stride)
 
@@ -84,7 +84,7 @@ def iterate_dct_inner_costable_indices(SVSHAPE):
     # get indices to iterate over, in the required order
     n = SVSHAPE.lims[0]
     mode = SVSHAPE.lims[1]
-    stride = SVSHAPE.lims[2] + 1
+    stride = SVSHAPE.lims[2]
     print ("inner costable", mode, "stride", stride)
     # creating lists of indices to iterate over in each dimension
     # has to be done dynamically, because it depends on the size
@@ -146,7 +146,7 @@ def iterate_dct_inner_butterfly_indices(SVSHAPE):
     # get indices to iterate over, in the required order
     n = SVSHAPE.lims[0]
     mode = SVSHAPE.lims[1]
-    stride = SVSHAPE.lims[2] + 1
+    stride = SVSHAPE.lims[2]
     print ("inner butterfly", mode, SVSHAPE.skip,
            "submode", SVSHAPE.submode2, "stride", stride)
     # creating lists of indices to iterate over in each dimension
@@ -259,7 +259,7 @@ def iterate_dct_outer_butterfly_indices(SVSHAPE):
     # get indices to iterate over, in the required order
     n = SVSHAPE.lims[0]
     mode = SVSHAPE.lims[1]
-    stride = SVSHAPE.lims[2] + 1
+    stride = SVSHAPE.lims[2]
     # creating lists of indices to iterate over in each dimension
     # has to be done dynamically, because it depends on the size
     # first, the size-based loop (which can be done statically)
@@ -885,7 +885,7 @@ def demo_dct():
     n = 8
     xdim = n
     ydim = 0 # not needed
-    zdim = 0 # again, not needed
+    zdim = 1 # must be set at least to 1
 
 
     ################
diff --git a/src/openpower/decoder/isa/remap_fft_yield.py b/src/openpower/decoder/isa/remap_fft_yield.py
index 76349ce2..a15c5bf7 100644
--- a/src/openpower/decoder/isa/remap_fft_yield.py
+++ b/src/openpower/decoder/isa/remap_fft_yield.py
@@ -25,7 +25,8 @@
 def iterate_butterfly_indices(SVSHAPE):
     # get indices to iterate over, in the required order
     n = SVSHAPE.lims[0]
-    stride = SVSHAPE.lims[2] + 1 # stride-multiplier on reg access
+    stride = SVSHAPE.lims[2] # stride-multiplier on reg access
+    print ("iterate fft butterfly", n, "stride", stride)
     # creating lists of indices to iterate over in each dimension
     # has to be done dynamically, because it depends on the size
     # first, the size-based loop (which can be done statically)
@@ -85,7 +86,7 @@ def demo():
     # set the dimension sizes here
     xdim = 8
     ydim = 0 # not needed
-    zdim = 0 # again, not needed
+    zdim = 1 # stride must be set to 1
 
     # set total. err don't know how to calculate how many there are...
     # do it manually for now