From 3e2fe17fa8d2526ca2e005ff89c33382e8b7b2d7 Mon Sep 17 00:00:00 2001 From: Enjia Mai Date: Fri, 9 Sep 2022 12:49:28 +0800 Subject: [PATCH] tests: lib: move the cmsis_dsp support test to new ztest API Migrate the testsuite tests/lib/cmsis_dsp/support to the new ztest API. Signed-off-by: Enjia Mai --- tests/lib/cmsis_dsp/support/CMakeLists.txt | 1 - tests/lib/cmsis_dsp/support/prj.conf | 1 + .../cmsis_dsp/support/src/barycenter_f16.c | 11 +- .../cmsis_dsp/support/src/barycenter_f32.c | 11 +- tests/lib/cmsis_dsp/support/src/f16.c | 71 +++------- tests/lib/cmsis_dsp/support/src/f32.c | 125 ++++++------------ tests/lib/cmsis_dsp/support/src/main.c | 31 ----- tests/lib/cmsis_dsp/support/src/q15.c | 53 +++----- tests/lib/cmsis_dsp/support/src/q31.c | 53 +++----- tests/lib/cmsis_dsp/support/src/q7.c | 53 +++----- 10 files changed, 115 insertions(+), 295 deletions(-) delete mode 100644 tests/lib/cmsis_dsp/support/src/main.c diff --git a/tests/lib/cmsis_dsp/support/CMakeLists.txt b/tests/lib/cmsis_dsp/support/CMakeLists.txt index 6e15751cecc..a4f52af2ef7 100644 --- a/tests/lib/cmsis_dsp/support/CMakeLists.txt +++ b/tests/lib/cmsis_dsp/support/CMakeLists.txt @@ -10,7 +10,6 @@ target_sources(app PRIVATE src/q31.c src/f32.c src/barycenter_f32.c - src/main.c ) target_sources_ifdef(CONFIG_CMSIS_DSP_FLOAT16 app PRIVATE diff --git a/tests/lib/cmsis_dsp/support/prj.conf b/tests/lib/cmsis_dsp/support/prj.conf index bfb4db9150a..80c8923b3a7 100644 --- a/tests/lib/cmsis_dsp/support/prj.conf +++ b/tests/lib/cmsis_dsp/support/prj.conf @@ -1,4 +1,5 @@ CONFIG_ZTEST=y +CONFIG_ZTEST_NEW_API=y CONFIG_NEWLIB_LIBC=y CONFIG_CMSIS_DSP=y CONFIG_CMSIS_DSP_SUPPORT=y diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f16.c b/tests/lib/cmsis_dsp/support/src/barycenter_f16.c index f5168e64bca..7052c290c87 100644 --- a/tests/lib/cmsis_dsp/support/src/barycenter_f16.c +++ b/tests/lib/cmsis_dsp/support/src/barycenter_f16.c @@ -15,7 +15,7 @@ #define ABS_ERROR_THRESH (1e-3) -void test_arm_barycenter_f16(void) +ZTEST(support_barycenter_f16, test_arm_barycenter_f16) { int test_index; const size_t length = ARRAY_SIZE(ref_barycenter); @@ -58,11 +58,4 @@ void test_arm_barycenter_f16(void) free(output_buf); } -void test_support_barycenter_f16(void) -{ - ztest_test_suite(support_barycenter_f16, - ztest_unit_test(test_arm_barycenter_f16) - ); - - ztest_run_test_suite(support_barycenter_f16); -} +ZTEST_SUITE(support_barycenter_f16, NULL, NULL, NULL, NULL, NULL); diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c index 216a1507fd9..d4237f19c50 100644 --- a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c +++ b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c @@ -15,7 +15,7 @@ #define ABS_ERROR_THRESH (1e-3) -void test_arm_barycenter_f32(void) +ZTEST(support_barycenter_f32, test_arm_barycenter_f32) { int test_index; const size_t length = ARRAY_SIZE(ref_barycenter); @@ -58,11 +58,4 @@ void test_arm_barycenter_f32(void) free(output_buf); } -void test_support_barycenter_f32(void) -{ - ztest_test_suite(support_barycenter_f32, - ztest_unit_test(test_arm_barycenter_f32) - ); - - ztest_run_test_suite(support_barycenter_f32); -} +ZTEST_SUITE(support_barycenter_f32, NULL, NULL, NULL, NULL, NULL); diff --git a/tests/lib/cmsis_dsp/support/src/f16.c b/tests/lib/cmsis_dsp/support/src/f16.c index 0a1b79fea34..6b5c5231703 100644 --- a/tests/lib/cmsis_dsp/support/src/f16.c +++ b/tests/lib/cmsis_dsp/support/src/f16.c @@ -48,9 +48,9 @@ static void test_arm_copy_f16(const uint16_t *input1, size_t length) free(output); } -DEFINE_TEST_VARIANT2(arm_copy_f16, 7, ref_f16, 7); -DEFINE_TEST_VARIANT2(arm_copy_f16, 16, ref_f16, 16); -DEFINE_TEST_VARIANT2(arm_copy_f16, 23, ref_f16, 23); +DEFINE_TEST_VARIANT2(support_f16, arm_copy_f16, 7, ref_f16, 7); +DEFINE_TEST_VARIANT2(support_f16, arm_copy_f16, 16, ref_f16, 16); +DEFINE_TEST_VARIANT2(support_f16, arm_copy_f16, 23, ref_f16, 23); static void test_arm_fill_f16(size_t length) { @@ -75,9 +75,9 @@ static void test_arm_fill_f16(size_t length) free(output); } -DEFINE_TEST_VARIANT1(arm_fill_f16, 7, 7); -DEFINE_TEST_VARIANT1(arm_fill_f16, 16, 16); -DEFINE_TEST_VARIANT1(arm_fill_f16, 23, 23); +DEFINE_TEST_VARIANT1(support_f16, arm_fill_f16, 7, 7); +DEFINE_TEST_VARIANT1(support_f16, arm_fill_f16, 16, 16); +DEFINE_TEST_VARIANT1(support_f16, arm_fill_f16, 23, 23); static void test_arm_f16_to_q15( const uint16_t *input1, const q15_t *ref, size_t length) @@ -100,9 +100,9 @@ static void test_arm_f16_to_q15( free(output); } -DEFINE_TEST_VARIANT3(arm_f16_to_q15, 7, ref_f16, ref_q15, 7); -DEFINE_TEST_VARIANT3(arm_f16_to_q15, 16, ref_f16, ref_q15, 16); -DEFINE_TEST_VARIANT3(arm_f16_to_q15, 23, ref_f16, ref_q15, 23); +DEFINE_TEST_VARIANT3(support_f16, arm_f16_to_q15, 7, ref_f16, ref_q15, 7); +DEFINE_TEST_VARIANT3(support_f16, arm_f16_to_q15, 16, ref_f16, ref_q15, 16); +DEFINE_TEST_VARIANT3(support_f16, arm_f16_to_q15, 23, ref_f16, ref_q15, 23); static void test_arm_f16_to_float( const uint16_t *input1, const uint32_t *ref, size_t length) @@ -126,9 +126,9 @@ static void test_arm_f16_to_float( free(output); } -DEFINE_TEST_VARIANT3(arm_f16_to_float, 7, ref_f16, ref_f32, 7); -DEFINE_TEST_VARIANT3(arm_f16_to_float, 16, ref_f16, ref_f32, 16); -DEFINE_TEST_VARIANT3(arm_f16_to_float, 23, ref_f16, ref_f32, 23); +DEFINE_TEST_VARIANT3(support_f16, arm_f16_to_float, 7, ref_f16, ref_f32, 7); +DEFINE_TEST_VARIANT3(support_f16, arm_f16_to_float, 16, ref_f16, ref_f32, 16); +DEFINE_TEST_VARIANT3(support_f16, arm_f16_to_float, 23, ref_f16, ref_f32, 23); static void test_arm_q15_to_f16( const q15_t *input1, const uint16_t *ref, size_t length) @@ -152,9 +152,9 @@ static void test_arm_q15_to_f16( free(output); } -DEFINE_TEST_VARIANT3(arm_q15_to_f16, 7, ref_q15, ref_f16, 7); -DEFINE_TEST_VARIANT3(arm_q15_to_f16, 16, ref_q15, ref_f16, 16); -DEFINE_TEST_VARIANT3(arm_q15_to_f16, 23, ref_q15, ref_f16, 23); +DEFINE_TEST_VARIANT3(support_f16, arm_q15_to_f16, 7, ref_q15, ref_f16, 7); +DEFINE_TEST_VARIANT3(support_f16, arm_q15_to_f16, 16, ref_q15, ref_f16, 16); +DEFINE_TEST_VARIANT3(support_f16, arm_q15_to_f16, 23, ref_q15, ref_f16, 23); static void test_arm_float_to_f16( const uint32_t *input1, const uint16_t *ref, size_t length) @@ -178,9 +178,9 @@ static void test_arm_float_to_f16( free(output); } -DEFINE_TEST_VARIANT3(arm_float_to_f16, 7, ref_f32, ref_f16, 7); -DEFINE_TEST_VARIANT3(arm_float_to_f16, 16, ref_f32, ref_f16, 16); -DEFINE_TEST_VARIANT3(arm_float_to_f16, 23, ref_f32, ref_f16, 23); +DEFINE_TEST_VARIANT3(support_f16, arm_float_to_f16, 7, ref_f32, ref_f16, 7); +DEFINE_TEST_VARIANT3(support_f16, arm_float_to_f16, 16, ref_f32, ref_f16, 16); +DEFINE_TEST_VARIANT3(support_f16, arm_float_to_f16, 23, ref_f32, ref_f16, 23); static void test_arm_weighted_sum_f16( int ref_offset, size_t length) @@ -207,35 +207,8 @@ static void test_arm_weighted_sum_f16( free(output); } -DEFINE_TEST_VARIANT2(arm_weighted_sum_f16, 7, 0, 7); -DEFINE_TEST_VARIANT2(arm_weighted_sum_f16, 16, 1, 16); -DEFINE_TEST_VARIANT2(arm_weighted_sum_f16, 23, 2, 23); +DEFINE_TEST_VARIANT2(support_f16, arm_weighted_sum_f16, 7, 0, 7); +DEFINE_TEST_VARIANT2(support_f16, arm_weighted_sum_f16, 16, 1, 16); +DEFINE_TEST_VARIANT2(support_f16, arm_weighted_sum_f16, 23, 2, 23); -void test_support_f16(void) -{ - ztest_test_suite(support_f16, - ztest_unit_test(test_arm_copy_f16_7), - ztest_unit_test(test_arm_copy_f16_16), - ztest_unit_test(test_arm_copy_f16_23), - ztest_unit_test(test_arm_fill_f16_7), - ztest_unit_test(test_arm_fill_f16_16), - ztest_unit_test(test_arm_fill_f16_23), - ztest_unit_test(test_arm_f16_to_q15_7), - ztest_unit_test(test_arm_f16_to_q15_16), - ztest_unit_test(test_arm_f16_to_q15_23), - ztest_unit_test(test_arm_f16_to_float_7), - ztest_unit_test(test_arm_f16_to_float_16), - ztest_unit_test(test_arm_f16_to_float_23), - ztest_unit_test(test_arm_q15_to_f16_7), - ztest_unit_test(test_arm_q15_to_f16_16), - ztest_unit_test(test_arm_q15_to_f16_23), - ztest_unit_test(test_arm_float_to_f16_7), - ztest_unit_test(test_arm_float_to_f16_16), - ztest_unit_test(test_arm_float_to_f16_23), - ztest_unit_test(test_arm_weighted_sum_f16_7), - ztest_unit_test(test_arm_weighted_sum_f16_16), - ztest_unit_test(test_arm_weighted_sum_f16_23) - ); - - ztest_run_test_suite(support_f16); -} +ZTEST_SUITE(support_f16, NULL, NULL, NULL, NULL, NULL); diff --git a/tests/lib/cmsis_dsp/support/src/f32.c b/tests/lib/cmsis_dsp/support/src/f32.c index cdfcbf20d6a..70dc73a6b00 100644 --- a/tests/lib/cmsis_dsp/support/src/f32.c +++ b/tests/lib/cmsis_dsp/support/src/f32.c @@ -39,9 +39,9 @@ static void test_arm_copy_f32(const uint32_t *input1, size_t length) free(output); } -DEFINE_TEST_VARIANT2(arm_copy_f32, 3, in_f32, 3); -DEFINE_TEST_VARIANT2(arm_copy_f32, 8, in_f32, 8); -DEFINE_TEST_VARIANT2(arm_copy_f32, 11, in_f32, 11); +DEFINE_TEST_VARIANT2(support_f32, arm_copy_f32, 3, in_f32, 3); +DEFINE_TEST_VARIANT2(support_f32, arm_copy_f32, 8, in_f32, 8); +DEFINE_TEST_VARIANT2(support_f32, arm_copy_f32, 11, in_f32, 11); static void test_arm_fill_f32(size_t length) { @@ -66,9 +66,9 @@ static void test_arm_fill_f32(size_t length) free(output); } -DEFINE_TEST_VARIANT1(arm_fill_f32, 3, 3); -DEFINE_TEST_VARIANT1(arm_fill_f32, 8, 8); -DEFINE_TEST_VARIANT1(arm_fill_f32, 11, 11); +DEFINE_TEST_VARIANT1(support_f32, arm_fill_f32, 3, 3); +DEFINE_TEST_VARIANT1(support_f32, arm_fill_f32, 8, 8); +DEFINE_TEST_VARIANT1(support_f32, arm_fill_f32, 11, 11); static void test_arm_float_to_q31( const uint32_t *input1, const q31_t *ref, size_t length) @@ -91,9 +91,9 @@ static void test_arm_float_to_q31( free(output); } -DEFINE_TEST_VARIANT3(arm_float_to_q31, 3, in_f32, ref_q31, 3); -DEFINE_TEST_VARIANT3(arm_float_to_q31, 8, in_f32, ref_q31, 8); -DEFINE_TEST_VARIANT3(arm_float_to_q31, 11, in_f32, ref_q31, 11); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q31, 3, in_f32, ref_q31, 3); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q31, 8, in_f32, ref_q31, 8); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q31, 11, in_f32, ref_q31, 11); static void test_arm_float_to_q15( const uint32_t *input1, const q15_t *ref, size_t length) @@ -116,9 +116,9 @@ static void test_arm_float_to_q15( free(output); } -DEFINE_TEST_VARIANT3(arm_float_to_q15, 7, in_f32, ref_q15, 7); -DEFINE_TEST_VARIANT3(arm_float_to_q15, 16, in_f32, ref_q15, 16); -DEFINE_TEST_VARIANT3(arm_float_to_q15, 17, in_f32, ref_q15, 17); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q15, 7, in_f32, ref_q15, 7); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q15, 16, in_f32, ref_q15, 16); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q15, 17, in_f32, ref_q15, 17); static void test_arm_float_to_q7( const uint32_t *input1, const q7_t *ref, size_t length) @@ -141,9 +141,9 @@ static void test_arm_float_to_q7( free(output); } -DEFINE_TEST_VARIANT3(arm_float_to_q7, 15, in_f32, ref_q7, 15); -DEFINE_TEST_VARIANT3(arm_float_to_q7, 32, in_f32, ref_q7, 32); -DEFINE_TEST_VARIANT3(arm_float_to_q7, 33, in_f32, ref_q7, 33); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q7, 15, in_f32, ref_q7, 15); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q7, 32, in_f32, ref_q7, 32); +DEFINE_TEST_VARIANT3(support_f32, arm_float_to_q7, 33, in_f32, ref_q7, 33); static void test_arm_weighted_sum_f32( int ref_offset, size_t length) @@ -170,9 +170,9 @@ static void test_arm_weighted_sum_f32( free(output); } -DEFINE_TEST_VARIANT2(arm_weighted_sum_f32, 3, 0, 3); -DEFINE_TEST_VARIANT2(arm_weighted_sum_f32, 8, 1, 8); -DEFINE_TEST_VARIANT2(arm_weighted_sum_f32, 11, 2, 11); +DEFINE_TEST_VARIANT2(support_f32, arm_weighted_sum_f32, 3, 0, 3); +DEFINE_TEST_VARIANT2(support_f32, arm_weighted_sum_f32, 8, 1, 8); +DEFINE_TEST_VARIANT2(support_f32, arm_weighted_sum_f32, 11, 2, 11); static void test_arm_sort_out( const uint32_t *input1, const uint32_t *ref, size_t length, @@ -200,31 +200,31 @@ static void test_arm_sort_out( free(output); } -DEFINE_TEST_VARIANT5(arm_sort_out, bitonic_16, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_out, bitonic_16, in_sort_bitonic_16, ref_sort_bitonic_16, 16, ARM_SORT_BITONIC, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_out, bitonic_32, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_out, bitonic_32, in_sort_bitonic_32, ref_sort_bitonic_32, 32, ARM_SORT_BITONIC, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_out, bubble_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_out, bubble_11, in_sort, ref_sort, 11, ARM_SORT_BUBBLE, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_out, heap_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_out, heap_11, in_sort, ref_sort, 11, ARM_SORT_HEAP, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_out, insertion_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_out, insertion_11, in_sort, ref_sort, 11, ARM_SORT_INSERTION, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_out, quick_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_out, quick_11, in_sort, ref_sort, 11, ARM_SORT_QUICK, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_out, selection_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_out, selection_11, in_sort, ref_sort, 11, ARM_SORT_SELECTION, ARM_SORT_ASCENDING); @@ -260,7 +260,7 @@ static void test_arm_merge_sort_out( free(scratch); } -DEFINE_TEST_VARIANT4(arm_merge_sort_out, 11, +DEFINE_TEST_VARIANT4(support_f32, arm_merge_sort_out, 11, in_sort, ref_sort, 11, ARM_SORT_ASCENDING); static void test_arm_sort_in( @@ -292,27 +292,27 @@ static void test_arm_sort_in( free(output); } -DEFINE_TEST_VARIANT5(arm_sort_in, bitonic_32, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_in, bitonic_32, in_sort_bitonic_32, ref_sort_bitonic_32, 32, ARM_SORT_BITONIC, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_in, bubble_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_in, bubble_11, in_sort, ref_sort, 11, ARM_SORT_BUBBLE, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_in, heap_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_in, heap_11, in_sort, ref_sort, 11, ARM_SORT_HEAP, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_in, insertion_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_in, insertion_11, in_sort, ref_sort, 11, ARM_SORT_INSERTION, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_in, quick_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_in, quick_11, in_sort, ref_sort, 11, ARM_SORT_QUICK, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_in, selection_11, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_in, selection_11, in_sort, ref_sort, 11, ARM_SORT_SELECTION, ARM_SORT_ASCENDING); @@ -342,27 +342,27 @@ static void test_arm_sort_const( free(output); } -DEFINE_TEST_VARIANT5(arm_sort_const, bitonic_16, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_const, bitonic_16, in_sort_const, ref_sort_const, 16, ARM_SORT_BITONIC, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_const, bubble_16, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_const, bubble_16, in_sort_const, ref_sort_const, 16, ARM_SORT_BUBBLE, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_const, heap_16, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_const, heap_16, in_sort_const, ref_sort_const, 16, ARM_SORT_HEAP, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_const, insertion_16, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_const, insertion_16, in_sort_const, ref_sort_const, 16, ARM_SORT_INSERTION, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_const, quick_16, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_const, quick_16, in_sort_const, ref_sort_const, 16, ARM_SORT_QUICK, ARM_SORT_ASCENDING); -DEFINE_TEST_VARIANT5(arm_sort_const, selection_16, +DEFINE_TEST_VARIANT5(support_f32, arm_sort_const, selection_16, in_sort_const, ref_sort_const, 16, ARM_SORT_SELECTION, ARM_SORT_ASCENDING); @@ -398,52 +398,7 @@ static void test_arm_merge_sort_const( free(scratch); } -DEFINE_TEST_VARIANT4(arm_merge_sort_const, 16, +DEFINE_TEST_VARIANT4(support_f32, arm_merge_sort_const, 16, in_sort_const, ref_sort_const, 16, ARM_SORT_ASCENDING); -void test_support_f32(void) -{ - ztest_test_suite(support_f32, - ztest_unit_test(test_arm_copy_f32_3), - ztest_unit_test(test_arm_copy_f32_8), - ztest_unit_test(test_arm_copy_f32_11), - ztest_unit_test(test_arm_fill_f32_3), - ztest_unit_test(test_arm_fill_f32_8), - ztest_unit_test(test_arm_fill_f32_11), - ztest_unit_test(test_arm_float_to_q31_3), - ztest_unit_test(test_arm_float_to_q31_8), - ztest_unit_test(test_arm_float_to_q31_11), - ztest_unit_test(test_arm_float_to_q15_7), - ztest_unit_test(test_arm_float_to_q15_16), - ztest_unit_test(test_arm_float_to_q15_17), - ztest_unit_test(test_arm_float_to_q7_15), - ztest_unit_test(test_arm_float_to_q7_32), - ztest_unit_test(test_arm_float_to_q7_33), - ztest_unit_test(test_arm_weighted_sum_f32_3), - ztest_unit_test(test_arm_weighted_sum_f32_8), - ztest_unit_test(test_arm_weighted_sum_f32_11), - ztest_unit_test(test_arm_sort_out_bitonic_16), - ztest_unit_test(test_arm_sort_out_bitonic_32), - ztest_unit_test(test_arm_sort_in_bitonic_32), - ztest_unit_test(test_arm_sort_const_bitonic_16), - ztest_unit_test(test_arm_sort_out_bubble_11), - ztest_unit_test(test_arm_sort_in_bubble_11), - ztest_unit_test(test_arm_sort_const_bubble_16), - ztest_unit_test(test_arm_sort_out_heap_11), - ztest_unit_test(test_arm_sort_in_heap_11), - ztest_unit_test(test_arm_sort_const_heap_16), - ztest_unit_test(test_arm_sort_out_insertion_11), - ztest_unit_test(test_arm_sort_in_insertion_11), - ztest_unit_test(test_arm_sort_const_insertion_16), - ztest_unit_test(test_arm_sort_out_quick_11), - ztest_unit_test(test_arm_sort_in_quick_11), - ztest_unit_test(test_arm_sort_const_quick_16), - ztest_unit_test(test_arm_sort_out_selection_11), - ztest_unit_test(test_arm_sort_in_selection_11), - ztest_unit_test(test_arm_sort_const_selection_16), - ztest_unit_test(test_arm_merge_sort_out_11), - ztest_unit_test(test_arm_merge_sort_const_16) - ); - - ztest_run_test_suite(support_f32); -} +ZTEST_SUITE(support_f32, NULL, NULL, NULL, NULL, NULL); diff --git a/tests/lib/cmsis_dsp/support/src/main.c b/tests/lib/cmsis_dsp/support/src/main.c deleted file mode 100644 index e554babcc87..00000000000 --- a/tests/lib/cmsis_dsp/support/src/main.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2021 Stephanos Ioannidis - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -extern void test_support_q7(void); -extern void test_support_q15(void); -extern void test_support_q31(void); -extern void test_support_f16(void); -extern void test_support_f32(void); -extern void test_support_barycenter_f16(void); -extern void test_support_barycenter_f32(void); - -void test_main(void) -{ - test_support_q7(); - test_support_q15(); - test_support_q31(); -#ifdef CONFIG_CMSIS_DSP_FLOAT16 - test_support_f16(); -#endif - test_support_f32(); -#ifdef CONFIG_CMSIS_DSP_FLOAT16 - test_support_barycenter_f16(); -#endif - test_support_barycenter_f32(); -} diff --git a/tests/lib/cmsis_dsp/support/src/q15.c b/tests/lib/cmsis_dsp/support/src/q15.c index 6e151e80c1f..603cc56e3cd 100644 --- a/tests/lib/cmsis_dsp/support/src/q15.c +++ b/tests/lib/cmsis_dsp/support/src/q15.c @@ -38,9 +38,9 @@ static void test_arm_copy_q15(const q15_t *input1, size_t length) free(output); } -DEFINE_TEST_VARIANT2(arm_copy_q15, 7, in_q15, 7); -DEFINE_TEST_VARIANT2(arm_copy_q15, 16, in_q15, 16); -DEFINE_TEST_VARIANT2(arm_copy_q15, 23, in_q15, 23); +DEFINE_TEST_VARIANT2(support_q15, arm_copy_q15, 7, in_q15, 7); +DEFINE_TEST_VARIANT2(support_q15, arm_copy_q15, 16, in_q15, 16); +DEFINE_TEST_VARIANT2(support_q15, arm_copy_q15, 23, in_q15, 23); static void test_arm_fill_q15(size_t length) { @@ -65,9 +65,9 @@ static void test_arm_fill_q15(size_t length) free(output); } -DEFINE_TEST_VARIANT1(arm_fill_q15, 7, 7); -DEFINE_TEST_VARIANT1(arm_fill_q15, 16, 16); -DEFINE_TEST_VARIANT1(arm_fill_q15, 23, 23); +DEFINE_TEST_VARIANT1(support_q15, arm_fill_q15, 7, 7); +DEFINE_TEST_VARIANT1(support_q15, arm_fill_q15, 16, 16); +DEFINE_TEST_VARIANT1(support_q15, arm_fill_q15, 23, 23); static void test_arm_q15_to_float( const q15_t *input1, const uint32_t *ref, size_t length) @@ -91,9 +91,9 @@ static void test_arm_q15_to_float( free(output); } -DEFINE_TEST_VARIANT3(arm_q15_to_float, 7, in_q15, ref_f32, 7); -DEFINE_TEST_VARIANT3(arm_q15_to_float, 16, in_q15, ref_f32, 16); -DEFINE_TEST_VARIANT3(arm_q15_to_float, 23, in_q15, ref_f32, 23); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_float, 7, in_q15, ref_f32, 7); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_float, 16, in_q15, ref_f32, 16); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_float, 23, in_q15, ref_f32, 23); static void test_arm_q15_to_q31( const q15_t *input1, const q31_t *ref, size_t length) @@ -117,9 +117,9 @@ static void test_arm_q15_to_q31( free(output); } -DEFINE_TEST_VARIANT3(arm_q15_to_q31, 7, in_q15, ref_q31, 7); -DEFINE_TEST_VARIANT3(arm_q15_to_q31, 16, in_q15, ref_q31, 16); -DEFINE_TEST_VARIANT3(arm_q15_to_q31, 23, in_q15, ref_q31, 23); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_q31, 7, in_q15, ref_q31, 7); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_q31, 16, in_q15, ref_q31, 16); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_q31, 23, in_q15, ref_q31, 23); static void test_arm_q15_to_q7( const q15_t *input1, const q7_t *ref, size_t length) @@ -142,29 +142,8 @@ static void test_arm_q15_to_q7( free(output); } -DEFINE_TEST_VARIANT3(arm_q15_to_q7, 7, in_q15, ref_q7, 7); -DEFINE_TEST_VARIANT3(arm_q15_to_q7, 16, in_q15, ref_q7, 16); -DEFINE_TEST_VARIANT3(arm_q15_to_q7, 23, in_q15, ref_q7, 23); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_q7, 7, in_q15, ref_q7, 7); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_q7, 16, in_q15, ref_q7, 16); +DEFINE_TEST_VARIANT3(support_q15, arm_q15_to_q7, 23, in_q15, ref_q7, 23); -void test_support_q15(void) -{ - ztest_test_suite(support_q15, - ztest_unit_test(test_arm_copy_q15_7), - ztest_unit_test(test_arm_copy_q15_16), - ztest_unit_test(test_arm_copy_q15_23), - ztest_unit_test(test_arm_fill_q15_7), - ztest_unit_test(test_arm_fill_q15_16), - ztest_unit_test(test_arm_fill_q15_23), - ztest_unit_test(test_arm_q15_to_float_7), - ztest_unit_test(test_arm_q15_to_float_16), - ztest_unit_test(test_arm_q15_to_float_23), - ztest_unit_test(test_arm_q15_to_q31_7), - ztest_unit_test(test_arm_q15_to_q31_16), - ztest_unit_test(test_arm_q15_to_q31_23), - ztest_unit_test(test_arm_q15_to_q7_7), - ztest_unit_test(test_arm_q15_to_q7_16), - ztest_unit_test(test_arm_q15_to_q7_23) - ); - - ztest_run_test_suite(support_q15); -} +ZTEST_SUITE(support_q15, NULL, NULL, NULL, NULL, NULL); diff --git a/tests/lib/cmsis_dsp/support/src/q31.c b/tests/lib/cmsis_dsp/support/src/q31.c index 084aa52b107..ddaa8982f48 100644 --- a/tests/lib/cmsis_dsp/support/src/q31.c +++ b/tests/lib/cmsis_dsp/support/src/q31.c @@ -38,9 +38,9 @@ static void test_arm_copy_q31(const q31_t *input1, size_t length) free(output); } -DEFINE_TEST_VARIANT2(arm_copy_q31, 3, in_q31, 3); -DEFINE_TEST_VARIANT2(arm_copy_q31, 8, in_q31, 8); -DEFINE_TEST_VARIANT2(arm_copy_q31, 11, in_q31, 11); +DEFINE_TEST_VARIANT2(support_q31, arm_copy_q31, 3, in_q31, 3); +DEFINE_TEST_VARIANT2(support_q31, arm_copy_q31, 8, in_q31, 8); +DEFINE_TEST_VARIANT2(support_q31, arm_copy_q31, 11, in_q31, 11); static void test_arm_fill_q31(size_t length) { @@ -65,9 +65,9 @@ static void test_arm_fill_q31(size_t length) free(output); } -DEFINE_TEST_VARIANT1(arm_fill_q31, 3, 3); -DEFINE_TEST_VARIANT1(arm_fill_q31, 8, 8); -DEFINE_TEST_VARIANT1(arm_fill_q31, 11, 11); +DEFINE_TEST_VARIANT1(support_q31, arm_fill_q31, 3, 3); +DEFINE_TEST_VARIANT1(support_q31, arm_fill_q31, 8, 8); +DEFINE_TEST_VARIANT1(support_q31, arm_fill_q31, 11, 11); static void test_arm_q31_to_float( const q31_t *input1, const uint32_t *ref, size_t length) @@ -91,9 +91,9 @@ static void test_arm_q31_to_float( free(output); } -DEFINE_TEST_VARIANT3(arm_q31_to_float, 7, in_q31, ref_f32, 7); -DEFINE_TEST_VARIANT3(arm_q31_to_float, 16, in_q31, ref_f32, 16); -DEFINE_TEST_VARIANT3(arm_q31_to_float, 17, in_q31, ref_f32, 17); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_float, 7, in_q31, ref_f32, 7); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_float, 16, in_q31, ref_f32, 16); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_float, 17, in_q31, ref_f32, 17); static void test_arm_q31_to_q15( const q31_t *input1, const q15_t *ref, size_t length) @@ -116,9 +116,9 @@ static void test_arm_q31_to_q15( free(output); } -DEFINE_TEST_VARIANT3(arm_q31_to_q15, 3, in_q31, ref_q15, 3); -DEFINE_TEST_VARIANT3(arm_q31_to_q15, 8, in_q31, ref_q15, 8); -DEFINE_TEST_VARIANT3(arm_q31_to_q15, 11, in_q31, ref_q15, 11); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_q15, 3, in_q31, ref_q15, 3); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_q15, 8, in_q31, ref_q15, 8); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_q15, 11, in_q31, ref_q15, 11); static void test_arm_q31_to_q7( const q31_t *input1, const q7_t *ref, size_t length) @@ -141,29 +141,8 @@ static void test_arm_q31_to_q7( free(output); } -DEFINE_TEST_VARIANT3(arm_q31_to_q7, 15, in_q31, ref_q7, 15); -DEFINE_TEST_VARIANT3(arm_q31_to_q7, 32, in_q31, ref_q7, 32); -DEFINE_TEST_VARIANT3(arm_q31_to_q7, 33, in_q31, ref_q7, 33); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_q7, 15, in_q31, ref_q7, 15); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_q7, 32, in_q31, ref_q7, 32); +DEFINE_TEST_VARIANT3(support_q31, arm_q31_to_q7, 33, in_q31, ref_q7, 33); -void test_support_q31(void) -{ - ztest_test_suite(support_q31, - ztest_unit_test(test_arm_copy_q31_3), - ztest_unit_test(test_arm_copy_q31_8), - ztest_unit_test(test_arm_copy_q31_11), - ztest_unit_test(test_arm_fill_q31_3), - ztest_unit_test(test_arm_fill_q31_8), - ztest_unit_test(test_arm_fill_q31_11), - ztest_unit_test(test_arm_q31_to_float_7), - ztest_unit_test(test_arm_q31_to_float_16), - ztest_unit_test(test_arm_q31_to_float_17), - ztest_unit_test(test_arm_q31_to_q15_3), - ztest_unit_test(test_arm_q31_to_q15_8), - ztest_unit_test(test_arm_q31_to_q15_11), - ztest_unit_test(test_arm_q31_to_q7_15), - ztest_unit_test(test_arm_q31_to_q7_32), - ztest_unit_test(test_arm_q31_to_q7_33) - ); - - ztest_run_test_suite(support_q31); -} +ZTEST_SUITE(support_q31, NULL, NULL, NULL, NULL, NULL); diff --git a/tests/lib/cmsis_dsp/support/src/q7.c b/tests/lib/cmsis_dsp/support/src/q7.c index f4854ef7f1b..3a1db596199 100644 --- a/tests/lib/cmsis_dsp/support/src/q7.c +++ b/tests/lib/cmsis_dsp/support/src/q7.c @@ -38,9 +38,9 @@ static void test_arm_copy_q7(const q7_t *input1, size_t length) free(output); } -DEFINE_TEST_VARIANT2(arm_copy_q7, 15, in_q7, 15); -DEFINE_TEST_VARIANT2(arm_copy_q7, 32, in_q7, 32); -DEFINE_TEST_VARIANT2(arm_copy_q7, 47, in_q7, 47); +DEFINE_TEST_VARIANT2(support_q7, arm_copy_q7, 15, in_q7, 15); +DEFINE_TEST_VARIANT2(support_q7, arm_copy_q7, 32, in_q7, 32); +DEFINE_TEST_VARIANT2(support_q7, arm_copy_q7, 47, in_q7, 47); static void test_arm_fill_q7(size_t length) { @@ -65,9 +65,9 @@ static void test_arm_fill_q7(size_t length) free(output); } -DEFINE_TEST_VARIANT1(arm_fill_q7, 15, 15); -DEFINE_TEST_VARIANT1(arm_fill_q7, 32, 32); -DEFINE_TEST_VARIANT1(arm_fill_q7, 47, 47); +DEFINE_TEST_VARIANT1(support_q7, arm_fill_q7, 15, 15); +DEFINE_TEST_VARIANT1(support_q7, arm_fill_q7, 32, 32); +DEFINE_TEST_VARIANT1(support_q7, arm_fill_q7, 47, 47); static void test_arm_q7_to_float( const q7_t *input1, const uint32_t *ref, size_t length) @@ -91,9 +91,9 @@ static void test_arm_q7_to_float( free(output); } -DEFINE_TEST_VARIANT3(arm_q7_to_float, 15, in_q7, ref_f32, 15); -DEFINE_TEST_VARIANT3(arm_q7_to_float, 32, in_q7, ref_f32, 32); -DEFINE_TEST_VARIANT3(arm_q7_to_float, 47, in_q7, ref_f32, 47); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_float, 15, in_q7, ref_f32, 15); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_float, 32, in_q7, ref_f32, 32); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_float, 47, in_q7, ref_f32, 47); static void test_arm_q7_to_q31( const q7_t *input1, const q31_t *ref, size_t length) @@ -116,9 +116,9 @@ static void test_arm_q7_to_q31( free(output); } -DEFINE_TEST_VARIANT3(arm_q7_to_q31, 15, in_q7, ref_q31, 15); -DEFINE_TEST_VARIANT3(arm_q7_to_q31, 32, in_q7, ref_q31, 32); -DEFINE_TEST_VARIANT3(arm_q7_to_q31, 47, in_q7, ref_q31, 47); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_q31, 15, in_q7, ref_q31, 15); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_q31, 32, in_q7, ref_q31, 32); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_q31, 47, in_q7, ref_q31, 47); static void test_arm_q7_to_q15( const q7_t *input1, const q15_t *ref, size_t length) @@ -141,29 +141,8 @@ static void test_arm_q7_to_q15( free(output); } -DEFINE_TEST_VARIANT3(arm_q7_to_q15, 15, in_q7, ref_q15, 15); -DEFINE_TEST_VARIANT3(arm_q7_to_q15, 32, in_q7, ref_q15, 32); -DEFINE_TEST_VARIANT3(arm_q7_to_q15, 47, in_q7, ref_q15, 47); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_q15, 15, in_q7, ref_q15, 15); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_q15, 32, in_q7, ref_q15, 32); +DEFINE_TEST_VARIANT3(support_q7, arm_q7_to_q15, 47, in_q7, ref_q15, 47); -void test_support_q7(void) -{ - ztest_test_suite(support_q7, - ztest_unit_test(test_arm_copy_q7_15), - ztest_unit_test(test_arm_copy_q7_32), - ztest_unit_test(test_arm_copy_q7_47), - ztest_unit_test(test_arm_fill_q7_15), - ztest_unit_test(test_arm_fill_q7_32), - ztest_unit_test(test_arm_fill_q7_47), - ztest_unit_test(test_arm_q7_to_float_15), - ztest_unit_test(test_arm_q7_to_float_32), - ztest_unit_test(test_arm_q7_to_float_47), - ztest_unit_test(test_arm_q7_to_q31_15), - ztest_unit_test(test_arm_q7_to_q31_32), - ztest_unit_test(test_arm_q7_to_q31_47), - ztest_unit_test(test_arm_q7_to_q15_15), - ztest_unit_test(test_arm_q7_to_q15_32), - ztest_unit_test(test_arm_q7_to_q15_47) - ); - - ztest_run_test_suite(support_q7); -} +ZTEST_SUITE(support_q7, NULL, NULL, NULL, NULL, NULL);