Skip to content

Commit 6310525

Browse files
enjiamainashif
enjiamai
authored and
nashif
committed
tests: lib: move the cmsis_dsp statistics test to new ztest API
Migrate the testsuite tests/lib/cmsis_dsp/statistics to the new ztest API. Signed-off-by: Enjia Mai <[email protected]>
1 parent 3e2fe17 commit 6310525

File tree

9 files changed

+153
-362
lines changed

9 files changed

+153
-362
lines changed

‎tests/lib/cmsis_dsp/statistics/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ target_sources(app PRIVATE
1010
src/q31.c
1111
src/f32.c
1212
src/f64.c
13-
src/main.c
1413
)
1514

1615
target_sources_ifdef(CONFIG_CMSIS_DSP_FLOAT16 app PRIVATE src/f16.c)

‎tests/lib/cmsis_dsp/statistics/prj.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CONFIG_ZTEST=y
2+
CONFIG_ZTEST_NEW_API=y
23
CONFIG_NEWLIB_LIBC=y
34
CONFIG_CMSIS_DSP=y
45
CONFIG_CMSIS_DSP_STATISTICS=y

‎tests/lib/cmsis_dsp/statistics/src/f16.c‎

Lines changed: 35 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ static void test_arm_max_f16(
4949
ASSERT_MSG_INCORRECT_COMP_RESULT);
5050
}
5151

52-
DEFINE_TEST_VARIANT3(arm_max_f16, 7, in_com1, 0, 7);
53-
DEFINE_TEST_VARIANT3(arm_max_f16, 16, in_com1, 1, 16);
54-
DEFINE_TEST_VARIANT3(arm_max_f16, 23, in_com1, 2, 23);
52+
DEFINE_TEST_VARIANT3(statistics_f16, arm_max_f16, 7, in_com1, 0, 7);
53+
DEFINE_TEST_VARIANT3(statistics_f16, arm_max_f16, 16, in_com1, 1, 16);
54+
DEFINE_TEST_VARIANT3(statistics_f16, arm_max_f16, 23, in_com1, 2, 23);
5555

5656
static void test_arm_max_no_idx_f16(
5757
const uint16_t *input1, int ref_index, size_t length)
@@ -66,9 +66,9 @@ static void test_arm_max_no_idx_f16(
6666
ASSERT_MSG_INCORRECT_COMP_RESULT);
6767
}
6868

69-
DEFINE_TEST_VARIANT3(arm_max_no_idx_f16, 7, in_com1, 0, 7);
70-
DEFINE_TEST_VARIANT3(arm_max_no_idx_f16, 16, in_com1, 1, 16);
71-
DEFINE_TEST_VARIANT3(arm_max_no_idx_f16, 23, in_com1, 2, 23);
69+
DEFINE_TEST_VARIANT3(statistics_f16, arm_max_no_idx_f16, 7, in_com1, 0, 7);
70+
DEFINE_TEST_VARIANT3(statistics_f16, arm_max_no_idx_f16, 16, in_com1, 1, 16);
71+
DEFINE_TEST_VARIANT3(statistics_f16, arm_max_no_idx_f16, 23, in_com1, 2, 23);
7272

7373
static void test_arm_min_f16(
7474
const uint16_t *input1, int ref_index, size_t length)
@@ -87,9 +87,9 @@ static void test_arm_min_f16(
8787
ASSERT_MSG_INCORRECT_COMP_RESULT);
8888
}
8989

90-
DEFINE_TEST_VARIANT3(arm_min_f16, 7, in_com1, 0, 7);
91-
DEFINE_TEST_VARIANT3(arm_min_f16, 16, in_com1, 1, 16);
92-
DEFINE_TEST_VARIANT3(arm_min_f16, 23, in_com1, 2, 23);
90+
DEFINE_TEST_VARIANT3(statistics_f16, arm_min_f16, 7, in_com1, 0, 7);
91+
DEFINE_TEST_VARIANT3(statistics_f16, arm_min_f16, 16, in_com1, 1, 16);
92+
DEFINE_TEST_VARIANT3(statistics_f16, arm_min_f16, 23, in_com1, 2, 23);
9393

9494
static void test_arm_absmax_f16(
9595
const uint16_t *input1, int ref_index, size_t length)
@@ -108,9 +108,9 @@ static void test_arm_absmax_f16(
108108
ASSERT_MSG_INCORRECT_COMP_RESULT);
109109
}
110110

111-
DEFINE_TEST_VARIANT3(arm_absmax_f16, 7, in_absminmax, 0, 7);
112-
DEFINE_TEST_VARIANT3(arm_absmax_f16, 16, in_absminmax, 1, 16);
113-
DEFINE_TEST_VARIANT3(arm_absmax_f16, 23, in_absminmax, 2, 23);
111+
DEFINE_TEST_VARIANT3(statistics_f16, arm_absmax_f16, 7, in_absminmax, 0, 7);
112+
DEFINE_TEST_VARIANT3(statistics_f16, arm_absmax_f16, 16, in_absminmax, 1, 16);
113+
DEFINE_TEST_VARIANT3(statistics_f16, arm_absmax_f16, 23, in_absminmax, 2, 23);
114114

