CMSIS-DSP: Added MVE code for cfft q31
Added tests patterns for RFFT Q31 and Q15.
diff --git a/CMSIS/DSP/Scripts/genMVETwiddleCoefs.py b/CMSIS/DSP/Scripts/genMVETwiddleCoefs.py
index 2466945..647e470 100755
--- a/CMSIS/DSP/Scripts/genMVETwiddleCoefs.py
+++ b/CMSIS/DSP/Scripts/genMVETwiddleCoefs.py
@@ -1,6 +1,11 @@
import numpy as np
import math
import argparse
+import sys
+
+sys.path.append("PatternGeneration")
+
+import Tools
parser = argparse.ArgumentParser(description='Generate C arrays')
parser.add_argument('-f', nargs='?',type = str, default="../Source/CommonTables/arm_mve_tables.c", help="C File path")
@@ -10,9 +15,14 @@
COLLIM = 80
-condition="""#if !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_ALL_FFT_TABLES) || defined(ARM_TABLE_TWIDDLECOEF_F32_%d) || defined(ARM_TABLE_TWIDDLECOEF_F32_%d)
+condition="""#if !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_ALL_FFT_TABLES) || defined(ARM_TABLE_TWIDDLECOEF_%s_%d) || defined(ARM_TABLE_TWIDDLECOEF_%s_%d)
"""
+F32 = 1
+Q31 = 2
+Q15 = 3
+Q7 = 4
+
def printCUInt32Array(f,name,arr):
nb = 0
print("uint32_t %s[%d]={" % (name,len(arr)),file=f)
@@ -41,12 +51,63 @@
print("};\n",file=f)
+def printCQ31Array(f,name,arr):
+ nb = 0
+ print("q31_t %s[%d]={" % (name,len(arr)),file=f)
+
+ for d in arr:
+ val = "%s," % Tools.to_q31(d)
+ nb = nb + len(val)
+ if nb > COLLIM:
+ print("",file=f)
+ nb = len(val)
+ print(val,end="",file=f)
+
+ print("};\n",file=f)
+
+def printCQ15Array(f,name,arr):
+ nb = 0
+ print("q15_t %s[%d]={" % (name,len(arr)),file=f)
+
+ for d in arr:
+ val = "%s," % Tools.to_q15(d)
+ nb = nb + len(val)
+ if nb > COLLIM:
+ print("",file=f)
+ nb = len(val)
+ print(val,end="",file=f)
+
+ print("};\n",file=f)
+
+def printCQ7Array(f,name,arr):
+ nb = 0
+ print("q7_t %s[%d]={" % (name,len(arr)),file=f)
+
+ for d in arr:
+ val = "%s," % Tools.to_q7(d)
+ nb = nb + len(val)
+ if nb > COLLIM:
+ print("",file=f)
+ nb = len(val)
+ print(val,end="",file=f)
+
+ print("};\n",file=f)
+
def printHUInt32Array(f,name,arr):
print("extern uint32_t %s[%d];" % (name,len(arr)),file=f)
def printHFloat32Array(f,name,arr):
print("extern float32_t %s[%d];" % (name,len(arr)),file=f)
+def printHQ31Array(f,name,arr):
+ print("extern q31_t %s[%d];" % (name,len(arr)),file=f)
+
+def printHQ15Array(f,name,arr):
+ print("extern q15_t %s[%d];" % (name,len(arr)),file=f)
+
+def printHQ7Array(f,name,arr):
+ print("extern q7_t %s[%d];" % (name,len(arr)),file=f)
+
def twiddle(n):
a=2.0*math.pi*np.linspace(0,n,num=n,endpoint=False)/n
c=np.cos(a)
@@ -57,7 +118,7 @@
r[1::2] = s
return(r)
-def reorderTwiddle(f,h,n):
+def reorderTwiddle(theType,conjugate,f,h,n):
numStages = 6
coefs= twiddle(n)
@@ -112,18 +173,27 @@
tab3Offset[stage] = tab3Index
for i in range(0,nbOfElt):
- tab1[tab1Index] = coefs[pVectCoef1]
- tab1[tab1Index + 1] = coefs[pVectCoef1 + 1];
+ tab1[tab1Index] = coefs[pVectCoef1]
+ if not conjugate:
+ tab1[tab1Index + 1] = coefs[pVectCoef1 + 1]
+ else:
+ tab1[tab1Index + 1] = -coefs[pVectCoef1 + 1]
tab1Index = tab1Index + 2
pVectCoef1 = pVectCoef1 + (incr * 1 * 2)
- tab2[tab2Index] = coefs[pVectCoef2]
- tab2[tab2Index + 1] = coefs[pVectCoef2 + 1];
+ tab2[tab2Index] = coefs[pVectCoef2]
+ if not conjugate:
+ tab2[tab2Index + 1] = coefs[pVectCoef2 + 1]
+ else:
+ tab2[tab2Index + 1] = -coefs[pVectCoef2 + 1]
tab2Index = tab2Index + 2
pVectCoef2 = pVectCoef2 + (incr * 2 * 2)
- tab3[tab3Index] = coefs[pVectCoef3]
- tab3[tab3Index + 1] = coefs[pVectCoef3 + 1];
+ tab3[tab3Index] = coefs[pVectCoef3]
+ if not conjugate:
+ tab3[tab3Index + 1] = coefs[pVectCoef3 + 1]
+ else:
+ tab3[tab3Index + 1] = -coefs[pVectCoef3 + 1]
tab3Index = tab3Index + 2
pVectCoef3 = pVectCoef3 + (incr * 3 * 2)
@@ -131,27 +201,78 @@
incr = 4 * incr
- print(condition % (n, n << 1),file=f)
- print(condition % (n, n << 1),file=h)
- printCUInt32Array(f,"rearranged_twiddle_tab_stride1_arr_%d" % n,list(tab1Offset))
- printHUInt32Array(h,"rearranged_twiddle_tab_stride1_arr_%d" % n,list(tab1Offset))
-
- printCUInt32Array(f,"rearranged_twiddle_tab_stride2_arr_%d" % n,list(tab2Offset))
- printHUInt32Array(h,"rearranged_twiddle_tab_stride2_arr_%d" % n,list(tab2Offset))
+ # F32 SECTION FOR THIS FFT LENGTH
+ if theType == F32:
+ print(condition % ("F32",n, "F32",n << 1),file=f)
+ print(condition % ("F32",n, "F32",n << 1),file=h)
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride1_arr_%d_f32" % n,list(tab1Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride1_arr_%d_f32" % n,list(tab1Offset))
- printCUInt32Array(f,"rearranged_twiddle_tab_stride3_arr_%d" % n,list(tab3Offset))
- printHUInt32Array(h,"rearranged_twiddle_tab_stride3_arr_%d" % n,list(tab3Offset))
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride2_arr_%d_f32" % n,list(tab2Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride2_arr_%d_f32" % n,list(tab2Offset))
+
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride3_arr_%d_f32" % n,list(tab3Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride3_arr_%d_f32" % n,list(tab3Offset))
+
+ printCFloat32Array(f,"rearranged_twiddle_stride1_%d_f32" % n,list(tab1))
+ printHFloat32Array(h,"rearranged_twiddle_stride1_%d_f32" % n,list(tab1))
+
+ printCFloat32Array(f,"rearranged_twiddle_stride2_%d_f32" % n,list(tab2))
+ printHFloat32Array(h,"rearranged_twiddle_stride2_%d_f32" % n,list(tab2))
+
+ printCFloat32Array(f,"rearranged_twiddle_stride3_%d_f32" % n,list(tab3))
+ printHFloat32Array(h,"rearranged_twiddle_stride3_%d_f32" % n,list(tab3))
+ print("#endif\n",file=f)
+ print("#endif\n",file=h)
- printCFloat32Array(f,"rearranged_twiddle_stride1_%d" % n,list(tab1))
- printHFloat32Array(h,"rearranged_twiddle_stride1_%d" % n,list(tab1))
+ # Q31 SECTION FOR THIS FFT LENGTH
+ if theType == Q31:
+ print(condition % ("Q31",n, "Q31",n << 1),file=f)
+ print(condition % ("Q31",n, "Q31",n << 1),file=h)
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride1_arr_%d_q31" % n,list(tab1Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride1_arr_%d_q31" % n,list(tab1Offset))
+
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride2_arr_%d_q31" % n,list(tab2Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride2_arr_%d_q31" % n,list(tab2Offset))
+
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride3_arr_%d_q31" % n,list(tab3Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride3_arr_%d_q31" % n,list(tab3Offset))
+
+ printCQ31Array(f,"rearranged_twiddle_stride1_%d_q31" % n,list(tab1))
+ printHQ31Array(h,"rearranged_twiddle_stride1_%d_q31" % n,list(tab1))
+
+ printCQ31Array(f,"rearranged_twiddle_stride2_%d_q31" % n,list(tab2))
+ printHQ31Array(h,"rearranged_twiddle_stride2_%d_q31" % n,list(tab2))
+
+ printCQ31Array(f,"rearranged_twiddle_stride3_%d_q31" % n,list(tab3))
+ printHQ31Array(h,"rearranged_twiddle_stride3_%d_q31" % n,list(tab3))
+ print("#endif\n",file=f)
+ print("#endif\n",file=h)
- printCFloat32Array(f,"rearranged_twiddle_stride2_%d" % n,list(tab2))
- printHFloat32Array(h,"rearranged_twiddle_stride2_%d" % n,list(tab2))
+ # Q15 SECTION FOR THIS FFT LENGTH
+ if theType == Q15:
+ print(condition % ("Q15",n, "Q15",n << 1),file=f)
+ print(condition % ("Q15",n, "Q15",n << 1),file=h)
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride1_arr_%d_q15" % n,list(tab1Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride1_arr_%d_q15" % n,list(tab1Offset))
+
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride2_arr_%d_q15" % n,list(tab2Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride2_arr_%d_q15" % n,list(tab2Offset))
+
+ printCUInt32Array(f,"rearranged_twiddle_tab_stride3_arr_%d_q15" % n,list(tab3Offset))
+ printHUInt32Array(h,"rearranged_twiddle_tab_stride3_arr_%d_q15" % n,list(tab3Offset))
+
+ printCQ15Array(f,"rearranged_twiddle_stride1_%d_q15" % n,list(tab1))
+ printHQ15Array(h,"rearranged_twiddle_stride1_%d_q15" % n,list(tab1))
+
+ printCQ15Array(f,"rearranged_twiddle_stride2_%d_q15" % n,list(tab2))
+ printHQ15Array(h,"rearranged_twiddle_stride2_%d_q15" % n,list(tab2))
+
+ printCQ15Array(f,"rearranged_twiddle_stride3_%d_q15" % n,list(tab3))
+ printHQ15Array(h,"rearranged_twiddle_stride3_%d_q15" % n,list(tab3))
+ print("#endif\n",file=f)
+ print("#endif\n",file=h)
- printCFloat32Array(f,"rearranged_twiddle_stride3_%d" % n,list(tab3))
- printHFloat32Array(h,"rearranged_twiddle_stride3_%d" % n,list(tab3))
- print("#endif\n",file=f)
- print("#endif\n",file=h)
@@ -187,21 +308,34 @@
* limitations under the License.
*/
- #include "arm_math.h"
-
- #if defined(ARM_MATH_MVEF) && !defined(ARM_MATH_AUTOVECTORIZE)
-
- #if !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES)
-
-
"""
-cfooter="""
+cifdeMVEF="""#include "arm_math.h"
+
+#if defined(ARM_MATH_MVEF) && !defined(ARM_MATH_AUTOVECTORIZE)
+
+#if !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES)
+"""
+
+cfooterMVEF="""
#endif /* !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES) */
#endif /* defined(ARM_MATH_MVEF) && !defined(ARM_MATH_AUTOVECTORIZE) */
"""
+cifdeMVEI="""#include "arm_math.h"
+
+#if defined(ARM_MATH_MVEI)
+
+#if !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES)
+"""
+
+cfooterMVEI="""
+
+#endif /* !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES) */
+#endif /* defined(ARM_MATH_MVEI) */
+"""
+
hheader="""/* ----------------------------------------------------------------------
* Project: CMSIS DSP Library
* Title: arm_mve_tables.h
@@ -236,31 +370,87 @@
#include "arm_math.h"
- #if defined(ARM_MATH_MVEF) && !defined(ARM_MATH_AUTOVECTORIZE)
-
- #if !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES)
+
"""
-hfooter="""
+hifdefMVEF="""
+#if defined(ARM_MATH_MVEF) && !defined(ARM_MATH_AUTOVECTORIZE)
+
+#if !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES)
+"""
+
+hfooterMVEF="""
#endif /* !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES) */
#endif /* defined(ARM_MATH_MVEF) && !defined(ARM_MATH_AUTOVECTORIZE) */
+"""
+
+hifdefMVEI="""
+#if defined(ARM_MATH_MVEI)
+
+#if !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES)
+"""
+
+hfooterMVEI="""
+#endif /* !defined(ARM_DSP_CONFIG_TABLES) || defined(ARM_FFT_ALLOW_TABLES) */
+
+#endif /* defined(ARM_MATH_MVEI) */
+
+"""
+
+hfooter="""
#endif /*_ARM_MVE_TABLES_H*/
"""
+
+
with open(args.f,'w') as f:
with open(args.he,'w') as h:
print(cheader,file=f)
print(hheader,file=h)
- reorderTwiddle(f,h,16)
- reorderTwiddle(f,h,64)
- reorderTwiddle(f,h,256)
- reorderTwiddle(f,h,1024)
- reorderTwiddle(f,h,4096)
+
+ print(cifdeMVEF,file=f)
+ print(hifdefMVEF,file=h)
+ reorderTwiddle(F32,False,f,h,16)
+ reorderTwiddle(F32,False,f,h,64)
+ reorderTwiddle(F32,False,f,h,256)
+ reorderTwiddle(F32,False,f,h,1024)
+ reorderTwiddle(F32,False,f,h,4096)
+ print(cfooterMVEF,file=f)
+ print(hfooterMVEF,file=h)
- print(cfooter,file=f)
+ print(cifdeMVEI,file=f)
+ print(hifdefMVEI,file=h)
+ reorderTwiddle(Q31,True,f,h,16)
+ reorderTwiddle(Q31,True,f,h,64)
+ reorderTwiddle(Q31,True,f,h,256)
+ reorderTwiddle(Q31,True,f,h,1024)
+ reorderTwiddle(Q31,True,f,h,4096)
+ print(cfooterMVEI,file=f)
+ print(hfooterMVEI,file=h)
+
+ print(cifdeMVEI,file=f)
+ print(hifdefMVEI,file=h)
+ reorderTwiddle(Q15,True,f,h,16)
+ reorderTwiddle(Q15,True,f,h,64)
+ reorderTwiddle(Q15,True,f,h,256)
+ reorderTwiddle(Q15,True,f,h,1024)
+ reorderTwiddle(Q15,True,f,h,4096)
+ print(cfooterMVEI,file=f)
+ print(hfooterMVEI,file=h)
+
+ print(cifdeMVEI,file=f)
+ print(hifdefMVEI,file=h)
+ reorderTwiddle(Q7,True,f,h,16)
+ reorderTwiddle(Q7,True,f,h,64)
+ reorderTwiddle(Q7,True,f,h,256)
+ reorderTwiddle(Q7,True,f,h,1024)
+ reorderTwiddle(Q7,True,f,h,4096)
+ print(cfooterMVEI,file=f)
+ print(hfooterMVEI,file=h)
+
print(hfooter,file=h)