Skip to content

Commit 8c6bfd5

Browse files
MSVC warnings
Disp chocolatey install log to try to enable cache in the github action
1 parent 335b0e4 commit 8c6bfd5

5 files changed

Lines changed: 18 additions & 23 deletions

File tree

.github/workflows/runwinarm.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
run: |
2626
choco install gow
2727
refreshenv
28+
cat C:/ProgramData/chocolatey/logs/chocolatey.log
2829
2930
- name: Prepare framework
3031
run: |

Include/arm_math_types.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ extern "C"
9595
#pragma warning(disable:4244)
9696
#pragma warning(disable:4456)
9797
#pragma warning(disable:4701)
98+
#pragma warning(disable:4703)
99+
#pragma warning(disable:4310)
98100

99101
#elif defined ( __APPLE_CC__ )
100102
#include <stdint.h>

Ne10/CMSIS_NE10_fft.neonintrinsic.h

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
#include <arm_neon.h>
3838

3939
#define NE10_CPX_ADD_NEON_F32(Z,A,B) do { \
40-
Z.val[0] = A.val[0] + B.val[0]; \
41-
Z.val[1] = A.val[1] + B.val[1]; \
40+
Z.val[0] = vaddq_f32(A.val[0], B.val[0]); \
41+
Z.val[1] = vaddq_f32(A.val[1], B.val[1]); \
4242
} while (0);
4343

4444
#define NE10_CPX_SUB_NEON_F32(Z,A,B) do { \
45-
Z.val[0] = A.val[0] - B.val[0]; \
46-
Z.val[1] = A.val[1] - B.val[1]; \
45+
Z.val[0] = vsubq_f32(A.val[0] , B.val[0]); \
46+
Z.val[1] = vsubq_f32(A.val[1] , B.val[1]); \
4747
} while (0);
4848

4949
#define NE10_CPX_MUL_NEON_F32(Z,A,B) do { \
@@ -111,16 +111,10 @@
111111
#define VDUPQ_N_F32(VAR) { VAR, VAR, VAR, VAR }
112112

113113
#define CONST_TW_81 0.70710678f
114-
#define CONST_TW_81N -0.70710678f
115-
116-
static const float32x4_t Q_TW_81 = VDUPQ_N_F32(CONST_TW_81 );
117-
static const float32x4_t Q_TW_81N = VDUPQ_N_F32(CONST_TW_81N);
114+
#define CONST_TW_81N (-0.70710678f)
118115

119116
#define DIV_TW81 1.4142136f
120-
#define DIV_TW81N -1.4142136f
121-
122-
static const float32x4_t DIV_TW81_NEON = VDUPQ_N_F32(DIV_TW81);
123-
static const float32x4_t DIV_TW81N_NEON = VDUPQ_N_F32(DIV_TW81N);
117+
#define DIV_TW81N (-1.4142136f)
124118

125119
#define NE10_RADIX8x4_R2C_NEON_KERNEL_S1(Q_OUT,Q_IN) do { \
126120
Q_OUT ## 0 = vaddq_f32 (Q_IN ## 0, Q_IN ## 4); \
@@ -131,8 +125,8 @@ static const float32x4_t DIV_TW81N_NEON = VDUPQ_N_F32(DIV_TW81N);
131125
Q_OUT ## 5 = vsubq_f32 (Q_IN ## 2, Q_IN ## 6); \
132126
Q_OUT ## 6 = vaddq_f32 (Q_IN ## 3, Q_IN ## 7); \
133127
Q_OUT ## 7 = vsubq_f32 (Q_IN ## 3, Q_IN ## 7); \
134-
Q_OUT ## 3 = vmulq_f32 (Q_OUT ## 3, Q_TW_81 ); \
135-
Q_OUT ## 7 = vmulq_f32 (Q_OUT ## 7, Q_TW_81N); \
128+
Q_OUT ## 3 = vmulq_n_f32 (Q_OUT ## 3, CONST_TW_81 ); \
129+
Q_OUT ## 7 = vmulq_n_f32 (Q_OUT ## 7, CONST_TW_81N); \
136130
} while(0);
137131

138132
#define NE10_RADIX8x4_R2C_NEON_KERNEL_S2(Q_OUT,Q_IN) do { \
@@ -172,8 +166,8 @@ static const float32x4_t DIV_TW81N_NEON = VDUPQ_N_F32(DIV_TW81N);
172166
} while (0);
173167

