From e6f62f4b9d22d91e03b9ac5c89d4386d236523bc Mon Sep 17 00:00:00 2001 From: fabkle01 Date: Mon, 6 Feb 2023 09:54:45 +0100 Subject: [PATCH] Fixed PR57 merge conflicts --- platform/cmsis/audiomark.csolution.yml | 6 ++++- ...diomark_app.Release+MPS3-Corstone-300.cprj | 10 ++++---- ...omark_app.Release+MPS3-Corstone-300.uvoptx | 14 +++++------ ...mark_app.Release+MPS3-Corstone-300.uvprojx | 25 ++++++++++--------- platform/cmsis/audiomark_app.cproject.yml | 1 + platform/cmsis/speex.clayer.yml | 1 - platform/cmsis/testkws.cproject.yml | 1 + src/ee_mfcc_f32.c | 2 +- 8 files changed, 33 insertions(+), 27 deletions(-) mode change 100644 => 100755 platform/cmsis/audiomark.csolution.yml mode change 100644 => 100755 platform/cmsis/speex.clayer.yml mode change 100644 => 100755 src/ee_mfcc_f32.c diff --git a/platform/cmsis/audiomark.csolution.yml b/platform/cmsis/audiomark.csolution.yml old mode 100644 new mode 100755 index 49ab5b0..510da97 --- a/platform/cmsis/audiomark.csolution.yml +++ b/platform/cmsis/audiomark.csolution.yml @@ -33,7 +33,11 @@ solution: target-types: - type: MPS3-Corstone-300 device: ARM::SSE-300-MPS3 - + misc: + - C: + - -DOS_SUPPORT_CUSTOM + - CPP: + - -DOS_SUPPORT_CUSTOM #- Link: # - --scatter=./fvp_sse300_mps3_ns_sct/fvp_sse300_mps3_ns.sct diff --git a/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.cprj b/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.cprj index b6e4967..3fdf08c 100755 --- a/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.cprj +++ b/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.cprj @@ -1,6 +1,6 @@ - + Automatically generated project @@ -23,8 +23,8 @@ - - + + .;../../lib/speexdsp/include;../../lib/speexdsp/libspeexdsp;../../ports/arm/;../../ports/arm/libs/CMSIS-NN/Include;../../src/;../../lib/speexdsp/include/speex/;../../lib/speexdsp/ @@ -33,7 +33,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvoptx b/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvoptx index f3b6130..eb1540e 100755 --- a/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvoptx +++ b/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvoptx @@ -135,7 +135,7 @@ 0 ULP2V8M - -UP1521872 -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(4C013477) -L00(0) -TO77843 -TC32000000 -TT10000000 -TP8 -TDX5 -TDD0 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD1000000 -FC1000 -FN0 + -UAny -O142 -S8 -C0 -P00000000 -N00("ARM CoreSight JTAG-DP") -D00(4BA06477) -L00(4) -TO69651 -TC10000000 -TT10000000 -TP8 -TDX0 -TDD0 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD1000000 -FC1000 -FN0 0 @@ -165,9 +165,9 @@ 0 0 0 - 1 + 0 0 - 1 + 0 0 0 0 @@ -190,7 +190,7 @@ 0 1 0 - 2 + 1 10000000 @@ -198,7 +198,7 @@ App - 1 + 0 0 0 0 @@ -266,7 +266,7 @@ AudioMarkCore - 1 + 0 0 0 0 @@ -378,7 +378,7 @@ Libspeex - 1 + 0 0 0 0 diff --git a/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvprojx b/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvprojx index e34d738..88d2085 100755 --- a/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvprojx +++ b/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvprojx @@ -10,7 +10,8 @@ Release+MPS3-Corstone-300 0x4 ARM-ADS - 6190000::V6.19::ARMCLANG + 6190000::V6.19::.\ARMCLANG6.19 + 6190000::V6.19::.\ARMCLANG6.19 1 @@ -49,7 +50,7 @@ 1 out\audiomark_app\MPS3-Corstone-300\Release\ - audiomark_app + audiomrk 1 0 0 @@ -129,16 +130,16 @@ - 0 - 1 + 1 + 0 0 1 1 - 4102 + -1 1 BIN\UL2V8M.DLL - "" () + @@ -183,7 +184,7 @@ 1 1 0 - 2 + 3 2 0 0 @@ -338,7 +339,7 @@ 0 -ffast-math - + OS_SUPPORT_CUSTOM .;../../lib/speexdsp/include;../../lib/speexdsp/libspeexdsp;../../ports/arm/;../../ports/arm/libs/CMSIS-NN/Include;../../src/;../../lib/speexdsp/include/speex/;../../lib/speexdsp/ @@ -353,7 +354,7 @@ 0 0 0 - 2 + 1 @@ -457,7 +458,7 @@ 2 - FLOATING_POINT OS_SUPPORT_CUSTOM + FLOATING_POINT @@ -576,7 +577,7 @@ 2 - USE_CMSIS_DSP FLOATING_POINT OS_SUPPORT_CUSTOM OVERRIDE_FB_COMPUTE_BANK32 OVERRIDE_FB_COMPUTE_PSD16 OVERRIDE_ANR_VEC_MUL OVERRIDE_ANR_UPDATE_NOISE_ESTIMATE OVERRIDE_ANR_APOSTERIORI_SNR OVERRIDE_ANR_POWER_SPECTRUM OVERRIDE_ANR_COMPUTE_GAIN_FLOOR OVERRIDE_ANR_UPDATE_ZETA OVERRIDE_ANR_UPDATE_GAINS_CRITICAL_BANDS OVERRIDE_ANR_UPDATE_GAINS_LINEAR OVERRIDE_ANR_APPLY_SPEC_GAIN OVERRIDE_ANR_OLA OVERRIDE_ANR_UPDATE_NOISE_PROB OVERRIDE_MDF_DC_NOTCH OVERRIDE_MDF_INNER_PROD OVERRIDE_MDF_POWER_SPECTRUM OVERRIDE_MDF_POWER_SPECTRUM_ACCUM OVERRIDE_MDF_SPECTRAL_MUL_ACCUM OVERRIDE_MDF_WEIGHT_SPECT_MUL_CONJ OVERRIDE_MDF_ADJUST_PROP OVERRIDE_MDF_PREEMPH_FLT OVERRIDE_MDF_STRIDED_PREEMPH_FLT OVERRIDE_MDF_VEC_SUB OVERRIDE_MDF_VEC_SUB16 OVERRIDE_MDF_VEC_ADD OVERRIDE_MDF_SMOOTHED_ADD OVERRIDE_MDF_DEEMPH OVERRIDE_MDF_SMOOTH_FE_NRG OVERRIDE_MDF_FILTERED_SPEC_AD_XCORR OVERRIDE_MDF_NORM_LEARN_RATE_CALC OVERRIDE_MDF_CONVERG_LEARN_RATE_CALC OVERRIDE_MDF_VEC_SCALE EXPORT=/**/ + USE_CMSIS_DSP FLOATING_POINT OVERRIDE_FB_COMPUTE_BANK32 OVERRIDE_FB_COMPUTE_PSD16 OVERRIDE_ANR_VEC_MUL OVERRIDE_ANR_UPDATE_NOISE_ESTIMATE OVERRIDE_ANR_APOSTERIORI_SNR OVERRIDE_ANR_POWER_SPECTRUM OVERRIDE_ANR_COMPUTE_GAIN_FLOOR OVERRIDE_ANR_UPDATE_ZETA OVERRIDE_ANR_UPDATE_GAINS_CRITICAL_BANDS OVERRIDE_ANR_UPDATE_GAINS_LINEAR OVERRIDE_ANR_APPLY_SPEC_GAIN OVERRIDE_ANR_OLA OVERRIDE_ANR_UPDATE_NOISE_PROB OVERRIDE_MDF_DC_NOTCH OVERRIDE_MDF_INNER_PROD OVERRIDE_MDF_POWER_SPECTRUM OVERRIDE_MDF_POWER_SPECTRUM_ACCUM OVERRIDE_MDF_SPECTRAL_MUL_ACCUM OVERRIDE_MDF_WEIGHT_SPECT_MUL_CONJ OVERRIDE_MDF_ADJUST_PROP OVERRIDE_MDF_PREEMPH_FLT OVERRIDE_MDF_STRIDED_PREEMPH_FLT OVERRIDE_MDF_VEC_SUB OVERRIDE_MDF_VEC_SUB16 OVERRIDE_MDF_VEC_ADD OVERRIDE_MDF_SMOOTHED_ADD OVERRIDE_MDF_DEEMPH OVERRIDE_MDF_SMOOTH_FE_NRG OVERRIDE_MDF_FILTERED_SPEC_AD_XCORR OVERRIDE_MDF_NORM_LEARN_RATE_CALC OVERRIDE_MDF_CONVERG_LEARN_RATE_CALC OVERRIDE_MDF_VEC_SCALE EXPORT=/**/ @@ -743,7 +744,7 @@ - ARM_DSP_CONFIG_TABLES ARM_FAST_ALLOW_TABLES ARM_FFT_ALLOW_TABLES ARM_ALL_FAST_TABLES ARM_MATH_LOOPUNROLL ARM_TABLE_BITREVIDX_FXT_128 ARM_TABLE_BITREVIDX_FXT_256 ARM_TABLE_BITREVIDX_FXT_512 ARM_TABLE_TWIDDLECOEF_F32_128 ARM_TABLE_BITREVIDX_FLT_128 ARM_TABLE_TWIDDLECOEF_F32_256 ARM_TABLE_BITREVIDX_FLT_256 ARM_TABLE_TWIDDLECOEF_F32_512 ARM_TABLE_BITREVIDX_FLT_512 ARM_TABLE_TWIDDLECOEF_RFFT_F32_128 ARM_TABLE_TWIDDLECOEF_RFFT_F32_256 ARM_TABLE_TWIDDLECOEF_RFFT_F32_512 + ARM_DSP_CONFIG_TABLES ARM_FAST_ALLOW_TABLES ARM_FFT_ALLOW_TABLES ARM_ALL_FAST_TABLES ARM_MATH_LOOPUNROLL ARM_TABLE_BITREVIDX_FXT_128 ARM_TABLE_BITREVIDX_FXT_256 ARM_TABLE_BITREVIDX_FXT_512 ARM_TABLE_TWIDDLECOEF_F32_128 ARM_TABLE_BITREVIDX_FLT_128 ARM_TABLE_TWIDDLECOEF_F32_256 ARM_TABLE_BITREVIDX_FLT_256 ARM_TABLE_TWIDDLECOEF_F32_512 ARM_TABLE_BITREVIDX_FLT_512 ARM_TABLE_TWIDDLECOEF_RFFT_F32_128 ARM_TABLE_TWIDDLECOEF_RFFT_F32_256 ARM_TABLE_TWIDDLECOEF_RFFT_F32_512 ARM_TABLE_TWIDDLECOEF_RFFT_F32_1024 diff --git a/platform/cmsis/audiomark_app.cproject.yml b/platform/cmsis/audiomark_app.cproject.yml index cfe5db6..4917f51 100755 --- a/platform/cmsis/audiomark_app.cproject.yml +++ b/platform/cmsis/audiomark_app.cproject.yml @@ -37,6 +37,7 @@ project: - -DARM_TABLE_TWIDDLECOEF_RFFT_F32_128 - -DARM_TABLE_TWIDDLECOEF_RFFT_F32_256 - -DARM_TABLE_TWIDDLECOEF_RFFT_F32_512 + - -DARM_TABLE_TWIDDLECOEF_RFFT_F32_1024 - -DARM_ALL_FAST_TABLES diff --git a/platform/cmsis/speex.clayer.yml b/platform/cmsis/speex.clayer.yml old mode 100644 new mode 100755 index 081b529..4f0def2 --- a/platform/cmsis/speex.clayer.yml +++ b/platform/cmsis/speex.clayer.yml @@ -22,7 +22,6 @@ layer: - C: - -DUSE_CMSIS_DSP - -DFLOATING_POINT - - -DOS_SUPPORT_CUSTOM # speex boosted routines # FilterBank - -DOVERRIDE_FB_COMPUTE_BANK32 diff --git a/platform/cmsis/testkws.cproject.yml b/platform/cmsis/testkws.cproject.yml index bc418dd..cb9f791 100755 --- a/platform/cmsis/testkws.cproject.yml +++ b/platform/cmsis/testkws.cproject.yml @@ -36,6 +36,7 @@ project: - -DARM_TABLE_TWIDDLECOEF_RFFT_F32_128 - -DARM_TABLE_TWIDDLECOEF_RFFT_F32_256 - -DARM_TABLE_TWIDDLECOEF_RFFT_F32_512 + - -DARM_TABLE_TWIDDLECOEF_RFFT_F32_1024 layers: - layer: boot.clayer.yml diff --git a/src/ee_mfcc_f32.c b/src/ee_mfcc_f32.c old mode 100644 new mode 100755 index 1ca1965..f9edd55 --- a/src/ee_mfcc_f32.c +++ b/src/ee_mfcc_f32.c @@ -29,7 +29,7 @@ ee_mfcc_f32(mfcc_instance_t *p_inst) /* Multiply by window */ th_multiply_f32( - p_src, (ee_f32_t *)ee_mfcc_window_coefs_f32, p_src, FFT_LEN); + p_src, (ee_f32_t *)ee_mfcc_window_coefs_f32, p_src, EE_NUM_MFCC_WIN_COEFS); /* Compute spectrum magnitude, g_tmp is now the FFT */ th_rfft_f32(&(p_inst->rfft_instance), p_src, p_inst->tmp, 0);