whoops, no ability to add comments in between functions in pseudocode

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

diff --git a/src/openpower/decoder/isa/fastdctlee.py b/src/openpower/decoder/isa/fastdctlee.py
index 16de9cb7970738ee7f3fd95ec24cc15f647473a0..40444d4c6b477cb136bd4d3c51fdda87d7d21c76 100644 (file)
--- a/src/openpower/decoder/isa/fastdctlee.py
+++ b/src/openpower/decoder/isa/fastdctlee.py
@@ -323,6 +323,9 @@ def inverse_transform(vector, root=True, indent=0):
 # totally cool *in-place* DCT algorithm
 def inverse_transform_iter(vec):
 
+    # in-place, but actually have to protect the input list!
+    vec = deepcopy(vec)
+
     # Initialization
     n = len(vec)
     print ()
@@ -359,8 +362,8 @@ def inverse_transform_iter(vec):
     vec[0] /= 2.0
 
     print("transform2-inv pre-itersum", vec)
-    #vec = halfrev2(vec, True)
     vec = [vec[ri[i]] for i in range(n)]
+    vec = halfrev2(vec, True)
     #print("transform2-inv post-itersum-reorder", vec)
 
     # first the outer butterfly (iterative sum thing)
@@ -375,22 +378,15 @@ def inverse_transform_iter(vec):
             jr.reverse()
             print ("itersum    jr", i+halfsize, i+size, jr)
             for jh in jr:
-                x = vec[ri[jh]]
-                y = vec[ri[jh+size]]
-                vec[ri[jh+size]] = x + y
+                x = vec[ji[ri[jh]]]
+                y = vec[ji[ri[jh+size]]]
+                vec[ji[ri[jh+size]]] = x + y
                 print ("    itersum", size, i, jh, jh+size,
                         x, y, "jh+sz", vec[ji[jh+size]])
         size *= 2
 
     print("transform2-inv post-itersum", vec)
 
-    # and pretend we LDed data in half-swapped *and* bit-reversed order as well
-    # TODO: merge these two
-    vec = halfrev2(vec, True)
-    ri = list(range(n))
-
-    print("transform2-inv post-reorder", vec)
-
     # start the inner butterfly (coefficients)
     size = 2
     k = 0
@@ -406,7 +402,6 @@ def inverse_transform_iter(vec):
             jr.reverse()
             print ("  xform jr", j, jr)
             for ci, (jl, jh) in enumerate(zip(j, jr)):
-                #t1, t2 = vec[ri[ji[jl]]], vec[ri[ji[jh]]]
                 t1, t2 = vec[ji[jl]], vec[ji[jl+halfsize]]
                 #coeff = (math.cos((ci + 0.5) * math.pi / size) * 2.0)
                 coeff = ctable[k]
@@ -414,8 +409,6 @@ def inverse_transform_iter(vec):
                 # normally DCT would use jl+halfsize not jh, here.
                 # to be able to work in-place, the idea is to perform a
                 # swap afterwards.
-                #vec[ri[ji[jl]]] = t1 + t2/coeff
-                #vec[ri[ji[jh]]] = t1 - t2/coeff
                 vec[ji[jl]] = t1 + t2/coeff
                 vec[ji[jl+halfsize]] = t1 - t2/coeff
                 print ("coeff", size, i, "ci", ci,