From a7fd426546a8cd44af1e911c31c86580e4c09889 Mon Sep 17 00:00:00 2001
From: Christophe Favergeon <Christophe.Favergeon@arm.com>
Date: Tue, 6 Oct 2020 15:16:50 +0200
Subject: [PATCH] CMSIS-DSP: Removed patch for armclang issue on M55 Issue will
 be corrected in 6.15

---
 Source/FilteringFunctions/arm_correlate_q7.c  | 5 +----
 Source/MatrixFunctions/arm_mat_vec_mult_f32.c | 5 +----
 Source/MatrixFunctions/arm_mat_vec_mult_q7.c  | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Source/FilteringFunctions/arm_correlate_q7.c b/Source/FilteringFunctions/arm_correlate_q7.c
index 42bc3449..965c5a94 100644
--- a/Source/FilteringFunctions/arm_correlate_q7.c
+++ b/Source/FilteringFunctions/arm_correlate_q7.c
@@ -884,10 +884,7 @@ void arm_correlate_q7(
     k = count;
 
 #endif /* #if defined (ARM_MATH_LOOPUNROLL) */
-/* Temporary fix for bug in clang */
-#if defined(ARM_MATH_MVEF) && defined(ARM_MATH_AUTOVECTORIZE)
-        #pragma clang loop vectorize(disable)
-#endif
+
     while (k > 0U)
     {
       /* Perform the multiply-accumulate */
diff --git a/Source/MatrixFunctions/arm_mat_vec_mult_f32.c b/Source/MatrixFunctions/arm_mat_vec_mult_f32.c
index 664d4bd2..f77315d3 100755
--- a/Source/MatrixFunctions/arm_mat_vec_mult_f32.c
+++ b/Source/MatrixFunctions/arm_mat_vec_mult_f32.c
@@ -379,10 +379,7 @@ void arm_mat_vec_mult_f32(const arm_matrix_instance_f32 *pSrcMat, const float32_
         // process remainder of row
         colCnt = numCols & 1u;
 
-/* Temporary fix for bug in clang */
-#if defined(ARM_MATH_MVEF) && defined(ARM_MATH_AUTOVECTORIZE)
-        #pragma clang loop vectorize(disable)
-#endif
+
         while (colCnt > 0) {
             sum += *pInA1++ * *pInVec++;
             colCnt--;
diff --git a/Source/MatrixFunctions/arm_mat_vec_mult_q7.c b/Source/MatrixFunctions/arm_mat_vec_mult_q7.c
index 0ae2ddf2..92149f79 100755
--- a/Source/MatrixFunctions/arm_mat_vec_mult_q7.c
+++ b/Source/MatrixFunctions/arm_mat_vec_mult_q7.c
@@ -355,9 +355,7 @@ void arm_mat_vec_mult_q7(const arm_matrix_instance_q7 *pSrcMat, const q7_t *pVec
         /* process any remaining columns */
 
         colCnt = numCols & 3u;
-#if defined(ARM_MATH_MVEI) && defined(ARM_MATH_AUTOVECTORIZE)
-        #pragma clang loop vectorize(disable)
-#endif
+
         while (colCnt > 0) {
             vecData = *pInVec++;
             sum1 += *pInA1++ * vecData;