174168
#define NE10_RADIX8x4_C2R_NEON_KERNEL_S2(Q_OUT,Q_IN) do { \
175-
Q_IN ## 3 = vmulq_f32(Q_IN ## 3,DIV_TW81_NEON); \
176-
Q_IN ## 7 = vmulq_f32(Q_IN ## 7,DIV_TW81N_NEON); \
169+
Q_IN ## 3 = vmulq_n_f32(Q_IN ## 3,DIV_TW81); \
170+
Q_IN ## 7 = vmulq_n_f32(Q_IN ## 7,DIV_TW81N); \
177171
Q_OUT ## 0 = vaddq_f32(Q_IN ## 0, Q_IN ## 1); \
178172
Q_OUT ## 4 = vsubq_f32(Q_IN ## 0, Q_IN ## 1); \
179173
Q_OUT ## 1 = vaddq_f32(Q_IN ## 2, Q_IN ## 3); \
@@ -330,8 +324,8 @@ static const float32x4_t DIV_TW81N_NEON = VDUPQ_N_F32(DIV_TW81N);
330324

331325
#define NE10_RADIX4x4_R2C_TW_NEON_KERNEL_LAST(Q_OUT,Q_IN) do { \
332326
float32x4_t Q_TMP; \
333-
Q_IN ## 1 = vmulq_f32(Q_IN ## 1, Q_TW_81); \
334-
Q_IN ## 3 = vmulq_f32(Q_IN ## 3, Q_TW_81); \
327+
Q_IN ## 1 = vmulq_n_f32(Q_IN ## 1, CONST_TW_81); \
328+
Q_IN ## 3 = vmulq_n_f32(Q_IN ## 3, CONST_TW_81); \
335329
Q_TMP = vsubq_f32(Q_IN ## 1, Q_IN ## 3); \
336330
Q_IN ## 3 = vaddq_f32(Q_IN ## 1, Q_IN ## 3); \
337331
Q_IN ## 1 = Q_TMP; \
@@ -352,8 +346,8 @@ static const float32x4_t DIV_TW81N_NEON = VDUPQ_N_F32(DIV_TW81N);
352346
Q_TMP = vaddq_f32(Q_OUT ## 1, Q_OUT ## 3); \
353347
Q_OUT ## 3 = vsubq_f32(Q_OUT ## 3, Q_OUT ## 1); \
354348
Q_OUT ## 1 = Q_TMP; \
355-
Q_OUT ## 1 = vmulq_f32( Q_OUT ## 1, DIV_TW81_NEON); \
356-
Q_OUT ## 3 = vmulq_f32( Q_OUT ## 3, DIV_TW81_NEON); \
349+
Q_OUT ## 1 = vmulq_n_f32( Q_OUT ## 1, DIV_TW81); \
350+
Q_OUT ## 3 = vmulq_n_f32( Q_OUT ## 3, DIV_TW81); \
357351
Q_OUT ## 0 = vaddq_f32( Q_OUT ## 0, Q_OUT ## 0 ); \
358352
Q_OUT ## 2 = vaddq_f32( Q_OUT ## 2, Q_OUT ## 2 ); \
359353
} while(0);

Ne10/CMSIS_NE10_fft_generic_int32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static inline void NE10_CPX_STORE_S_SCALAR (ne10_fft_cpx_int32_t *Fout, const ne
295295
*/
296296

297297
static inline void NE10_LOAD_BY_STEP_SCALAR_1 (
298-
ne10_fft_cpx_int32_t out[0],
298+
ne10_fft_cpx_int32_t out[1],
299299
const ne10_fft_cpx_int32_t *Fin,
300300
const ne10_int32_t ignored)
301301
{

Source/TransformFunctions/arm_transform_buffer_sizes.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ int32_t arm_rfft_tmp_buffer_size(arm_math_target_arch arch,arm_math_datatype dt,
188188
default:
189189
return(0);
190190
}
191-
return(0);
192191
}
193192

194193
/**
@@ -340,7 +339,6 @@ int32_t arm_mfcc_tmp_buffer_size(arm_math_target_arch arch,
340339
}
341340

342341

343-
return(0);
344342
}
345343

346344
/**

0 commit comments

Comments
 (0)