115115
static void test_arm_absmin_f16(
116116
const uint16_t *input1, int ref_index, size_t length)
@@ -129,9 +129,9 @@ static void test_arm_absmin_f16(
129129
ASSERT_MSG_INCORRECT_COMP_RESULT);
130130
}
131131

132-
DEFINE_TEST_VARIANT3(arm_absmin_f16, 7, in_absminmax, 0, 7);
133-
DEFINE_TEST_VARIANT3(arm_absmin_f16, 16, in_absminmax, 1, 16);
134-
DEFINE_TEST_VARIANT3(arm_absmin_f16, 23, in_absminmax, 2, 23);
132+
DEFINE_TEST_VARIANT3(statistics_f16, arm_absmin_f16, 7, in_absminmax, 0, 7);
133+
DEFINE_TEST_VARIANT3(statistics_f16, arm_absmin_f16, 16, in_absminmax, 1, 16);
134+
DEFINE_TEST_VARIANT3(statistics_f16, arm_absmin_f16, 23, in_absminmax, 2, 23);
135135

136136
static void test_arm_mean_f16(
137137
const uint16_t *input1, int ref_index, size_t length)
@@ -162,9 +162,9 @@ static void test_arm_mean_f16(
162162
free(output);
163163
}
164164

165-
DEFINE_TEST_VARIANT3(arm_mean_f16, 7, in_com2, 0, 7);
166-
DEFINE_TEST_VARIANT3(arm_mean_f16, 16, in_com2, 1, 16);
167-
DEFINE_TEST_VARIANT3(arm_mean_f16, 23, in_com2, 2, 23);
165+
DEFINE_TEST_VARIANT3(statistics_f16, arm_mean_f16, 7, in_com2, 0, 7);
166+
DEFINE_TEST_VARIANT3(statistics_f16, arm_mean_f16, 16, in_com2, 1, 16);
167+
DEFINE_TEST_VARIANT3(statistics_f16, arm_mean_f16, 23, in_com2, 2, 23);
168168

169169
static void test_arm_power_f16(
170170
const uint16_t *input1, int ref_index, size_t length)
@@ -195,9 +195,9 @@ static void test_arm_power_f16(
195195
free(output);
196196
}
197197

198-
DEFINE_TEST_VARIANT3(arm_power_f16, 7, in_com1, 0, 7);
199-
DEFINE_TEST_VARIANT3(arm_power_f16, 16, in_com1, 1, 16);
200-
DEFINE_TEST_VARIANT3(arm_power_f16, 23, in_com1, 2, 23);
198+
DEFINE_TEST_VARIANT3(statistics_f16, arm_power_f16, 7, in_com1, 0, 7);
199+
DEFINE_TEST_VARIANT3(statistics_f16, arm_power_f16, 16, in_com1, 1, 16);
200+
DEFINE_TEST_VARIANT3(statistics_f16, arm_power_f16, 23, in_com1, 2, 23);
201201

202202
static void test_arm_rms_f16(
203203
const uint16_t *input1, int ref_index, size_t length)
@@ -228,9 +228,9 @@ static void test_arm_rms_f16(
228228
free(output);
229229
}
230230

231-
DEFINE_TEST_VARIANT3(arm_rms_f16, 7, in_com1, 0, 7);
232-
DEFINE_TEST_VARIANT3(arm_rms_f16, 16, in_com1, 1, 16);
233-
DEFINE_TEST_VARIANT3(arm_rms_f16, 23, in_com1, 2, 23);
231+
DEFINE_TEST_VARIANT3(statistics_f16, arm_rms_f16, 7, in_com1, 0, 7);
232+
DEFINE_TEST_VARIANT3(statistics_f16, arm_rms_f16, 16, in_com1, 1, 16);
233+
DEFINE_TEST_VARIANT3(statistics_f16, arm_rms_f16, 23, in_com1, 2, 23);
234234

235235
static void test_arm_std_f16(
236236
const uint16_t *input1, int ref_index, size_t length)
@@ -261,9 +261,9 @@ static void test_arm_std_f16(
261261
free(output);
262262
}
263263

264-
DEFINE_TEST_VARIANT3(arm_std_f16, 7, in_com1, 0, 7);
265-
DEFINE_TEST_VARIANT3(arm_std_f16, 16, in_com1, 1, 16);
266-
DEFINE_TEST_VARIANT3(arm_std_f16, 23, in_com1, 2, 23);
264+
DEFINE_TEST_VARIANT3(statistics_f16, arm_std_f16, 7, in_com1, 0, 7);
265+
DEFINE_TEST_VARIANT3(statistics_f16, arm_std_f16, 16, in_com1, 1, 16);
266+
DEFINE_TEST_VARIANT3(statistics_f16, arm_std_f16, 23, in_com1, 2, 23);
267267

