Skip to content

Commit f5946a5

Browse files
XenuIsWatchingkartben
authored andcommitted
manifest: update cmsis-dsp to v1.16.2
Update cmsis-dsp module to v1.16.2 Signed-off-by: Ryan McClelland <[email protected]>
1 parent 88149af commit f5946a5

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

modules/cmsis-dsp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ if(CONFIG_CMSIS_DSP)
730730
${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_selection_sort_f32.c
731731
${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_sort_f32.c
732732
${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_sort_init_f32.c
733-
${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_weighted_sum_f32.c
733+
${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_weighted_average_f32.c
734734
)
735735

736736
if ((NOT ARMAC5) AND (NOT DISABLEFLOAT16))
@@ -740,7 +740,7 @@ if(CONFIG_CMSIS_DSP)
740740
zephyr_library_sources(${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_q15_to_f16.c)
741741
zephyr_library_sources(${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_float_to_f16.c)
742742
zephyr_library_sources(${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_f16_to_float.c)
743-
zephyr_library_sources(${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_weighted_sum_f16.c)
743+
zephyr_library_sources(${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_weighted_average_f16.c)
744744
zephyr_library_sources(${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_barycenter_f16.c)
745745
zephyr_library_sources(${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_f16_to_f64.c)
746746
zephyr_library_sources(${CMSIS_DSP_DIR}/Source/SupportFunctions/arm_f64_to_f16.c)

tests/lib/cmsis_dsp/fastmath/src/q15.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ ZTEST(fastmath_q15, test_arm_sqrt_q15)
9090
status = arm_sqrt_q15(in_sqrt[index], &output[index]);
9191

9292
/* Validate operation status */
93-
if (in_sqrt[index] <= 0) {
93+
if (in_sqrt[index] < 0) {
9494
zassert_equal(status, ARM_MATH_ARGUMENT_ERROR,
9595
"square root did fail with an input value "
96-
"of '0'");
96+
"of less than '0'");
9797
} else {
9898
zassert_equal(status, ARM_MATH_SUCCESS,
9999
"square root operation did not succeed");

tests/lib/cmsis_dsp/fastmath/src/q31.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ ZTEST(fastmath_q31, test_arm_sqrt_q31)
9090
status = arm_sqrt_q31(in_sqrt[index], &output[index]);
9191

9292
/* Validate operation status */
93-
if (in_sqrt[index] <= 0) {
93+
if (in_sqrt[index] < 0) {
9494
zassert_equal(status, ARM_MATH_ARGUMENT_ERROR,
9595
"square root did fail with an input value "
96-
"of '0'");
96+
"of less than '0'");
9797
} else {
9898
zassert_equal(status, ARM_MATH_SUCCESS,
9999
"square root operation did not succeed");

tests/lib/cmsis_dsp/support/src/f16.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ DEFINE_TEST_VARIANT3(support_f16, arm_float_to_f16, 7, ref_f32, ref_f16, 7);
182182
DEFINE_TEST_VARIANT3(support_f16, arm_float_to_f16, 16, ref_f32, ref_f16, 16);
183183
DEFINE_TEST_VARIANT3(support_f16, arm_float_to_f16, 23, ref_f32, ref_f16, 23);
184184

185-
static void test_arm_weighted_sum_f16(
185+
static void test_arm_weighted_average_f16(
186186
int ref_offset, size_t length)
187187
{
188188
const float16_t *val = (const float16_t *)in_weighted_sum_val;
@@ -195,7 +195,7 @@ static void test_arm_weighted_sum_f16(
195195
zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
196196

197197
/* Run test function */
198-
output[0] = arm_weighted_sum_f16(val, coeff, length);
198+
output[0] = arm_weighted_average_f16(val, coeff, length);
199199

200200
/* Validate output */
201201
zassert_true(
@@ -207,8 +207,8 @@ static void test_arm_weighted_sum_f16(
207207
free(output);
208208
}
209209

210-
DEFINE_TEST_VARIANT2(support_f16, arm_weighted_sum_f16, 7, 0, 7);
211-
DEFINE_TEST_VARIANT2(support_f16, arm_weighted_sum_f16, 16, 1, 16);
212-
DEFINE_TEST_VARIANT2(support_f16, arm_weighted_sum_f16, 23, 2, 23);
210+
DEFINE_TEST_VARIANT2(support_f16, arm_weighted_average_f16, 7, 0, 7);
211+
DEFINE_TEST_VARIANT2(support_f16, arm_weighted_average_f16, 16, 1, 16);
212+
DEFINE_TEST_VARIANT2(support_f16, arm_weighted_average_f16, 23, 2, 23);
213213

214214
ZTEST_SUITE(support_f16, NULL, NULL, NULL, NULL, NULL);

tests/lib/cmsis_dsp/support/src/f32.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q7, 15, in_f32, ref_q7, 15);
145145
DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q7, 32, in_f32, ref_q7, 32);
146146
DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q7, 33, in_f32, ref_q7, 33);
147147

148-
static void test_arm_weighted_sum_f32(
148+
static void test_arm_weighted_average_f32(
149149
int ref_offset, size_t length)
150150
{
151151
const float32_t *val = (const float32_t *)in_weighted_sum_val;
@@ -158,7 +158,7 @@ static void test_arm_weighted_sum_f32(
158158
zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
159159

160160
/* Run test function */
161-
output[0] = arm_weighted_sum_f32(val, coeff, length);
161+
output[0] = arm_weighted_average_f32(val, coeff, length);
162162

163163
/* Validate output */
164164
zassert_true(
@@ -170,9 +170,9 @@ static void test_arm_weighted_sum_f32(
170170
free(output);
171171
}
172172

173-
DEFINE_TEST_VARIANT2(support_f32, arm_weighted_sum_f32, 3, 0, 3);
174-
DEFINE_TEST_VARIANT2(support_f32, arm_weighted_sum_f32, 8, 1, 8);
175-
DEFINE_TEST_VARIANT2(support_f32, arm_weighted_sum_f32, 11, 2, 11);
173+
DEFINE_TEST_VARIANT2(support_f32, arm_weighted_average_f32, 3, 0, 3);
174+
DEFINE_TEST_VARIANT2(support_f32, arm_weighted_average_f32, 8, 1, 8);
175+
DEFINE_TEST_VARIANT2(support_f32, arm_weighted_average_f32, 11, 2, 11);
176176

177177
static void test_arm_sort_out(
178178
const uint32_t *input1, const uint32_t *ref, size_t length,

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ manifest:
121121
groups:
122122
- hal
123123
- name: cmsis-dsp
124-
revision: 6489e771e9c405f1763b52d64a3f17a1ec488ace
124+
revision: d80a49b2bb186317dc1db4ac88da49c0ab77e6e7
125125
path: modules/lib/cmsis-dsp
126126
- name: cmsis-nn
127127
revision: ea987c1ca661be723de83bd159aed815d6cbd430

0 commit comments

Comments
 (0)