1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
Index: ne10-1.2.1/modules/dsp/NE10_fft.neonintrinsic.h
===================================================================
--- ne10-1.2.1.orig/modules/dsp/NE10_fft.neonintrinsic.h
+++ ne10-1.2.1/modules/dsp/NE10_fft.neonintrinsic.h
@@ -112,14 +112,14 @@
#define CONST_TW_81 0.70710678
#define CONST_TW_81N -0.70710678
-const static float32x4_t Q_TW_81 = VDUPQ_N_F32(CONST_TW_81 );
-const static float32x4_t Q_TW_81N = VDUPQ_N_F32(CONST_TW_81N);
+static const float32x4_t Q_TW_81 = VDUPQ_N_F32(CONST_TW_81 );
+static const float32x4_t Q_TW_81N = VDUPQ_N_F32(CONST_TW_81N);
#define DIV_TW81 1.4142136f
#define DIV_TW81N -1.4142136f
-const static float32x4_t DIV_TW81_NEON = VDUPQ_N_F32(DIV_TW81);
-const static float32x4_t DIV_TW81N_NEON = VDUPQ_N_F32(DIV_TW81N);
+static const float32x4_t DIV_TW81_NEON = VDUPQ_N_F32(DIV_TW81);
+static const float32x4_t DIV_TW81N_NEON = VDUPQ_N_F32(DIV_TW81N);
#define NE10_RADIX8x4_R2C_NEON_KERNEL_S1(Q_OUT,Q_IN) do { \
Q_OUT ## 0 = vaddq_f32 (Q_IN ## 0, Q_IN ## 4); \
Index: ne10-1.2.1/modules/dsp/NE10_fft_common_varibles.h
===================================================================
--- ne10-1.2.1.orig/modules/dsp/NE10_fft_common_varibles.h
+++ ne10-1.2.1/modules/dsp/NE10_fft_common_varibles.h
@@ -39,36 +39,36 @@
///////////////////////////
/* Twiddles used in Radix-8 FFT */
-const static ne10_float32_t TW_81_F32 = 0.70710678; // sqrt (2) / 2
-const static ne10_float32_t TW_81N_F32 = -0.70710678; // - TW_81_F32
+static const ne10_float32_t TW_81_F32 = 0.70710678; // sqrt (2) / 2
+static const ne10_float32_t TW_81N_F32 = -0.70710678; // - TW_81_F32
/* Twiddles used in Radix-5 FFT */
-const static ne10_fft_cpx_float32_t TW_5A_F32 =
+static const ne10_fft_cpx_float32_t TW_5A_F32 =
{
0.309016994374947, // cos (2 * pi / 5)
-0.951056516295154 // - sin (2 * pi / 5)
};
-const static ne10_fft_cpx_int32_t TW_5A_S32 =
+static const ne10_fft_cpx_int32_t TW_5A_S32 =
{
663608942, // round (TW_5A_F32.r * 2^31)
-2042378317 // round (TW_5A_F32.i * 2^31)
};
-const static ne10_fft_cpx_float32_t TW_5B_F32 =
+static const ne10_fft_cpx_float32_t TW_5B_F32 =
{
-0.809016994374947, // cos (4 * pi / 5)
-0.587785252292473 // - sin (4 * pi / 5)
};
-const static ne10_fft_cpx_int32_t TW_5B_S32 =
+static const ne10_fft_cpx_int32_t TW_5B_S32 =
{
-1737350766, // round (TW_5B_F32.r * 2^31)
-1262259218 // round (TW_5B_F32.i * 2^31)
};
/* Twiddles used in Radix-3 FFT */
-const static ne10_float32_t TW_3I_F32 = 0.866025403784439; // sqrt (3) / 2
-const static ne10_float32_t TW_3IN_F32 = - 0.866025403784439; // - TW_3IN_F32
-const static ne10_int32_t TW_3I_S32 = 1859775393; // round (TW_3I_F32 * 2^31)
-const static ne10_int32_t TW_3IN_S32 = -1859775393; // round (TW_3IN_F32 * 2^31)
+static const ne10_float32_t TW_3I_F32 = 0.866025403784439; // sqrt (3) / 2
+static const ne10_float32_t TW_3IN_F32 = - 0.866025403784439; // - TW_3IN_F32
+static const ne10_int32_t TW_3I_S32 = 1859775393; // round (TW_3I_F32 * 2^31)
+static const ne10_int32_t TW_3IN_S32 = -1859775393; // round (TW_3IN_F32 * 2^31)
#endif // NE10_FFT_COMMON_VARIBLES_H
Index: ne10-1.2.1/modules/dsp/NE10_fft_generic_float32.h
===================================================================
--- ne10-1.2.1.orig/modules/dsp/NE10_fft_generic_float32.h
+++ ne10-1.2.1/modules/dsp/NE10_fft_generic_float32.h
@@ -83,7 +83,7 @@ static inline void FFT8_FCU (ne10_fft_cp
{
ne10_fft_cpx_float32_t s[8];
- const static ne10_fft_cpx_float32_t TW_8[4] = {
+ static const ne10_fft_cpx_float32_t TW_8[4] = {
{ 1.00000, 0.00000 },
{ 0.70711, -0.70711 },
{ 0.00000, -1.00000 },
Index: ne10-1.2.1/modules/dsp/NE10_fft_generic_float32.neonintrinsic.cpp
===================================================================
--- ne10-1.2.1.orig/modules/dsp/NE10_fft_generic_float32.neonintrinsic.cpp
+++ ne10-1.2.1/modules/dsp/NE10_fft_generic_float32.neonintrinsic.cpp
@@ -343,7 +343,7 @@ static inline void NE10_FFT8_FUC_NEON_F3
const CPLX in[8])
{
CPLX s[8];
- const static ne10_fft_cpx_float32_t TW_8[4] =
+ static const ne10_fft_cpx_float32_t TW_8[4] =
{
{ 1.00000, 0.00000 },
{ 0.70711, -0.70711 },
Index: ne10-1.2.1/CMakeLists.txt
===================================================================
--- ne10-1.2.1.orig/CMakeLists.txt
+++ ne10-1.2.1/CMakeLists.txt
@@ -93,10 +93,10 @@ option(NE10_ENABLE_IMGPROC "Build image
set(NE10_VERSION 10)
if(BUILD_DEBUG)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing -O0 -DDEBUG -g -Wall -Wno-unused-but-set-variable")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcommon -fno-strict-aliasing -O0 -DDEBUG -g -Wall -Wno-unused-but-set-variable")
message("-- Building type: DEBUG")
else(BUILD_DEBUG)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing -O2 -DNDEBUG")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcommon -fno-strict-aliasing -O2 -DNDEBUG")
message("-- Building type: RELEASE")
endif(BUILD_DEBUG)
|