268268
static void test_arm_var_f16(
269269
const uint16_t *input1, int ref_index, size_t length)
@@ -294,11 +294,11 @@ static void test_arm_var_f16(
294294
free(output);
295295
}
296296

297-
DEFINE_TEST_VARIANT3(arm_var_f16, 7, in_com1, 0, 7);
298-
DEFINE_TEST_VARIANT3(arm_var_f16, 16, in_com1, 1, 16);
299-
DEFINE_TEST_VARIANT3(arm_var_f16, 23, in_com1, 2, 23);
297+
DEFINE_TEST_VARIANT3(statistics_f16, arm_var_f16, 7, in_com1, 0, 7);
298+
DEFINE_TEST_VARIANT3(statistics_f16, arm_var_f16, 16, in_com1, 1, 16);
299+
DEFINE_TEST_VARIANT3(statistics_f16, arm_var_f16, 23, in_com1, 2, 23);
300300

301-
static void test_arm_entropy_f16(void)
301+
ZTEST(statistics_f16, test_arm_entropy_f16)
302302
{
303303
size_t index;
304304
size_t length = in_entropy_dim[0];
@@ -333,7 +333,7 @@ static void test_arm_entropy_f16(void)
333333
free(output);
334334
}
335335

336-
static void test_arm_logsumexp_f16(void)
336+
ZTEST(statistics_f16, test_arm_logsumexp_f16)
337337
{
338338
size_t index;
339339
size_t length = in_logsumexp_dim[0];
@@ -368,7 +368,7 @@ static void test_arm_logsumexp_f16(void)
368368
free(output);
369369
}
370370

371-
static void test_arm_kullback_leibler_f16(void)
371+
ZTEST(statistics_f16, test_arm_kullback_leibler_f16)
372372
{
373373
size_t index;
374374
size_t length = in_kl_dim[0];
@@ -408,7 +408,7 @@ static void test_arm_kullback_leibler_f16(void)
408408
free(output);
409409
}
410410

411-
static void test_arm_logsumexp_dot_prod_f16(void)
411+
ZTEST(statistics_f16, test_arm_logsumexp_dot_prod_f16)
412412
{
413413
size_t index;
414414
size_t length = in_logsumexp_dp_dim[0];
@@ -453,44 +453,4 @@ static void test_arm_logsumexp_dot_prod_f16(void)
453453
free(tmp);
454454
}
455455

456-
void test_statistics_f16(void)
457-
{
458-
ztest_test_suite(statistics_f16,
459-
ztest_unit_test(test_arm_max_f16_7),
460-
ztest_unit_test(test_arm_max_f16_16),
461-
ztest_unit_test(test_arm_max_f16_23),
462-
ztest_unit_test(test_arm_min_f16_7),
463-
ztest_unit_test(test_arm_min_f16_16),
464-
ztest_unit_test(test_arm_min_f16_23),
465-
ztest_unit_test(test_arm_absmax_f16_7),
466-
ztest_unit_test(test_arm_absmax_f16_16),
467-
ztest_unit_test(test_arm_absmax_f16_23),
468-
ztest_unit_test(test_arm_absmin_f16_7),
469-
ztest_unit_test(test_arm_absmin_f16_16),
470-
ztest_unit_test(test_arm_absmin_f16_23),
471-
ztest_unit_test(test_arm_mean_f16_7),
472-
ztest_unit_test(test_arm_mean_f16_16),
473-
ztest_unit_test(test_arm_mean_f16_23),
474-
ztest_unit_test(test_arm_power_f16_7),
475-
ztest_unit_test(test_arm_power_f16_16),
476-
ztest_unit_test(test_arm_power_f16_23),
477-
ztest_unit_test(test_arm_rms_f16_7),
478-
ztest_unit_test(test_arm_rms_f16_16),
479-
ztest_unit_test(test_arm_rms_f16_23),
480-
ztest_unit_test(test_arm_std_f16_7),
481-
ztest_unit_test(test_arm_std_f16_16),
482-
ztest_unit_test(test_arm_std_f16_23),
483-
ztest_unit_test(test_arm_var_f16_7),
484-
ztest_unit_test(test_arm_var_f16_16),
485-
ztest_unit_test(test_arm_var_f16_23),
486-
ztest_unit_test(test_arm_entropy_f16),
487-
ztest_unit_test(test_arm_logsumexp_f16),
488-
ztest_unit_test(test_arm_kullback_leibler_f16),
489-
ztest_unit_test(test_arm_logsumexp_dot_prod_f16),
490-
ztest_unit_test(test_arm_max_no_idx_f16_7),
491-
ztest_unit_test(test_arm_max_no_idx_f16_16),
492-
ztest_unit_test(test_arm_max_no_idx_f16_23)
493-
);
494-
495-
ztest_run_test_suite(statistics_f16);
496-
}
456+
ZTEST_SUITE(statistics_f16, NULL, NULL, NULL, NULL, NULL);

0 commit comments

Comments
 (0)