From 35a5daeee7398a4a5db75990024ed78b4762d276 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Fri, 20 Aug 2021 02:04:31 +0900 Subject: [PATCH] tests: lib: cmsis_dsp: filtering: Update MISC Q7 tests for 1.9.0 This commit updates the filtering MISC Q7 test patterns and implementations for the CMSIS-DSP 1.9.0. Signed-off-by: Stephanos Ioannidis --- tests/lib/cmsis_dsp/filtering/src/misc_q7.c | 106 +++++++++++++++++- tests/lib/cmsis_dsp/filtering/src/misc_q7.pat | 50 +++++++++ 2 files changed, 153 insertions(+), 3 deletions(-) diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q7.c b/tests/lib/cmsis_dsp/filtering/src/misc_q7.c index 0193ddedf56..95e1a991a12 100644 --- a/tests/lib/cmsis_dsp/filtering/src/misc_q7.c +++ b/tests/lib/cmsis_dsp/filtering/src/misc_q7.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020 Stephanos Ioannidis - * Copyright (C) 2010-2020 ARM Limited or its affiliates. All rights reserved. + * Copyright (c) 2021 Stephanos Ioannidis + * Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved. * * SPDX-License-Identifier: Apache-2.0 */ @@ -130,6 +130,100 @@ DEFINE_CONV_TEST(48, 33); DEFINE_CONV_TEST(48, 34); DEFINE_CONV_TEST(48, 49); +static void test_arm_conv_partial_q7( + size_t first, size_t in1_length, size_t in2_length, const q7_t *ref, + size_t ref_length) +{ + q7_t *output; + q7_t *temp; + arm_status status; + + /* Allocate output buffer */ + output = calloc(first + ref_length, sizeof(q7_t)); + temp = calloc(ref_length, sizeof(q7_t)); + + /* Run test function */ + status = arm_conv_partial_q7( + in_partial1, in1_length, in_partial2, in2_length, + output, first, ref_length); + + zassert_equal(status, ARM_MATH_SUCCESS, + ASSERT_MSG_INCORRECT_COMP_RESULT); + + memcpy(temp, &output[first], ref_length * sizeof(q7_t)); + + /* Validate output */ + zassert_true( + test_snr_error_q7(ref_length, ref, temp, SNR_ERROR_THRESH), + ASSERT_MSG_SNR_LIMIT_EXCEED); + + zassert_true( + test_near_equal_q7(ref_length, ref, temp, + ABS_ERROR_THRESH_Q7), + ASSERT_MSG_ABS_ERROR_LIMIT_EXCEED); + + /* Free output buffer */ + free(output); + free(temp); +} + +static void test_arm_conv_partial_opt_q7( + size_t first, size_t in1_length, size_t in2_length, const q7_t *ref, + size_t ref_length) +{ + q7_t *output; + q7_t *temp; + q15_t *scratch1, *scratch2; + arm_status status; + + /* Allocate output buffer */ + output = calloc(first + ref_length, sizeof(q7_t)); + temp = calloc(ref_length, sizeof(q7_t)); + scratch1 = calloc(24, sizeof(q15_t)); + scratch2 = calloc(24, sizeof(q15_t)); + + /* Run test function */ + status = arm_conv_partial_opt_q7( + in_partial1, in1_length, in_partial2, in2_length, + output, first, ref_length, + scratch1, scratch2); + + zassert_equal(status, ARM_MATH_SUCCESS, + ASSERT_MSG_INCORRECT_COMP_RESULT); + + memcpy(temp, &output[first], ref_length * sizeof(q7_t)); + + /* Validate output */ + zassert_true( + test_snr_error_q7(ref_length, ref, temp, SNR_ERROR_THRESH), + ASSERT_MSG_SNR_LIMIT_EXCEED); + + zassert_true( + test_near_equal_q7(ref_length, ref, temp, + ABS_ERROR_THRESH_Q7), + ASSERT_MSG_ABS_ERROR_LIMIT_EXCEED); + + /* Free output buffer */ + free(output); + free(temp); + free(scratch1); + free(scratch2); +} + +#define DEFINE_CONV_PARTIAL_TEST(a, b, c) \ + DEFINE_TEST_VARIANT5( \ + arm_conv_partial_q7, a##_##b##_##c, a, b, c, \ + ref_conv_partial_##a##_##b##_##c, \ + ARRAY_SIZE(ref_conv_partial_##a##_##b##_##c)) \ + DEFINE_TEST_VARIANT5( \ + arm_conv_partial_opt_q7, a##_##b##_##c, a, b, c, \ + ref_conv_partial_##a##_##b##_##c, \ + ARRAY_SIZE(ref_conv_partial_##a##_##b##_##c)) + +DEFINE_CONV_PARTIAL_TEST(3, 6, 8); +DEFINE_CONV_PARTIAL_TEST(9, 6, 8); +DEFINE_CONV_PARTIAL_TEST(7, 6, 8); + void test_filtering_misc_q7(void) { ztest_test_suite(filtering_misc_q7, @@ -182,7 +276,13 @@ void test_filtering_misc_q7(void) ztest_unit_test(test_arm_conv_q7_48_32), ztest_unit_test(test_arm_conv_q7_48_33), ztest_unit_test(test_arm_conv_q7_48_34), - ztest_unit_test(test_arm_conv_q7_48_49) + ztest_unit_test(test_arm_conv_q7_48_49), + ztest_unit_test(test_arm_conv_partial_q7_3_6_8), + ztest_unit_test(test_arm_conv_partial_q7_9_6_8), + ztest_unit_test(test_arm_conv_partial_q7_7_6_8), + ztest_unit_test(test_arm_conv_partial_opt_q7_3_6_8), + ztest_unit_test(test_arm_conv_partial_opt_q7_9_6_8), + ztest_unit_test(test_arm_conv_partial_opt_q7_7_6_8) ); ztest_run_test_suite(filtering_misc_q7); diff --git a/tests/lib/cmsis_dsp/filtering/src/misc_q7.pat b/tests/lib/cmsis_dsp/filtering/src/misc_q7.pat index 05cce350f2f..e588f3a859f 100644 --- a/tests/lib/cmsis_dsp/filtering/src/misc_q7.pat +++ b/tests/lib/cmsis_dsp/filtering/src/misc_q7.pat @@ -36,6 +36,44 @@ static const q7_t in_com2[128] = { 0x04, 0xD9, 0x1A, 0x17, 0x09, 0x3C, 0x34, 0x5A }; +static const q7_t in_partial1[128] = { + 0x21, 0xFB, 0xD3, 0x45, 0x01, 0x65, 0xEE, 0xE3, + 0xF4, 0x12, 0xF5, 0xFB, 0x3D, 0x2B, 0xF6, 0xC5, + 0xF8, 0x83, 0xE2, 0x07, 0x38, 0x2B, 0x08, 0x18, + 0xF0, 0x31, 0x19, 0x12, 0x0C, 0xE4, 0xE2, 0x10, + 0x02, 0x28, 0x03, 0x05, 0x0D, 0x20, 0x1A, 0x31, + 0x22, 0xC8, 0xDC, 0xE0, 0x43, 0xDF, 0xEB, 0xFB, + 0x1F, 0x28, 0x28, 0xB1, 0xDA, 0xE7, 0xD8, 0xEB, + 0x37, 0xEF, 0xF7, 0xE2, 0x43, 0xCB, 0xA7, 0xDF, + 0xE5, 0xD1, 0xFF, 0x20, 0x03, 0x0B, 0xFF, 0xEA, + 0x57, 0xD8, 0xFC, 0x50, 0x0B, 0xD7, 0xC4, 0x05, + 0xE3, 0xD1, 0xAE, 0x1A, 0x87, 0x1B, 0x23, 0xF5, + 0xF9, 0x1C, 0x15, 0xF0, 0xDF, 0xFB, 0x18, 0xF6, + 0xC9, 0x20, 0xA3, 0x18, 0x1F, 0xFA, 0x39, 0x17, + 0xD7, 0x0E, 0x0B, 0x29, 0xFC, 0xDB, 0x21, 0x05, + 0xE2, 0x4F, 0xFF, 0xD4, 0x01, 0xCF, 0x3C, 0x1A, + 0x39, 0xF2, 0x24, 0x80, 0xF2, 0x3B, 0x15, 0x17 + }; + +static const q7_t in_partial2[128] = { + 0xF1, 0xD9, 0x12, 0x29, 0x07, 0xDD, 0xEB, 0x1E, + 0x69, 0x24, 0xCA, 0x97, 0x41, 0x1E, 0xBD, 0xE5, + 0x7F, 0xAC, 0x27, 0xE1, 0xE3, 0xE6, 0xDC, 0x19, + 0x0F, 0x49, 0xC5, 0xFF, 0xFB, 0xE8, 0x8D, 0xF8, + 0x0F, 0xE1, 0x10, 0xB7, 0x2A, 0xEE, 0x3E, 0x0D, + 0xDC, 0x48, 0xFF, 0xF9, 0x30, 0xE8, 0xEC, 0xC1, + 0x14, 0x50, 0x04, 0xAE, 0x15, 0x0C, 0xEB, 0xB9, + 0x49, 0x50, 0x33, 0x1B, 0x09, 0x4C, 0x28, 0x55, + 0xE9, 0xE4, 0x09, 0x36, 0xA8, 0x04, 0x02, 0x48, + 0xFE, 0x0E, 0x03, 0xD7, 0xE2, 0x05, 0xAC, 0x1B, + 0xED, 0xCA, 0xD1, 0x04, 0xF6, 0xD3, 0xD9, 0x1C, + 0x02, 0x28, 0xFE, 0xA9, 0xB3, 0x13, 0xC9, 0x03, + 0x06, 0xE5, 0xE1, 0xC1, 0x4E, 0x41, 0xCA, 0xBD, + 0xE0, 0x0F, 0x2D, 0x16, 0xE4, 0x01, 0x30, 0xD4, + 0xE7, 0x01, 0xE1, 0x90, 0x45, 0x10, 0xD8, 0x15, + 0x01, 0x0F, 0xC4, 0x20, 0xCF, 0x05, 0xE4, 0xD0 + }; + static const q7_t ref_correlate_30_31[61] = { 0x08, 0x3C, 0xFC, 0xD8, 0xD6, 0xF8, 0xF3, 0xE5, 0xF2, 0x2C, 0x29, 0x4C, 0x42, 0xD7, 0x9E, 0xDF, @@ -662,3 +700,15 @@ static const q7_t ref_conv_48_49[96] = { 0xF4, 0x27, 0x07, 0x19, 0x09, 0x01, 0x07, 0xDE }; +static const q7_t ref_conv_partial_3_6_8[4] = { + 0x10, 0xE5, 0xE5, 0xF1 + }; + +static const q7_t ref_conv_partial_9_6_8[4] = { + 0xEF, 0xF4, 0xEF, 0x17 + }; + +static const q7_t ref_conv_partial_7_6_8[4] = { + 0x27, 0x15, 0xEF, 0xF4 + }; +