Skip to content

Commit 26b816c

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

22 files changed

+68
-648
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ cmake_minimum_required(VERSION 3.20.0)
44
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
55
project(cmsis_dsp_filtering)
66

7-
target_sources(app PRIVATE src/main.c)
8-
97
if(CONFIG_CMSIS_DSP_TEST_FILTERING_BIQUAD)
108
target_sources(app PRIVATE
119
src/biquad_q15.c

‎tests/lib/cmsis_dsp/filtering/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_FILTERING=y

‎tests/lib/cmsis_dsp/filtering/prj_base.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_FILTERING=y

‎tests/lib/cmsis_dsp/filtering/src/biquad_f16.c‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define REL_ERROR_THRESH (5.0e-2)
1818
#define ABS_ERROR_THRESH (1.0e-1)
1919

20-
static void test_arm_biquad_cascade_df1_f16_default(void)
20+
ZTEST(filtering_biquad_f16, test_arm_biquad_cascade_df1_f16_default)
2121
{
2222
size_t index;
2323
size_t length = ARRAY_SIZE(ref_default);
@@ -78,7 +78,7 @@ static void test_arm_biquad_cascade_df1_f16_default(void)
7878
free(output_buf);
7979
}
8080

81-
static void test_arm_biquad_cascade_df2t_f16_default(void)
81+
ZTEST(filtering_biquad_f16, test_arm_biquad_cascade_df2t_f16_default)
8282
{
8383
size_t index;
8484
size_t length = ARRAY_SIZE(ref_default);
@@ -128,7 +128,7 @@ static void test_arm_biquad_cascade_df2t_f16_default(void)
128128
free(output_buf);
129129
}
130130

131-
static void test_arm_biquad_cascade_df1_f16_rand(void)
131+
ZTEST(filtering_biquad_f16, test_arm_biquad_cascade_df1_f16_rand)
132132
{
133133
size_t sample_index, stage_count, block_size;
134134
size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
@@ -195,7 +195,7 @@ static void test_arm_biquad_cascade_df1_f16_rand(void)
195195
free(output_buf);
196196
}
197197

198-
static void test_arm_biquad_cascade_df2t_f16_rand(void)
198+
ZTEST(filtering_biquad_f16, test_arm_biquad_cascade_df2t_f16_rand)
199199
{
200200
size_t sample_index, stage_count, block_size;
201201
size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
@@ -253,7 +253,7 @@ static void test_arm_biquad_cascade_df2t_f16_rand(void)
253253
free(output_buf);
254254
}
255255

256-
static void test_arm_biquad_cascade_stereo_df2t_f16_rand(void)
256+
ZTEST(filtering_biquad_f16, test_arm_biquad_cascade_stereo_df2t_f16_rand)
257257
{
258258
size_t sample_index, stage_count, block_size;
259259
size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
@@ -310,15 +310,4 @@ static void test_arm_biquad_cascade_stereo_df2t_f16_rand(void)
310310
free(output_buf);
311311
}
312312

313-
void test_filtering_biquad_f16(void)
314-
{
315-
ztest_test_suite(filtering_biquad_f16,
316-
ztest_unit_test(test_arm_biquad_cascade_df1_f16_default),
317-
ztest_unit_test(test_arm_biquad_cascade_df2t_f16_default),
318-
ztest_unit_test(test_arm_biquad_cascade_df1_f16_rand),
319-
ztest_unit_test(test_arm_biquad_cascade_df2t_f16_rand),
320-
ztest_unit_test(test_arm_biquad_cascade_stereo_df2t_f16_rand)
321-
);
322-
323-
ztest_run_test_suite(filtering_biquad_f16);
324-
}
313+
ZTEST_SUITE(filtering_biquad_f16, NULL, NULL, NULL, NULL, NULL);

‎tests/lib/cmsis_dsp/filtering/src/biquad_f32.c‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define SNR_ERROR_THRESH ((float32_t)98)
1717
#define REL_ERROR_THRESH (1.2e-3)
1818

19-
static void test_arm_biquad_cascade_df1_f32_default(void)
19+
ZTEST(filtering_biquad_f32, test_arm_biquad_cascade_df1_f32_default)
2020
{
2121
size_t index;
2222
size_t length = ARRAY_SIZE(ref_default);
@@ -76,7 +76,7 @@ static void test_arm_biquad_cascade_df1_f32_default(void)
7676
free(output_buf);
7777
}
7878

79-
static void test_arm_biquad_cascade_df2t_f32_default(void)
79+
ZTEST(filtering_biquad_f32, test_arm_biquad_cascade_df2t_f32_default)
8080
{
8181
size_t index;
8282
size_t length = ARRAY_SIZE(ref_default);
@@ -125,7 +125,7 @@ static void test_arm_biquad_cascade_df2t_f32_default(void)
125125
free(output_buf);
126126
}
127127

128-
static void test_arm_biquad_cascade_df1_f32_rand(void)
128+
ZTEST(filtering_biquad_f32, test_arm_biquad_cascade_df1_f32_rand)
129129
{
130130
size_t sample_index, stage_count, block_size;
131131
size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
@@ -191,7 +191,7 @@ static void test_arm_biquad_cascade_df1_f32_rand(void)
191191
free(output_buf);
192192
}
193193

194-
static void test_arm_biquad_cascade_df2t_f32_rand(void)
194+
ZTEST(filtering_biquad_f32, test_arm_biquad_cascade_df2t_f32_rand)
195195
{
196196
size_t sample_index, stage_count, block_size;
197197
size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
@@ -248,7 +248,7 @@ static void test_arm_biquad_cascade_df2t_f32_rand(void)
248248
free(output_buf);
249249
}
250250

251-
static void test_arm_biquad_cascade_stereo_df2t_f32_rand(void)
251+
ZTEST(filtering_biquad_f32, test_arm_biquad_cascade_stereo_df2t_f32_rand)
252252
{
253253
size_t sample_index, stage_count, block_size;
254254
size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
@@ -304,15 +304,4 @@ static void test_arm_biquad_cascade_stereo_df2t_f32_rand(void)
304304
free(output_buf);
305305
}
306306

307-
void test_filtering_biquad_f32(void)
308-
{
309-
ztest_test_suite(filtering_biquad_f32,
310-
ztest_unit_test(test_arm_biquad_cascade_df1_f32_default),
311-
ztest_unit_test(test_arm_biquad_cascade_df2t_f32_default),
312-
ztest_unit_test(test_arm_biquad_cascade_df1_f32_rand),
313-
ztest_unit_test(test_arm_biquad_cascade_df2t_f32_rand),
314-
ztest_unit_test(test_arm_biquad_cascade_stereo_df2t_f32_rand)
315-
);
316-
317-
ztest_run_test_suite(filtering_biquad_f32);
318-
}
307+
ZTEST_SUITE(filtering_biquad_f32, NULL, NULL, NULL, NULL, NULL);

‎tests/lib/cmsis_dsp/filtering/src/biquad_f64.c‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define SNR_ERROR_THRESH ((float64_t)98)
1717
#define REL_ERROR_THRESH (1.2e-3)
1818

19-
static void test_arm_biquad_cascade_df2t_f64_default(void)
19+
ZTEST(filtering_biquad_f64, test_arm_biquad_cascade_df2t_f64_default)
2020
{
2121
size_t index;
2222
size_t length = ARRAY_SIZE(ref_default);
@@ -66,7 +66,7 @@ static void test_arm_biquad_cascade_df2t_f64_default(void)
6666
free(output_buf);
6767
}
6868

69-
static void test_arm_biquad_cascade_df2t_f64_rand(void)
69+
ZTEST(filtering_biquad_f64, test_arm_biquad_cascade_df2t_f64_rand)
7070
{
7171
size_t sample_index, stage_count, block_size;
7272
size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
@@ -124,12 +124,4 @@ static void test_arm_biquad_cascade_df2t_f64_rand(void)
124124
free(output_buf);
125125
}
126126

127-
void test_filtering_biquad_f64(void)
128-
{
129-
ztest_test_suite(filtering_biquad_f64,
130-
ztest_unit_test(test_arm_biquad_cascade_df2t_f64_default),
131-
ztest_unit_test(test_arm_biquad_cascade_df2t_f64_rand)
132-
);
133-
134-
ztest_run_test_suite(filtering_biquad_f64);
135-
}
127+
ZTEST_SUITE(filtering_biquad_f64, NULL, NULL, NULL, NULL, NULL);

‎tests/lib/cmsis_dsp/filtering/src/biquad_q15.c‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define SNR_ERROR_THRESH ((float32_t)30)
1717
#define ABS_ERROR_THRESH_Q15 ((q15_t)500)
1818

19-
static void test_arm_biquad_cascade_df1_q15(void)
19+
ZTEST(filtering_biquad_q15, test_arm_biquad_cascade_df1_q15)
2020
{
2121
size_t index;
2222
size_t length = ARRAY_SIZE(ref_default);
@@ -64,11 +64,4 @@ static void test_arm_biquad_cascade_df1_q15(void)
6464
free(output_buf);
6565
}
6666

67-
void test_filtering_biquad_q15(void)
68-
{
69-
ztest_test_suite(filtering_biquad_q15,
70-
ztest_unit_test(test_arm_biquad_cascade_df1_q15)
71-
);
72-
73-
ztest_run_test_suite(filtering_biquad_q15);
74-
}
67+
ZTEST_SUITE(filtering_biquad_q15, NULL, NULL, NULL, NULL, NULL);

‎tests/lib/cmsis_dsp/filtering/src/biquad_q31.c‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define SNR_ERROR_THRESH_32x64 ((float32_t)140)
2020
#define ABS_ERROR_THRESH_Q31_32x64 ((q31_t)25)
2121

22-
static void test_arm_biquad_cascade_df1_q31(void)
22+
ZTEST(filtering_biquad_q31, test_arm_biquad_cascade_df1_q31)
2323
{
2424
size_t index;
2525
size_t length = ARRAY_SIZE(ref_default);
@@ -67,7 +67,7 @@ static void test_arm_biquad_cascade_df1_q31(void)
6767
free(output_buf);
6868
}
6969

70-
static void test_arm_biquad_cascade_df1_32x64_q31(void)
70+
ZTEST(filtering_biquad_q31, test_arm_biquad_cascade_df1_32x64_q31)
7171
{
7272
size_t index;
7373
size_t length = ARRAY_SIZE(ref_default);
@@ -117,12 +117,4 @@ static void test_arm_biquad_cascade_df1_32x64_q31(void)
117117
free(output_buf);
118118
}
119119

120-
void test_filtering_biquad_q31(void)
121-
{
122-
ztest_test_suite(filtering_biquad_q31,
123-
ztest_unit_test(test_arm_biquad_cascade_df1_q31),
124-
ztest_unit_test(test_arm_biquad_cascade_df1_32x64_q31)
125-
);
126-
127-
ztest_run_test_suite(filtering_biquad_q31);
128-
}
120+
ZTEST_SUITE(filtering_biquad_q31, NULL, NULL, NULL, NULL, NULL);

‎tests/lib/cmsis_dsp/filtering/src/decim_f32.c‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define REL_ERROR_THRESH (8.0e-4)
1818
#define STATE_BUF_LEN (16 + 768 - 1)
1919

20-
static void test_arm_fir_decimate_f32(void)
20+
ZTEST(filtering_decim_f32, test_arm_fir_decimate_f32)
2121
{
2222
uint32_t decim_factor, tap_count;
2323
size_t sample_index, block_size, ref_size;
@@ -80,7 +80,7 @@ static void test_arm_fir_decimate_f32(void)
8080
free(output_buf);
8181
}
8282

83-
static void test_arm_fir_interpolate_f32(void)
83+
ZTEST(filtering_decim_f32, test_arm_fir_interpolate_f32)
8484
{
8585
uint32_t filter_length, tap_count;
8686
size_t sample_index, block_size, ref_size;
@@ -143,12 +143,4 @@ static void test_arm_fir_interpolate_f32(void)
143143
free(output_buf);
144144
}
145145

146-
void test_filtering_decim_f32(void)
147-
{
148-
ztest_test_suite(filtering_decim_f32,
149-
ztest_unit_test(test_arm_fir_decimate_f32),
150-
ztest_unit_test(test_arm_fir_interpolate_f32)
151-
);
152-
153-
ztest_run_test_suite(filtering_decim_f32);
154-
}
146+
ZTEST_SUITE(filtering_decim_f32, NULL, NULL, NULL, NULL, NULL);

‎tests/lib/cmsis_dsp/filtering/src/decim_q15.c‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define ABS_ERROR_THRESH_Q15 ((q15_t)5)
1818
#define STATE_BUF_LEN (16 + 768 - 1)
1919

20-
static void test_arm_fir_decimate_q15(void)
20+
ZTEST(filtering_decim_q15, test_arm_fir_decimate_q15)
2121
{
2222
uint32_t decim_factor, tap_count;
2323
size_t sample_index, block_size, ref_size;
@@ -81,7 +81,7 @@ static void test_arm_fir_decimate_q15(void)
8181
free(output_buf);
8282
}
8383

84-
static void test_arm_fir_interpolate_q15(void)
84+
ZTEST(filtering_decim_q15, test_arm_fir_interpolate_q15)
8585
{
8686
uint32_t filter_length, tap_count;
8787
size_t sample_index, block_size, ref_size;
@@ -145,12 +145,4 @@ static void test_arm_fir_interpolate_q15(void)
145145
free(output_buf);
146146
}
147147

148-
void test_filtering_decim_q15(void)
149-
{
150-
ztest_test_suite(filtering_decim_q15,
151-
ztest_unit_test(test_arm_fir_decimate_q15),
152-
ztest_unit_test(test_arm_fir_interpolate_q15)
153-
);
154-
155-
ztest_run_test_suite(filtering_decim_q15);
156-
}
148+
ZTEST_SUITE(filtering_decim_q15, NULL, NULL, NULL, NULL, NULL);

0 commit comments

Comments
 (0)