Fixed PR57 merge conflicts

eembc · Feb 6, 2023 · e6f62f4 · e6f62f4
1 parent dfd77e0
commit e6f62f4
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 27 deletions.
diff --git 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-01-23T10:45:41" tool="csolution 1.3.0"/>
+  <created timestamp="2023-02-01T19:51:56" tool="csolution 1.3.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -23,8 +23,8 @@
     <output intdir="tmp/audiomark_app/MPS3-Corstone-300/Release" name="audiomark_app.Release+MPS3-Corstone-300" outdir="out/audiomark_app/MPS3-Corstone-300/Release" rtedir="RTE" type="exe"/>
     <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
-    <cflags add="-std=gnu11 -Ofast -g -ffast-math -fshort-enums -fshort-wchar" compiler="AC6"/>
-    <cxxflags add="-std=c++11 -Ofast -ffast-math -fno-rtti" compiler="AC6"/>
+    <cflags add="-std=gnu11 -Ofast -g -ffast-math -fshort-enums -fshort-wchar -DOS_SUPPORT_CUSTOM" compiler="AC6"/>
+    <cxxflags add="-std=c++11 -Ofast -ffast-math -fno-rtti -DOS_SUPPORT_CUSTOM" compiler="AC6"/>
     <ldflags add="--info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/SSE-300-MPS3/fvp_sse300_mps3_s.sct"/>
     <includes>.;../../lib/speexdsp/include;../../lib/speexdsp/libspeexdsp;../../ports/arm/;../../ports/arm/libs/CMSIS-NN/Include;../../src/;../../lib/speexdsp/include/speex/;../../lib/speexdsp/</includes>
   </target>
@@ -33,7 +33,7 @@
     <component Cclass="CMSIS Driver" Cgroup="USART" Cvendor="ARM" Cversion="1.0.0"/>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
     <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.14.2">
-      <cflags add="-DARM_DSP_CONFIG_TABLES -DARM_FAST_ALLOW_TABLES -DARM_FFT_ALLOW_TABLES -DARM_ALL_FAST_TABLES -DARM_MATH_LOOPUNROLL -DARM_TABLE_BITREVIDX_FXT_128 -DARM_TABLE_BITREVIDX_FXT_256 -DARM_TABLE_BITREVIDX_FXT_512 -DARM_TABLE_TWIDDLECOEF_F32_128 -DARM_TABLE_BITREVIDX_FLT_128 -DARM_TABLE_TWIDDLECOEF_F32_256 -DARM_TABLE_BITREVIDX_FLT_256 -DARM_TABLE_TWIDDLECOEF_F32_512 -DARM_TABLE_BITREVIDX_FLT_512 -DARM_TABLE_TWIDDLECOEF_RFFT_F32_128 -DARM_TABLE_TWIDDLECOEF_RFFT_F32_256 -DARM_TABLE_TWIDDLECOEF_RFFT_F32_512" compiler="AC6"/>
+      <cflags add="-DARM_DSP_CONFIG_TABLES -DARM_FAST_ALLOW_TABLES -DARM_FFT_ALLOW_TABLES -DARM_ALL_FAST_TABLES -DARM_MATH_LOOPUNROLL -DARM_TABLE_BITREVIDX_FXT_128 -DARM_TABLE_BITREVIDX_FXT_256 -DARM_TABLE_BITREVIDX_FXT_512 -DARM_TABLE_TWIDDLECOEF_F32_128 -DARM_TABLE_BITREVIDX_FLT_128 -DARM_TABLE_TWIDDLECOEF_F32_256 -DARM_TABLE_BITREVIDX_FLT_256 -DARM_TABLE_TWIDDLECOEF_F32_512 -DARM_TABLE_BITREVIDX_FLT_512 -DARM_TABLE_TWIDDLECOEF_RFFT_F32_128 -DARM_TABLE_TWIDDLECOEF_RFFT_F32_256 -DARM_TABLE_TWIDDLECOEF_RFFT_F32_512 -DARM_TABLE_TWIDDLECOEF_RFFT_F32_1024" compiler="AC6"/>
     </component>
     <component Cclass="CMSIS" Cgroup="NN Lib" Cvendor="ARM" Cversion="4.0.0"/>
     <component Cclass="Device" Cgroup="Definition" Cvendor="ARM" Cversion="1.2.0" rtedir="RTE">
@@ -80,7 +80,7 @@
       <file category="sourceC" name="stdout_USART.c"/>
     </group>
     <group name="Libspeex">
