diff options
Diffstat (limited to 'Drivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c')
| -rw-r--r-- | Drivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c | 212 |
1 files changed, 74 insertions, 138 deletions
diff --git a/Drivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c b/Drivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c index d4ff45eb7..035bfba38 100644 --- a/Drivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c +++ b/Drivers/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_opt_q7.c @@ -3,13 +3,13 @@ * Title: arm_correlate_opt_q7.c * Description: Correlation of Q7 sequences * - * $Date: 27. January 2017 - * $Revision: V.1.5.1 + * $Date: 18. March 2019 + * $Revision: V1.6.0 * * Target Processor: Cortex-M cores * -------------------------------------------------------------------- */ /* - * Copyright (C) 2010-2017 ARM Limited or its affiliates. All rights reserved. + * Copyright (C) 2010-2019 ARM Limited or its affiliates. All rights reserved. * * SPDX-License-Identifier: Apache-2.0 * @@ -29,67 +29,53 @@ #include "arm_math.h" /** - * @ingroup groupFilters + @ingroup groupFilters */ /** - * @addtogroup Corr - * @{ + @addtogroup Corr + @{ */ /** - * @brief Correlation of Q7 sequences. - * @param[in] *pSrcA points to the first input sequence. - * @param[in] srcALen length of the first input sequence. - * @param[in] *pSrcB points to the second input sequence. - * @param[in] srcBLen length of the second input sequence. - * @param[out] *pDst points to the location where the output result is written. Length 2 * max(srcALen, srcBLen) - 1. - * @param[in] *pScratch1 points to scratch buffer(of type q15_t) of size max(srcALen, srcBLen) + 2*min(srcALen, srcBLen) - 2. - * @param[in] *pScratch2 points to scratch buffer (of type q15_t) of size min(srcALen, srcBLen). - * @return none. - * - * - * \par Restrictions - * If the silicon does not support unaligned memory access enable the macro UNALIGNED_SUPPORT_DISABLE - * In this case input, output, scratch1 and scratch2 buffers should be aligned by 32-bit - * - * @details - * <b>Scaling and Overflow Behavior:</b> - * - * \par - * The function is implemented using a 32-bit internal accumulator. - * Both the inputs are represented in 1.7 format and multiplications yield a 2.14 result. - * The 2.14 intermediate results are accumulated in a 32-bit accumulator in 18.14 format. - * This approach provides 17 guard bits and there is no risk of overflow as long as <code>max(srcALen, srcBLen)<131072</code>. - * The 18.14 result is then truncated to 18.7 format by discarding the low 7 bits and saturated to 1.7 format. - * - * + @brief Correlation of Q7 sequences. + @param[in] pSrcA points to the first input sequence + @param[in] srcALen length of the first input sequence + @param[in] pSrcB points to the second input sequence + @param[in] srcBLen length of the second input sequence + @param[out] pDst points to the location where the output result is written. Length 2 * max(srcALen, srcBLen) - 1. + @param[in] pScratch1 points to scratch buffer(of type q15_t) of size max(srcALen, srcBLen) + 2*min(srcALen, srcBLen) - 2. + @param[in] pScratch2 points to scratch buffer (of type q15_t) of size min(srcALen, srcBLen). + @return none + + @par Scaling and Overflow Behavior + The function is implemented using a 32-bit internal accumulator. + Both the inputs are represented in 1.7 format and multiplications yield a 2.14 result. + The 2.14 intermediate results are accumulated in a 32-bit accumulator in 18.14 format. + This approach provides 17 guard bits and there is no risk of overflow as long as <code>max(srcALen, srcBLen)<131072</code>. + The 18.14 result is then truncated to 18.7 format by discarding the low 7 bits and then saturated to 1.7 format. */ - - void arm_correlate_opt_q7( - q7_t * pSrcA, - uint32_t srcALen, - q7_t * pSrcB, - uint32_t srcBLen, - q7_t * pDst, - q15_t * pScratch1, - q15_t * pScratch2) + const q7_t * pSrcA, + uint32_t srcALen, + const q7_t * pSrcB, + uint32_t srcBLen, + q7_t * pDst, + q15_t * pScratch1, + q15_t * pScratch2) { - q7_t *pOut = pDst; /* output pointer */ - q15_t *pScr1 = pScratch1; /* Temporary pointer for scratch */ - q15_t *pScr2 = pScratch2; /* Temporary pointer for scratch */ - q7_t *pIn1; /* inputA pointer */ - q7_t *pIn2; /* inputB pointer */ - q15_t *py; /* Intermediate inputB pointer */ - q31_t acc0, acc1, acc2, acc3; /* Accumulators */ - uint32_t j, k = 0U, blkCnt; /* loop counter */ - int32_t inc = 1; /* output pointer increment */ - uint32_t outBlockSize; /* loop counter */ - q15_t x4; /* Temporary input variable */ - uint32_t tapCnt; /* loop counter */ - q31_t x1, x2, x3, y1; /* Temporary input variables */ + q15_t *pScr1 = pScratch1; /* Temporary pointer for scratch */ + q15_t *pScr2 = pScratch2; /* Temporary pointer for scratch */ + q15_t x4; /* Temporary input variable */ + q15_t *py; /* Temporary input2 pointer */ + q31_t acc0, acc1, acc2, acc3; /* Accumulators */ + const q7_t *pIn1, *pIn2; /* InputA and inputB pointer */ + uint32_t j, k, blkCnt, tapCnt; /* Loop counter */ + int32_t inc = 1; /* Output pointer increment */ + uint32_t outBlockSize; /* Loop counter */ + q31_t x1, x2, x3, y1; /* Temporary input variables */ + q7_t *pOut = pDst; /* Output pointer */ /* The algorithm implementation is based on the lengths of the inputs. */ /* srcB is always made to slide across srcA. */ @@ -107,13 +93,13 @@ void arm_correlate_opt_q7( if (srcALen >= srcBLen) { /* Initialization of inputA pointer */ - pIn1 = (pSrcA); + pIn1 = pSrcA; /* Initialization of inputB pointer */ - pIn2 = (pSrcB); + pIn2 = pSrcB; /* Number of output samples is calculated */ - outBlockSize = (2U * srcALen) - 1U; + outBlockSize = (srcALen * 2U) - 1U; /* When srcALen > srcBLen, zero padding is done to srcB * to make their lengths equal. @@ -123,15 +109,14 @@ void arm_correlate_opt_q7( /* Updating the pointer position to non zero value */ pOut += j; - } else { /* Initialization of inputA pointer */ - pIn1 = (pSrcB); + pIn1 = pSrcB; /* Initialization of inputB pointer */ - pIn2 = (pSrcA); + pIn2 = pSrcA; /* srcBLen is always considered as shorter or equal to srcALen */ j = srcBLen; @@ -144,7 +129,6 @@ void arm_correlate_opt_q7( /* Destination address modifier is set to -1 */ inc = -1; - } @@ -152,34 +136,34 @@ void arm_correlate_opt_q7( k = srcBLen >> 2U; /* First part of the processing with loop unrolling copies 4 data points at a time. - ** a second loop below copies for the remaining 1 to 3 samples. */ + a second loop below copies for the remaining 1 to 3 samples. */ while (k > 0U) { /* copy second buffer in reversal manner */ - x4 = (q15_t) * pIn2++; + x4 = (q15_t) *pIn2++; *pScr2++ = x4; - x4 = (q15_t) * pIn2++; + x4 = (q15_t) *pIn2++; *pScr2++ = x4; - x4 = (q15_t) * pIn2++; + x4 = (q15_t) *pIn2++; *pScr2++ = x4; - x4 = (q15_t) * pIn2++; + x4 = (q15_t) *pIn2++; *pScr2++ = x4; - /* Decrement the loop counter */ + /* Decrement loop counter */ k--; } /* If the count is not a multiple of 4, copy remaining samples here. - ** No loop unrolling is used. */ + No loop unrolling is used. */ k = srcBLen % 0x4U; while (k > 0U) { /* copy second buffer in reversal manner for remaining samples */ - x4 = (q15_t) * pIn2++; + x4 = (q15_t) *pIn2++; *pScr2++ = x4; - /* Decrement the loop counter */ + /* Decrement loop counter */ k--; } @@ -190,28 +174,29 @@ void arm_correlate_opt_q7( pScr1 += (srcBLen - 1U); /* Copy (srcALen) samples in scratch buffer */ + /* Apply loop unrolling and do 4 Copies simultaneously. */ k = srcALen >> 2U; /* First part of the processing with loop unrolling copies 4 data points at a time. - ** a second loop below copies for the remaining 1 to 3 samples. */ + a second loop below copies for the remaining 1 to 3 samples. */ while (k > 0U) { /* copy second buffer in reversal manner */ - x4 = (q15_t) * pIn1++; + x4 = (q15_t) *pIn1++; *pScr1++ = x4; - x4 = (q15_t) * pIn1++; + x4 = (q15_t) *pIn1++; *pScr1++ = x4; - x4 = (q15_t) * pIn1++; + x4 = (q15_t) *pIn1++; *pScr1++ = x4; - x4 = (q15_t) * pIn1++; + x4 = (q15_t) *pIn1++; *pScr1++ = x4; - /* Decrement the loop counter */ + /* Decrement loop counter */ k--; } /* If the count is not a multiple of 4, copy remaining samples here. - ** No loop unrolling is used. */ + No loop unrolling is used. */ k = srcALen % 0x4U; while (k > 0U) @@ -224,49 +209,13 @@ void arm_correlate_opt_q7( k--; } -#ifndef UNALIGNED_SUPPORT_DISABLE - /* Fill (srcBLen - 1U) zeros at end of scratch buffer */ arm_fill_q15(0, pScr1, (srcBLen - 1U)); /* Update pointer */ pScr1 += (srcBLen - 1U); -#else - -/* Apply loop unrolling and do 4 Copies simultaneously. */ - k = (srcBLen - 1U) >> 2U; - - /* First part of the processing with loop unrolling copies 4 data points at a time. - ** a second loop below copies for the remaining 1 to 3 samples. */ - while (k > 0U) - { - /* copy second buffer in reversal manner */ - *pScr1++ = 0; - *pScr1++ = 0; - *pScr1++ = 0; - *pScr1++ = 0; - - /* Decrement the loop counter */ - k--; - } - - /* If the count is not a multiple of 4, copy remaining samples here. - ** No loop unrolling is used. */ - k = (srcBLen - 1U) % 0x4U; - - while (k > 0U) - { - /* copy second buffer in reversal manner for remaining samples */ - *pScr1++ = 0; - - /* Decrement the loop counter */ - k--; - } - -#endif /* #ifndef UNALIGNED_SUPPORT_DISABLE */ - - /* Temporary pointer for second sequence */ + /* Temporary pointer for scratch2 */ py = pScratch2; /* Initialization of pScr2 pointer */ @@ -287,18 +236,17 @@ void arm_correlate_opt_q7( acc3 = 0; /* Read two samples from scratch1 buffer */ - x1 = *__SIMD32(pScr1)++; + x1 = read_q15x2_ia (&pScr1); /* Read next two samples from scratch1 buffer */ - x2 = *__SIMD32(pScr1)++; + x2 = read_q15x2_ia (&pScr1); tapCnt = (srcBLen) >> 2U; while (tapCnt > 0U) { - /* Read four samples from smaller buffer */ - y1 = _SIMD32_OFFSET(pScr2); + y1 = read_q15x2_ia (&pScr2); /* multiply and accumlate */ acc0 = __SMLAD(x1, y1, acc0); @@ -315,7 +263,7 @@ void arm_correlate_opt_q7( acc1 = __SMLADX(x3, y1, acc1); /* Read next two samples from scratch1 buffer */ - x1 = *__SIMD32(pScr1)++; + x1 = read_q15x2_ia (&pScr1); /* pack input data */ #ifndef ARM_MATH_BIG_ENDIAN @@ -327,7 +275,7 @@ void arm_correlate_opt_q7( acc3 = __SMLADX(x3, y1, acc3); /* Read four samples from smaller buffer */ - y1 = _SIMD32_OFFSET(pScr2 + 2U); + y1 = read_q15x2_ia (&pScr2); acc0 = __SMLAD(x2, y1, acc0); @@ -335,7 +283,7 @@ void arm_correlate_opt_q7( acc1 = __SMLADX(x3, y1, acc1); - x2 = *__SIMD32(pScr1)++; + x2 = read_q15x2_ia (&pScr1); #ifndef ARM_MATH_BIG_ENDIAN x3 = __PKHBT(x2, x1, 0); @@ -345,25 +293,18 @@ void arm_correlate_opt_q7( acc3 = __SMLADX(x3, y1, acc3); - pScr2 += 4U; - - - /* Decrement the loop counter */ + /* Decrement loop counter */ tapCnt--; } - - /* Update scratch pointer for remaining samples of smaller length sequence */ pScr1 -= 4U; - /* apply same above for remaining samples of smaller length sequence */ tapCnt = (srcBLen) & 3U; while (tapCnt > 0U) { - /* accumlate the results */ acc0 += (*pScr1++ * *pScr2); acc1 += (*pScr1++ * *pScr2); @@ -372,7 +313,7 @@ void arm_correlate_opt_q7( pScr1 -= 3U; - /* Decrement the loop counter */ + /* Decrement loop counter */ tapCnt--; } @@ -392,10 +333,8 @@ void arm_correlate_opt_q7( pScr2 = py; pScratch1 += 4U; - } - blkCnt = (srcALen + srcBLen - 1U) & 0x3; /* Calculate correlation for remaining samples of Bigger length sequence */ @@ -414,7 +353,7 @@ void arm_correlate_opt_q7( acc0 += (*pScr1++ * *pScr2++); acc0 += (*pScr1++ * *pScr2++); - /* Decrement the loop counter */ + /* Decrement loop counter */ tapCnt--; } @@ -423,11 +362,10 @@ void arm_correlate_opt_q7( /* apply same above for remaining samples of smaller length sequence */ while (tapCnt > 0U) { - /* accumlate the results */ acc0 += (*pScr1++ * *pScr2++); - /* Decrement the loop counter */ + /* Decrement loop counter */ tapCnt--; } @@ -435,18 +373,16 @@ void arm_correlate_opt_q7( /* Store the result in the accumulator in the destination buffer. */ *pOut = (q7_t) (__SSAT(acc0 >> 7U, 8)); - pOut += inc; /* Initialization of inputB pointer */ pScr2 = py; pScratch1 += 1U; - } } /** - * @} end of Corr group + @} end of Corr group */ |