Skip to content

Commit 9f0710c

Browse files
FFT build issues with MSVC
1 parent 4b62e8f commit 9f0710c

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

Ne10/CMSIS_NE10_fft_generic_float32.neonintrisic.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,8 @@ static void ne10_radix_3_butterfly_float32_neon_##ISFIRSTSTAGE##_##ISINVERSE##_#
703703
NE10_CPX_SUB_NEON_F32 (s[0], in[1], in[2]); \
704704
s[3] = in[0]; \
705705
\
706-
s[1].val[0] = vmegq_f32(vmulq_n_f32(s[2].val[0], HALF_NEON_F32)); \
707-
s[1].val[1] = vmegq_f32(vmulq_n_f32(s[2].val[1], HALF_NEON_F32)); \
706+
s[1].val[0] = vnegq_f32(vmulq_n_f32(s[2].val[0], HALF_NEON_F32)); \
707+
s[1].val[1] = vnegq_f32(vmulq_n_f32(s[2].val[1], HALF_NEON_F32)); \
708708
\
709709
s[1].val[0] = vaddq_f32(s[1].val[0],s[3].val[0]); \
710710
s[1].val[1] = vaddq_f32(s[1].val[1],s[3].val[1]); \
@@ -807,8 +807,8 @@ static void ne10_radix_5_butterfly_float32_neon_##ISFIRSTSTAGE##_##ISINVERSE##_#
807807
s[0] = in[0]; \
808808
s[5] = in[0]; \
809809
\
810-
in[0].val[0] = vaddq_f32(in[0].val[0] + vaddq_f32(s[1].val[0] + s[2].val[0])); \
811-
in[0].val[1] = vaddq_f32(in[0].val[1] + vaddq_f32(s[1].val[1] + s[2].val[1])); \
810+
in[0].val[0] = vaddq_f32(in[0].val[0] , vaddq_f32(s[1].val[0] , s[2].val[0])); \
811+
in[0].val[1] = vaddq_f32(in[0].val[1] , vaddq_f32(s[1].val[1] , s[2].val[1])); \
812812
\
813813
s[0].val[0] = NE10_S_MLA_NEON_F32 (s[0].val[0], s[1].val[0], TW_5A_F32.r);\
814814
s[0].val[1] = NE10_S_MLA_NEON_F32 (s[0].val[1], s[1].val[1], TW_5A_F32.r);\

Ne10/CMSIS_NE10_fft_generic_int32.neonintrinsic.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ static inline void NE10_FFT_FCU_NEON_S32_5 (CPLX Fout[5],
368368
scratch[11].val[0] = vaddq_f32(scratch[0].val[0] , vaddq_f32(NE10_S_MUL_NEON_S32 (scratch[7].val[0], TW_5B_S32.r) , NE10_S_MUL_NEON_S32 (scratch[8].val[0], TW_5A_S32.r)));
369369
scratch[11].val[1] = vaddq_f32(scratch[0].val[1] , vaddq_f32(NE10_S_MUL_NEON_S32 (scratch[7].val[1], TW_5B_S32.r) , NE10_S_MUL_NEON_S32 (scratch[8].val[1], TW_5A_S32.r)));
370370

371-
scratch[12].val[0] = -vnegq_f32(vaddq_f32(NE10_S_MUL_NEON_S32 (scratch[10].val[1], TW_5B_S32.i) , NE10_S_MUL_NEON_S32 (scratch[9].val[1], TW_5A_S32.i)));
372-
scratch[12].val[1] = vsubq_f32(NE10_S_MUL_NEON_S32 (scratch[10].val[0], TW_5B_S32.i) , NE10_S_MUL_NEON_S32 (scratch[9].val[0], TW_5A_S32.i));
371+
scratch[12].val[0] = vnegq_f32(vaddq_f32(NE10_S_MUL_NEON_S32 (scratch[10].val[1], TW_5B_S32.i) , NE10_S_MUL_NEON_S32 (scratch[9].val[1], TW_5A_S32.i)));
372+
scratch[12].val[1] = vsubq_f32(NE10_S_MUL_NEON_S32 (scratch[10].val[0], TW_5B_S32.i) , NE10_S_MUL_NEON_S32 (scratch[9].val[0], TW_5A_S32.i));
373373

374374
NE10_CPX_ADD_NEON_S32 (&scratch_in[2], scratch[11], scratch[12]);
375375
NE10_CPX_SUB_NEON_S32 (&scratch_in[3], scratch[11], scratch[12]);

0 commit comments

Comments
 (0)