diff --git a/tests/lib/cmsis_dsp/statistics/src/q7.c b/tests/lib/cmsis_dsp/statistics/src/q7.c index f4130865d63..0c1c5f5ca02 100644 --- a/tests/lib/cmsis_dsp/statistics/src/q7.c +++ b/tests/lib/cmsis_dsp/statistics/src/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 */ @@ -61,6 +61,50 @@ DEFINE_TEST_VARIANT3(arm_min_q7, 32, in_com1, 1, 32); DEFINE_TEST_VARIANT3(arm_min_q7, 47, in_com1, 2, 47); DEFINE_TEST_VARIANT3(arm_min_q7, max, in_min_maxidx, 3, 280); +static void test_arm_absmax_q7( + const q7_t *input1, int ref_index, size_t length) +{ + q7_t val; + uint32_t index; + + /* Run test function */ + arm_absmax_q7(input1, length, &val, &index); + + /* Validate output */ + zassert_equal(val, ref_absmax_val[ref_index], + ASSERT_MSG_INCORRECT_COMP_RESULT); + + zassert_equal(index, ref_absmax_idx[ref_index], + ASSERT_MSG_INCORRECT_COMP_RESULT); +} + +DEFINE_TEST_VARIANT3(arm_absmax_q7, 15, in_absminmax, 0, 15); +DEFINE_TEST_VARIANT3(arm_absmax_q7, 32, in_absminmax, 1, 32); +DEFINE_TEST_VARIANT3(arm_absmax_q7, 47, in_absminmax, 2, 47); +DEFINE_TEST_VARIANT3(arm_absmax_q7, max, in_absmax_maxidx, 3, 280); + +static void test_arm_absmin_q7( + const q7_t *input1, int ref_index, size_t length) +{ + q7_t val; + uint32_t index; + + /* Run test function */ + arm_absmin_q7(input1, length, &val, &index); + + /* Validate output */ + zassert_equal(val, ref_absmin_val[ref_index], + ASSERT_MSG_INCORRECT_COMP_RESULT); + + zassert_equal(index, ref_absmin_idx[ref_index], + ASSERT_MSG_INCORRECT_COMP_RESULT); +} + +DEFINE_TEST_VARIANT3(arm_absmin_q7, 15, in_absminmax, 0, 15); +DEFINE_TEST_VARIANT3(arm_absmin_q7, 32, in_absminmax, 1, 32); +DEFINE_TEST_VARIANT3(arm_absmin_q7, 47, in_absminmax, 2, 47); +DEFINE_TEST_VARIANT3(arm_absmin_q7, max, in_absmin_maxidx, 3, 280); + static void test_arm_mean_q7( const q7_t *input1, int ref_index, size_t length) { @@ -138,6 +182,14 @@ void test_statistics_q7(void) ztest_unit_test(test_arm_min_q7_32), ztest_unit_test(test_arm_min_q7_47), ztest_unit_test(test_arm_min_q7_max), + ztest_unit_test(test_arm_absmax_q7_15), + ztest_unit_test(test_arm_absmax_q7_32), + ztest_unit_test(test_arm_absmax_q7_47), + ztest_unit_test(test_arm_absmax_q7_max), + ztest_unit_test(test_arm_absmin_q7_15), + ztest_unit_test(test_arm_absmin_q7_32), + ztest_unit_test(test_arm_absmin_q7_47), + ztest_unit_test(test_arm_absmin_q7_max), ztest_unit_test(test_arm_mean_q7_15), ztest_unit_test(test_arm_mean_q7_32), ztest_unit_test(test_arm_mean_q7_47), diff --git a/tests/lib/cmsis_dsp/statistics/src/q7.pat b/tests/lib/cmsis_dsp/statistics/src/q7.pat index 1e0fa22360f..564ccf00e21 100644 --- a/tests/lib/cmsis_dsp/statistics/src/q7.pat +++ b/tests/lib/cmsis_dsp/statistics/src/q7.pat @@ -80,6 +80,47 @@ static const q7_t in_com2[300] = { 0x03, 0x1E, 0x0B, 0x0B }; +static const q7_t in_absminmax[300] = { + 0xF0, 0xE7, 0xD7, 0xDE, 0x1A, 0xF4, 0x01, 0x19, + 0x0C, 0xDD, 0x0C, 0x09, 0x12, 0x2D, 0xC9, 0xDF, + 0x3A, 0xFC, 0xE7, 0xFC, 0x16, 0xEF, 0xF5, 0x43, + 0xEC, 0x05, 0xD4, 0xD0, 0x1D, 0xF5, 0xFC, 0xEE, + 0xF7, 0xE6, 0xFD, 0x14, 0x26, 0x08, 0xDA, 0xE0, + 0x26, 0x12, 0x00, 0x0F, 0xDF, 0xD7, 0xF4, 0xFE, + 0xE8, 0x00, 0xDD, 0x15, 0x2F, 0x1F, 0x37, 0xDF, + 0xEB, 0x10, 0x13, 0x2A, 0xEA, 0xF9, 0xE2, 0x38, + 0xFD, 0xDF, 0xF8, 0x10, 0x06, 0xD0, 0x0C, 0x0E, + 0xF6, 0xED, 0xCA, 0x43, 0xF4, 0xEA, 0xEA, 0x17, + 0x2B, 0x01, 0xE5, 0x06, 0x3C, 0x12, 0x54, 0x35, + 0x36, 0x09, 0xE5, 0xAB, 0xF3, 0xF1, 0x06, 0xE1, + 0x39, 0xF6, 0xE7, 0xFC, 0xFA, 0xF9, 0x20, 0x3E, + 0xDB, 0x28, 0x10, 0x22, 0x09, 0xF8, 0xE3, 0xCE, + 0xFF, 0x15, 0x27, 0xCE, 0xBC, 0xBC, 0x34, 0xEE, + 0xF2, 0xD3, 0x2A, 0xE9, 0x08, 0x5D, 0x12, 0x22, + 0xC4, 0x14, 0x20, 0xF4, 0xD3, 0x10, 0xF1, 0x9C, + 0xE3, 0x29, 0x1E, 0xA6, 0xE3, 0x0E, 0x50, 0xF8, + 0x06, 0xFC, 0x53, 0x27, 0xD6, 0x3D, 0x19, 0x23, + 0xFD, 0xBF, 0x36, 0x04, 0xF1, 0x21, 0xFD, 0x1E, + 0xE9, 0x2C, 0xBD, 0x21, 0xF2, 0x10, 0xF5, 0x9F, + 0xC5, 0x65, 0xC0, 0x07, 0x39, 0x00, 0x11, 0xDA, + 0xB2, 0x34, 0x11, 0xC3, 0x2D, 0xFD, 0xE8, 0x10, + 0x54, 0x24, 0xCD, 0x26, 0xAA, 0x04, 0xF7, 0x12, + 0xBE, 0x44, 0xE2, 0x00, 0xE4, 0x1B, 0xBB, 0x0C, + 0x1A, 0x2F, 0xDD, 0xF5, 0x12, 0x23, 0xE9, 0xEB, + 0xCD, 0xDA, 0x11, 0x20, 0xE2, 0xDB, 0x01, 0x0D, + 0xFF, 0x42, 0x09, 0x44, 0xD4, 0x0D, 0xE8, 0xFC, + 0xC0, 0x0D, 0xFB, 0xE2, 0xF2, 0xCE, 0xF2, 0x21, + 0xD8, 0x63, 0x0F, 0x28, 0x02, 0x0B, 0xCE, 0xB7, + 0xD5, 0xE5, 0xFE, 0x9E, 0x1F, 0x17, 0xC9, 0x01, + 0xF7, 0x5E, 0x03, 0xE1, 0xF9, 0xFD, 0x09, 0xD1, + 0xF6, 0xF7, 0x04, 0x16, 0xB4, 0x02, 0x7F, 0xDB, + 0x40, 0xF1, 0x1E, 0xEA, 0x08, 0xDF, 0xEF, 0x06, + 0x90, 0xE3, 0xDC, 0x1B, 0xFD, 0xFF, 0xD6, 0xA6, + 0x0A, 0xD3, 0x0A, 0x0D, 0xEB, 0xE0, 0x3D, 0xF6, + 0x07, 0x16, 0xAD, 0xF2, 0x09, 0xF2, 0xE9, 0xDE, + 0xF3, 0xF0, 0xD2, 0x0D + }; + static const q7_t in_max_maxidx[280] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -156,11 +197,87 @@ static const q7_t in_min_maxidx[280] = { 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x0D, 0x00 }; +static const q7_t in_absmax_maxidx[280] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x73 + }; + +static const q7_t in_absmin_maxidx[280] = { + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, + 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x0D, 0x00 + }; + static const q7_t ref_max_val[4] = { 0x1E, 0x38, 0x57, 0x73 }; -static const q15_t ref_max_idx[4] = { +static const uint16_t ref_max_idx[4] = { 0x0008, 0x001D, 0x0020, 0x0117 }; @@ -168,10 +285,26 @@ static const q7_t ref_min_val[4] = { 0x9B, 0x80, 0x80, 0x00 }; -static const q15_t ref_min_idx[4] = { +static const uint16_t ref_min_idx[4] = { 0x0003, 0x001A, 0x001A, 0x0117 }; +static const q7_t ref_absmax_val[4] = { + 0x37, 0x43, 0x43, 0x73 + }; + +static const uint16_t ref_absmax_idx[4] = { + 0x000E, 0x0017, 0x0017, 0x0117 + }; + +static const q7_t ref_absmin_val[4] = { + 0x01, 0x01, 0x00, 0x00 + }; + +static const uint16_t ref_absmin_idx[4] = { + 0x0006, 0x0006, 0x002A, 0x0117 + }; + static const q7_t ref_mean[4] = { 0x1E, 0x21, 0x20, 0x20 };