Merge branch 'ARM-software:main' into fix-pedantic-gcc-warning-in-macros

ARM-software · Mar 4, 2024 · e2c3f2f · e2c3f2f
2 parents e894a5c + f80ed81
commit e2c3f2f
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 11 deletions.
diff --git a/Documentation/Doxygen/dsp.dxy.in b/Documentation/Doxygen/dsp.dxy.in
@@ -500,7 +500,7 @@ NUM_PROC_THREADS = 1
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.
 
-EXTRACT_ALL = YES
+EXTRACT_ALL = NO
 
 # If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
@@ -564,7 +564,7 @@ RESOLVE_UNNAMED_PARAMS = YES
 # section is generated. This option has no effect if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
-HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_MEMBERS = YES
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set

diff --git a/Documentation/Doxygen/src/history.txt b/Documentation/Doxygen/src/history.txt
@@ -0,0 +1,86 @@
+/**
+\page rev_hist Revision History
+<table class="cmtable" summary="Revision History">
+<tr>
+ <th>Version</th>
+ <th>Description</th>
+</tr>
+<tr>
+ <td>v1.15.0</td>
+ <td>
+ v1.15.0
+
+ * Switched to semantic versioning
+ * Corrections to MFCC
+ * Updated support for cmsis build tools 2.0
+ * Compute graph removed. It is now part of CMSIS-Stream
+ * Github issues:
+ * 95,96,105,106,108,111,112
+ * New FFT initializations to allow linker to do code size optimizations
+ * If you know the size of the transform at build time, prefer functions like
+ arm_cfft_init_64_q15 to functions like arm_cfft_init_q15.
+ It applies for CFFT, RFFT and MFCC and other datatypes.
+ </td>
+</tr>
+<tr>
+ <td>v1.14.4</td>
+ <td>
+ Version v1.14.4
+ </td>
+</tr>
+<tr>
+ <td>v1.14.3</td>
+ <td>
+ v1.14.3
+ </td>
+</tr>
+<tr>
+ <td>v1.14.2</td>
+ <td>
+ Bug fixes.
+
+ Bug fixes and improvements to compute graph.
+ </td>
+</tr>
+<tr>
+ <td>v1.14.1</td>
+ <td>
+ Some Neon acceleration for aarch64 f64 kernels
+ </td>
+</tr>
+<tr>
+ <td>v1.14.0</td>
+ <td>
+ Added support for CMSIS Event Recorder to the compute graph.
+ Added more customization options to the compute graph.
+ </td>
+</tr>
+<tr>
+ <td>v1.13.0</td>
+ <td>
+ Added cyclo static scheduling to the CMSIS-DSP compute graph
+ </td>
+</tr>
+<tr>
+ <td>v1.12.0</td>
+ <td>
+ New version of SDF
+ (Renaming and new feature to make it more developer friendly).
+ </td>
+</tr>
+<tr>
+ <td>v1.11.0</td>
+ <td>
+ Improved documentation.
+
+ QR decomposition with Householder transform (float only).
+ </td>
+</tr>
+<tr>
+ <td>v1.10.1</td>
+ <td>
+ First release with new repository
+ </td>
+</tr>
+</table>
+*/
diff --git a/Include/arm_vec_math.h b/Include/arm_vec_math.h
@@ -66,7 +66,7 @@ __STATIC_INLINE f32x4_t vrecip_medprec_f32(
  b = 2.0f - xinv.f * ax;
  xinv.f = xinv.f * b;
 
- xinv.f = vdupq_m(xinv.f, INFINITY, vcmpeqq(x, 0.0f));
+ xinv.f = vdupq_m(xinv.f, F32_MAX, vcmpeqq(x, 0.0f));
  /*
  * restore sign
  */
@@ -103,7 +103,7 @@ __STATIC_INLINE f32x4_t vrecip_hiprec_f32(
  b = 2.0f - xinv.f * ax;
  xinv.f = xinv.f * b;
 
- xinv.f = vdupq_m(xinv.f, INFINITY, vcmpeqq(x, 0.0f));
+ xinv.f = vdupq_m(xinv.f, F32_MAX, vcmpeqq(x, 0.0f));
  /*
  * restore sign
  */
@@ -213,7 +213,7 @@ __STATIC_INLINE f32x4_t vlogq_f32(f32x4_t vecIn)
  */
  vecAcc0 = vfmaq(vecAcc0, vecExpUnBiasedFlt, __logf_rng_f32);
  // set log0 down to -inf
- vecAcc0 = vdupq_m(vecAcc0, -INFINITY, vcmpeqq(vecIn, 0.0f));
+ vecAcc0 = vdupq_m(vecAcc0, -F32_MAX, vcmpeqq(vecIn, 0.0f));
  return vecAcc0;
 }
 
@@ -267,7 +267,7 @@ __STATIC_INLINE f32x4_t vrecip_f32(f32x4_t vecIn)
  vecTmp = vfmasq(vecW, vecTmp, 8.0f);
  v.f = vmulq(v.f, vecTmp);
 
- v.f = vdupq_m(v.f, INFINITY, vcmpeqq(vecIn, 0.0f));
+ v.f = vdupq_m(v.f, F32_MAX, vcmpeqq(vecIn, 0.0f));
  /*
  * restore sign
  */

diff --git a/Include/dsp/interpolation_functions_f16.h b/Include/dsp/interpolation_functions_f16.h
@@ -40,6 +40,9 @@ extern "C"
 
 #if defined(ARM_FLOAT16_SUPPORTED)
 
+/**
+ * @brief Instance structure for the half floating-point Linear Interpolate function.
+ */
 typedef struct
 {
  uint32_t nValues; /**< nValues */

diff --git a/Include/dsp/transform_functions.h b/Include/dsp/transform_functions.h
@@ -867,6 +867,9 @@ arm_status arm_mfcc_init_f32(
  float32_t *pTmp
  );
 
+ /**
+ * @brief Instance structure for the Q31 MFCC function.
+ */
 typedef struct
  {
  const q31_t *dctCoefs; /**< Internal DCT coefficients */
@@ -993,7 +996,7 @@ arm_status arm_mfcc_init_q31(
  @param[in] pSrc points to the input samples
  @param[out] pDst points to the output MFCC values
  @param[inout] pTmp points to a temporary buffer of complex
- @return none
+ @return error status
  */
  arm_status arm_mfcc_q31(
  const arm_mfcc_instance_q31 * S,
@@ -1002,6 +1005,9 @@ arm_status arm_mfcc_init_q31(
  q31_t *pTmp
  );
 
+ /**
+ * @brief Instance structure for the Q15 MFCC function.
+ */
 typedef struct
  {
  const q15_t *dctCoefs; /**< Internal DCT coefficients */

diff --git a/Source/FastMathFunctions/arm_divide_q15.c b/Source/FastMathFunctions/arm_divide_q15.c
@@ -74,11 +74,11 @@ arm_status arm_divide_q15(q15_t numerator,
  {
  if (sign)
  {
- *quotient = 0x8000;
+ *quotient = -32768;
  }
  else
  {
- *quotient = 0x7FFF;
+ *quotient = 32767;
  }
  return(ARM_MATH_NANINF);
  }

diff --git a/Source/TransformFunctions/arm_mfcc_q15.c b/Source/TransformFunctions/arm_mfcc_q15.c
@@ -56,7 +56,8 @@
  @param[in] pSrc points to the input samples in Q15
  @param[out] pDst points to the output MFCC values in q8.7 format
  @param[inout] pTmp points to a temporary buffer of complex
-
+ @return error status
+ 
  @par Description
  The number of input samples is the FFT length used
  when initializing the instance data structure.

diff --git a/Source/TransformFunctions/arm_mfcc_q31.c b/Source/TransformFunctions/arm_mfcc_q31.c
@@ -56,7 +56,8 @@
  @param[in] pSrc points to the input samples in Q31
  @param[out] pDst points to the output MFCC values in q8.23 format
  @param[inout] pTmp points to a temporary buffer of complex
-
+ @return error status
+ 
  @par Description
  The number of input samples is the FFT length used
  when initializing the instance data structure.

diff --git a/Testing/cmsis_build/runall.py b/Testing/cmsis_build/runall.py
@@ -212,6 +212,7 @@ def runAVH(build,core):
  'test_ac6.csolution.yml':[
  # ("VHT-Corstone-310","CS310"),
  ("VHT-Corstone-300","CS300"),
+ # ("VHT-Corstone-300-NOMVE","CS300"),
  ("VHT_M33","M33_DSP_FP"),
  ("VHT_M7","M7DP"),
  ("VHT_M7_UNROLLED","M7DP"),