-      <cflags add="-DUSE_CMSIS_DSP -DFLOATING_POINT -DOS_SUPPORT_CUSTOM -DOVERRIDE_FB_COMPUTE_BANK32 -DOVERRIDE_FB_COMPUTE_PSD16 -DOVERRIDE_ANR_VEC_MUL -DOVERRIDE_ANR_UPDATE_NOISE_ESTIMATE -DOVERRIDE_ANR_APOSTERIORI_SNR -DOVERRIDE_ANR_POWER_SPECTRUM -DOVERRIDE_ANR_COMPUTE_GAIN_FLOOR -DOVERRIDE_ANR_UPDATE_ZETA -DOVERRIDE_ANR_UPDATE_GAINS_CRITICAL_BANDS -DOVERRIDE_ANR_UPDATE_GAINS_LINEAR -DOVERRIDE_ANR_APPLY_SPEC_GAIN -DOVERRIDE_ANR_OLA -DOVERRIDE_ANR_UPDATE_NOISE_PROB -DOVERRIDE_MDF_DC_NOTCH -DOVERRIDE_MDF_INNER_PROD -DOVERRIDE_MDF_POWER_SPECTRUM -DOVERRIDE_MDF_POWER_SPECTRUM_ACCUM -DOVERRIDE_MDF_SPECTRAL_MUL_ACCUM -DOVERRIDE_MDF_WEIGHT_SPECT_MUL_CONJ -DOVERRIDE_MDF_ADJUST_PROP -DOVERRIDE_MDF_PREEMPH_FLT -DOVERRIDE_MDF_STRIDED_PREEMPH_FLT -DOVERRIDE_MDF_VEC_SUB -DOVERRIDE_MDF_VEC_SUB16 -DOVERRIDE_MDF_VEC_ADD -DOVERRIDE_MDF_SMOOTHED_ADD -DOVERRIDE_MDF_DEEMPH -DOVERRIDE_MDF_SMOOTH_FE_NRG -DOVERRIDE_MDF_FILTERED_SPEC_AD_XCORR -DOVERRIDE_MDF_NORM_LEARN_RATE_CALC -DOVERRIDE_MDF_CONVERG_LEARN_RATE_CALC -DOVERRIDE_MDF_VEC_SCALE -DEXPORT=/**/" compiler="AC6"/>
+      <cflags add="-DUSE_CMSIS_DSP -DFLOATING_POINT -DOVERRIDE_FB_COMPUTE_BANK32 -DOVERRIDE_FB_COMPUTE_PSD16 -DOVERRIDE_ANR_VEC_MUL -DOVERRIDE_ANR_UPDATE_NOISE_ESTIMATE -DOVERRIDE_ANR_APOSTERIORI_SNR -DOVERRIDE_ANR_POWER_SPECTRUM -DOVERRIDE_ANR_COMPUTE_GAIN_FLOOR -DOVERRIDE_ANR_UPDATE_ZETA -DOVERRIDE_ANR_UPDATE_GAINS_CRITICAL_BANDS -DOVERRIDE_ANR_UPDATE_GAINS_LINEAR -DOVERRIDE_ANR_APPLY_SPEC_GAIN -DOVERRIDE_ANR_OLA -DOVERRIDE_ANR_UPDATE_NOISE_PROB -DOVERRIDE_MDF_DC_NOTCH -DOVERRIDE_MDF_INNER_PROD -DOVERRIDE_MDF_POWER_SPECTRUM -DOVERRIDE_MDF_POWER_SPECTRUM_ACCUM -DOVERRIDE_MDF_SPECTRAL_MUL_ACCUM -DOVERRIDE_MDF_WEIGHT_SPECT_MUL_CONJ -DOVERRIDE_MDF_ADJUST_PROP -DOVERRIDE_MDF_PREEMPH_FLT -DOVERRIDE_MDF_STRIDED_PREEMPH_FLT -DOVERRIDE_MDF_VEC_SUB -DOVERRIDE_MDF_VEC_SUB16 -DOVERRIDE_MDF_VEC_ADD -DOVERRIDE_MDF_SMOOTHED_ADD -DOVERRIDE_MDF_DEEMPH -DOVERRIDE_MDF_SMOOTH_FE_NRG -DOVERRIDE_MDF_FILTERED_SPEC_AD_XCORR -DOVERRIDE_MDF_NORM_LEARN_RATE_CALC -DOVERRIDE_MDF_CONVERG_LEARN_RATE_CALC -DOVERRIDE_MDF_VEC_SCALE -DEXPORT=/**/" compiler="AC6"/>
       <file category="sourceC" name="../../lib/speexdsp/libspeexdsp/buffer.c"/>
       <file category="sourceC" name="../../lib/speexdsp/libspeexdsp/fftwrap.c"/>
       <file category="sourceC" name="../../lib/speexdsp/libspeexdsp/filterbank.c"/>

