From d26cd50388595757350bb2ba7df92ae4ac3c0bcd Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Tue, 5 Oct 2021 08:04:00 +0200 Subject: [PATCH] CMSIS-DSP: Correcting issue #1328 Sign issue warnings --- Source/FilteringFunctions/arm_levinson_durbin_f16.c | 8 ++++---- Source/FilteringFunctions/arm_levinson_durbin_f32.c | 8 ++++---- Source/FilteringFunctions/arm_levinson_durbin_q31.c | 8 ++++---- Source/TransformFunctions/arm_cfft_f16.c | 8 ++++---- Source/TransformFunctions/arm_cfft_f32.c | 8 ++++---- Source/TransformFunctions/arm_cfft_q15.c | 8 ++++---- Source/TransformFunctions/arm_cfft_q31.c | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Source/FilteringFunctions/arm_levinson_durbin_f16.c b/Source/FilteringFunctions/arm_levinson_durbin_f16.c index 0f0f57f5..36108c20 100755 --- a/Source/FilteringFunctions/arm_levinson_durbin_f16.c +++ b/Source/FilteringFunctions/arm_levinson_durbin_f16.c @@ -129,17 +129,17 @@ void arm_levinson_durbin_f16(const float16_t *phi, k = ((_Float16)phi[p+1] - suma)/((_Float16)phi[0] - sumb); f16x8_t vecRevA,tmp; - static uint16_t orgOffsetArray[8]={0,1,2,3,-1,-2,-3,-4}; - static const uint16_t offsetIncArray[8]={4,4,4,4,-4,-4,-4,-4}; + static int16_t orgOffsetArray[8]={0,1,2,3,-1,-2,-3,-4}; + static const int16_t offsetIncArray[8]={4,4,4,4,-4,-4,-4,-4}; uint16x8_t offset,offsetInc,vecTmp; - offset = vld1q(orgOffsetArray); + offset = vld1q_u16((uint16_t*)orgOffsetArray); vecTmp = vdupq_n_u16(p); offset = vaddq_m_u16(offset,offset,vecTmp,LANE4567_MASK); - offsetInc = vld1q(offsetIncArray); + offsetInc = vld1q_u16((uint16_t*)offsetIncArray); nb = p >> 3; j=0; diff --git a/Source/FilteringFunctions/arm_levinson_durbin_f32.c b/Source/FilteringFunctions/arm_levinson_durbin_f32.c index e53b456d..b244048c 100755 --- a/Source/FilteringFunctions/arm_levinson_durbin_f32.c +++ b/Source/FilteringFunctions/arm_levinson_durbin_f32.c @@ -129,17 +129,17 @@ void arm_levinson_durbin_f32(const float32_t *phi, k = (phi[p+1] - suma)/(phi[0] - sumb); f32x4_t vecRevA,tmp; - static uint32_t orgOffsetArray[4]={0,1,-1,-2}; - static const uint32_t offsetIncArray[4]={2,2,-2,-2}; + static int32_t orgOffsetArray[4]={0,1,-1,-2}; + static const int32_t offsetIncArray[4]={2,2,-2,-2}; uint32x4_t offset,offsetInc,vecTmp; - offset = vld1q(orgOffsetArray); + offset = vld1q_u32((uint32_t*)orgOffsetArray); vecTmp = vdupq_n_u32(p); offset = vaddq_m_u32(offset,offset,vecTmp,LANE23_MASK); - offsetInc = vld1q(offsetIncArray); + offsetInc = vld1q_u32((uint32_t*)offsetIncArray); nb = p >> 2; j=0; diff --git a/Source/FilteringFunctions/arm_levinson_durbin_q31.c b/Source/FilteringFunctions/arm_levinson_durbin_q31.c index aa1b8e41..1788d971 100755 --- a/Source/FilteringFunctions/arm_levinson_durbin_q31.c +++ b/Source/FilteringFunctions/arm_levinson_durbin_q31.c @@ -196,17 +196,17 @@ void arm_levinson_durbin_q31(const q31_t *phi, k = divide(phi[p+1]-(q31_t)suma,phi[0] - (q31_t)sumb); q31x4_t vecRevA,tmp; - static uint32_t orgOffsetArray[4]={0,1,-1,-2}; - static const uint32_t offsetIncArray[4]={2,2,-2,-2}; + static int32_t orgOffsetArray[4]={0,1,-1,-2}; + static const int32_t offsetIncArray[4]={2,2,-2,-2}; uint32x4_t offset,offsetInc,vecTmp; - offset = vld1q(orgOffsetArray); + offset = vld1q_u32((uint32_t*)orgOffsetArray); vecTmp = vdupq_n_u32(p); offset = vaddq_m_u32(offset,offset,vecTmp,LANE23_MASK); - offsetInc = vld1q(offsetIncArray); + offsetInc = vld1q_u32((uint32_t*)offsetIncArray); nb = p >> 2; diff --git a/Source/TransformFunctions/arm_cfft_f16.c b/Source/TransformFunctions/arm_cfft_f16.c index ea836bec..0ba798e2 100755 --- a/Source/TransformFunctions/arm_cfft_f16.c +++ b/Source/TransformFunctions/arm_cfft_f16.c @@ -97,7 +97,7 @@ static void _arm_radix4_butterfly_f16_mve(const arm_cfft_instance_f16 * S,float1 uint32_t n1, n2; uint32_t stage = 0; int32_t iter = 1; - static const uint32_t strides[4] = + static const int32_t strides[4] = {(0 - 16) * sizeof(float16_t *) , (4 - 16) * sizeof(float16_t *) , (8 - 16) * sizeof(float16_t *) @@ -208,7 +208,7 @@ static void _arm_radix4_butterfly_f16_mve(const arm_cfft_instance_f16 * S,float1 /* * start of Last stage process */ - uint32x4_t vecScGathAddr = vld1q_u32(strides); + uint32x4_t vecScGathAddr = vld1q_u32((uint32_t*)strides); vecScGathAddr = vecScGathAddr + (uint32_t) pSrc; /* load scheduling */ @@ -305,7 +305,7 @@ static void _arm_radix4_butterfly_inverse_f16_mve(const arm_cfft_instance_f16 * uint32_t n1, n2; uint32_t stage = 0; int32_t iter = 1; - static const uint32_t strides[4] = { + static const int32_t strides[4] = { (0 - 16) * sizeof(q31_t *), (4 - 16) * sizeof(q31_t *), (8 - 16) * sizeof(q31_t *), @@ -414,7 +414,7 @@ static void _arm_radix4_butterfly_inverse_f16_mve(const arm_cfft_instance_f16 * /* * start of Last stage process */ - uint32x4_t vecScGathAddr = vld1q_u32(strides); + uint32x4_t vecScGathAddr = vld1q_u32((uint32_t*)strides); vecScGathAddr = vecScGathAddr + (uint32_t) pSrc; /* diff --git a/Source/TransformFunctions/arm_cfft_f32.c b/Source/TransformFunctions/arm_cfft_f32.c index f7f1fde1..470bd2b8 100755 --- a/Source/TransformFunctions/arm_cfft_f32.c +++ b/Source/TransformFunctions/arm_cfft_f32.c @@ -98,7 +98,7 @@ static void _arm_radix4_butterfly_f32_mve(const arm_cfft_instance_f32 * S,float3 uint32_t n1, n2; uint32_t stage = 0; int32_t iter = 1; - static const uint32_t strides[4] = { + static const int32_t strides[4] = { (0 - 16) * sizeof(q31_t *), (1 - 16) * sizeof(q31_t *), (8 - 16) * sizeof(q31_t *), @@ -210,7 +210,7 @@ static void _arm_radix4_butterfly_f32_mve(const arm_cfft_instance_f32 * S,float3 /* * start of Last stage process */ - uint32x4_t vecScGathAddr = vld1q_u32(strides); + uint32x4_t vecScGathAddr = vld1q_u32((uint32_t*)strides); vecScGathAddr = vecScGathAddr + (uint32_t) pSrc; /* load scheduling */ @@ -307,7 +307,7 @@ static void _arm_radix4_butterfly_inverse_f32_mve(const arm_cfft_instance_f32 * uint32_t n1, n2; uint32_t stage = 0; int32_t iter = 1; - static const uint32_t strides[4] = { + static const int32_t strides[4] = { (0 - 16) * sizeof(q31_t *), (1 - 16) * sizeof(q31_t *), (8 - 16) * sizeof(q31_t *), @@ -416,7 +416,7 @@ static void _arm_radix4_butterfly_inverse_f32_mve(const arm_cfft_instance_f32 * /* * start of Last stage process */ - uint32x4_t vecScGathAddr = vld1q_u32 (strides); + uint32x4_t vecScGathAddr = vld1q_u32 ((uint32_t*)strides); vecScGathAddr = vecScGathAddr + (uint32_t) pSrc; /* diff --git a/Source/TransformFunctions/arm_cfft_q15.c b/Source/TransformFunctions/arm_cfft_q15.c index 1e997adb..dad40284 100644 --- a/Source/TransformFunctions/arm_cfft_q15.c +++ b/Source/TransformFunctions/arm_cfft_q15.c @@ -46,7 +46,7 @@ static void _arm_radix4_butterfly_q15_mve( uint32_t n1, n2; uint32_t stage = 0; int32_t iter = 1; - static const uint32_t strides[4] = { + static const int32_t strides[4] = { (0 - 16) * sizeof(q15_t *), (4 - 16) * sizeof(q15_t *), (8 - 16) * sizeof(q15_t *), (12 - 16) * sizeof(q15_t *) }; @@ -157,7 +157,7 @@ static void _arm_radix4_butterfly_q15_mve( /* * start of Last stage process */ - uint32x4_t vecScGathAddr = vld1q_u32 (strides); + uint32x4_t vecScGathAddr = vld1q_u32 ((uint32_t*)strides); vecScGathAddr = vecScGathAddr + (uint32_t) pSrc; /* @@ -281,7 +281,7 @@ static void _arm_radix4_butterfly_inverse_q15_mve(const arm_cfft_instance_q15 *S uint32_t n1, n2; uint32_t stage = 0; int32_t iter = 1; - static const uint32_t strides[4] = { + static const int32_t strides[4] = { (0 - 16) * sizeof(q15_t *), (4 - 16) * sizeof(q15_t *), (8 - 16) * sizeof(q15_t *), (12 - 16) * sizeof(q15_t *) }; @@ -392,7 +392,7 @@ static void _arm_radix4_butterfly_inverse_q15_mve(const arm_cfft_instance_q15 *S /* * start of Last stage process */ - uint32x4_t vecScGathAddr = vld1q_u32(strides); + uint32x4_t vecScGathAddr = vld1q_u32((uint32_t*)strides); vecScGathAddr = vecScGathAddr + (uint32_t) pSrc; /* diff --git a/Source/TransformFunctions/arm_cfft_q31.c b/Source/TransformFunctions/arm_cfft_q31.c index 7f964b82..524b5b94 100644 --- a/Source/TransformFunctions/arm_cfft_q31.c +++ b/Source/TransformFunctions/arm_cfft_q31.c @@ -48,7 +48,7 @@ static void _arm_radix4_butterfly_q31_mve( uint32_t n1, n2; uint32_t stage = 0; int32_t iter = 1; - static const uint32_t strides[4] = { + static const int32_t strides[4] = { (0 - 16) * sizeof(q31_t *), (1 - 16) * sizeof(q31_t *), (8 - 16) * sizeof(q31_t *), (9 - 16) * sizeof(q31_t *) }; @@ -167,7 +167,7 @@ static void _arm_radix4_butterfly_q31_mve( /* * start of Last stage process */ - uint32x4_t vecScGathAddr = vld1q_u32(strides); + uint32x4_t vecScGathAddr = vld1q_u32((uint32_t*)strides); vecScGathAddr = vecScGathAddr + (uint32_t) pSrc; /* @@ -298,7 +298,7 @@ static void _arm_radix4_butterfly_inverse_q31_mve( uint32_t n1, n2; uint32_t stage = 0; int32_t iter = 1; - static const uint32_t strides[4] = { + static const int32_t strides[4] = { (0 - 16) * sizeof(q31_t *), (1 - 16) * sizeof(q31_t *), (8 - 16) * sizeof(q31_t *), (9 - 16) * sizeof(q31_t *) }; @@ -417,7 +417,7 @@ static void _arm_radix4_butterfly_inverse_q31_mve( /* * start of Last stage process */ - uint32x4_t vecScGathAddr = vld1q_u32(strides); + uint32x4_t vecScGathAddr = vld1q_u32((uint32_t*)strides); vecScGathAddr = vecScGathAddr + (uint32_t) pSrc; /*