diff --git a/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvoptx b/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvoptx
@@ -135,7 +135,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ULP2V8M</Key>
-          <Name>-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</Name>
+          <Name>-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</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -165,9 +165,9 @@
         <aSer3>0</aSer3>
         <eProf>0</eProf>
         <aLa>0</aLa>
-        <aPa1>1</aPa1>
+        <aPa1>0</aPa1>
         <AscS4>0</AscS4>
-        <aSer4>1</aSer4>
+        <aSer4>0</aSer4>
         <StkLoc>0</StkLoc>
         <TrcWin>0</TrcWin>
         <newCpu>0</newCpu>
@@ -190,15 +190,15 @@
         <Enable>0</Enable>
         <EnableFlashSeq>1</EnableFlashSeq>
         <EnableLog>0</EnableLog>
-        <Protocol>2</Protocol>
+        <Protocol>1</Protocol>
         <DbgClock>10000000</DbgClock>
       </DebugDescription>
     </TargetOption>
   </Target>
 
   <Group>
     <GroupName>App</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -266,7 +266,7 @@
 
   <Group>
     <GroupName>AudioMarkCore</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -378,7 +378,7 @@
 
   <Group>
     <GroupName>Libspeex</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

diff --git a/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvprojx b/platform/cmsis/audiomark_app.Release+MPS3-Corstone-300.uvprojx
@@ -10,7 +10,8 @@
       <TargetName>Release+MPS3-Corstone-300</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
+      <pArmCC>6190000::V6.19::.\ARMCLANG6.19</pArmCC>
+      <pCCUsed>6190000::V6.19::.\ARMCLANG6.19</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -49,7 +50,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>out\audiomark_app\MPS3-Corstone-300\Release\</OutputDirectory>
-          <OutputName>audiomark_app</OutputName>
+          <OutputName>audiomrk</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
@@ -129,16 +130,16 @@
         </DebugOption>
         <Utilities>
           <Flash1>
-            <UseTargetDll>0</UseTargetDll>
-            <UseExternalTool>1</UseExternalTool>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
             <RunIndependent>0</RunIndependent>
             <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
-            <DriverSelection>4102</DriverSelection>
+            <DriverSelection>-1</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -183,7 +184,7 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>1</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>2</RvdsVP>
+            <RvdsVP>3</RvdsVP>
             <RvdsMve>2</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
             <nBranchProt>0</nBranchProt>
@@ -338,7 +339,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-ffast-math</MiscControls>
-              <Define></Define>
+              <Define>OS_SUPPORT_CUSTOM</Define>
               <Undefine></Undefine>
               <IncludePath>.;../../lib/speexdsp/include;../../lib/speexdsp/libspeexdsp;../../ports/arm/;../../ports/arm/libs/CMSIS-NN/Include;../../src/;../../lib/speexdsp/include/speex/;../../lib/speexdsp/</IncludePath>
             </VariousControls>
@@ -353,7 +354,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <ClangAsOpt>2</ClangAsOpt>
+            <ClangAsOpt>1</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -457,7 +458,7 @@
                 <v6Rtti>2</v6Rtti>
                 <VariousControls>
                   <MiscControls></MiscControls>
-                  <Define>FLOATING_POINT OS_SUPPORT_CUSTOM</Define>
+                  <Define>FLOATING_POINT</Define>
                   <Undefine></Undefine>
                   <IncludePath></IncludePath>
                 </VariousControls>
@@ -576,7 +577,7 @@
                 <v6Rtti>2</v6Rtti>
                 <VariousControls>
                   <MiscControls></MiscControls>
-                  <Define>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=/**/</Define>
+                  <Define>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=/**/</Define>
                   <Undefine></Undefine>
                   <IncludePath></IncludePath>
                 </VariousControls>
@@ -743,7 +744,7 @@
         <targetInfos>
           <targetInfo name="Release+MPS3-Corstone-300" versionMatchMode="fixed">
             <c>
-              <Define>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</Define>
+              <Define>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</Define>
               <MiscControls/>
             </c>
           </targetInfo>

diff --git 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
@@ -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
@@ -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
@@ -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);