tests: lib: cmsis_dsp: matrix: Add Binary Q7 tests for 1.9.0
This commit adds the matrix Binary Q7 test patterns and implementations for the CMSIS-DSP 1.9.0. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
This commit is contained in:
Stephanos Ioannidis
Carles Cufí
parent
518589efb4
commit
9a71d359c1
7 changed files with 10326 additions and 2 deletions
|
|
@ -28,6 +28,11 @@ target_sources_ifdef(
|
|||
app PRIVATE src/unary_f64.c
|
||||
)
|
||||
|
||||
target_sources_ifdef(
|
||||
CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q7
|
||||
app PRIVATE src/binary_q7.c
|
||||
)
|
||||
|
||||
target_sources_ifdef(
|
||||
CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q15
|
||||
app PRIVATE src/binary_q15.c
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (c) 2019 Stephanos Ioannidis <root@stephanos.io>
|
||||
# Copyright (c) 2021 Stephanos Ioannidis <root@stephanos.io>
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
config CMSIS_DSP_TEST_MATRIX_UNARY_Q15
|
||||
|
|
@ -13,6 +13,9 @@ config CMSIS_DSP_TEST_MATRIX_UNARY_F32
|
|||
config CMSIS_DSP_TEST_MATRIX_UNARY_F64
|
||||
bool "Test: Matrix Unary F64"
|
||||
|
||||
config CMSIS_DSP_TEST_MATRIX_BINARY_Q7
|
||||
bool "Test: Matrix Binary Q7"
|
||||
|
||||
config CMSIS_DSP_TEST_MATRIX_BINARY_Q15
|
||||
bool "Test: Matrix Binary Q15"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ CONFIG_CMSIS_DSP_TEST_MATRIX_UNARY_Q15=y
|
|||
CONFIG_CMSIS_DSP_TEST_MATRIX_UNARY_Q31=y
|
||||
CONFIG_CMSIS_DSP_TEST_MATRIX_UNARY_F32=y
|
||||
CONFIG_CMSIS_DSP_TEST_MATRIX_UNARY_F64=y
|
||||
CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q7=y
|
||||
CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q15=y
|
||||
CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q31=y
|
||||
CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_F32=y
|
||||
|
|
|
|||
126
tests/lib/cmsis_dsp/matrix/src/binary_q7.c
Normal file
126
tests/lib/cmsis_dsp/matrix/src/binary_q7.c
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
/*
|
||||
* Copyright (c) 2021 Stephanos Ioannidis <root@stephanos.io>
|
||||
* Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <ztest.h>
|
||||
#include <zephyr.h>
|
||||
#include <stdlib.h>
|
||||
#include <arm_math.h>
|
||||
#include "../../common/test_common.h"
|
||||
|
||||
#include "binary_q7.pat"
|
||||
|
||||
#define SNR_ERROR_THRESH ((float32_t)20)
|
||||
#define ABS_ERROR_THRESH_Q7 ((q7_t)5)
|
||||
|
||||
#define NUM_MATRICES (ARRAY_SIZE(in_dims) / 3)
|
||||
#define MAX_MATRIX_DIM (47)
|
||||
|
||||
#define OP2_MULT (0)
|
||||
|
||||
static void test_op2(int op, const q7_t *input1, const q7_t *input2,
|
||||
const q7_t *ref, size_t length)
|
||||
{
|
||||
size_t index;
|
||||
uint16_t *dims = (uint16_t *)in_dims;
|
||||
q7_t *tmp1, *tmp2, *scratch, *output;
|
||||
uint16_t rows, internal, columns;
|
||||
arm_status status;
|
||||
|
||||
arm_matrix_instance_q7 mat_in1;
|
||||
arm_matrix_instance_q7 mat_in2;
|
||||
arm_matrix_instance_q7 mat_out;
|
||||
|
||||
/* Allocate buffers */
|
||||
output = malloc(length * sizeof(q7_t));
|
||||
zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
|
||||
|
||||
tmp1 = malloc(MAX_MATRIX_DIM * MAX_MATRIX_DIM * sizeof(q7_t));
|
||||
zassert_not_null(tmp1, ASSERT_MSG_BUFFER_ALLOC_FAILED);
|
||||
|
||||
tmp2 = malloc(MAX_MATRIX_DIM * MAX_MATRIX_DIM * sizeof(q7_t));
|
||||
zassert_not_null(tmp2, ASSERT_MSG_BUFFER_ALLOC_FAILED);
|
||||
|
||||
scratch = malloc(MAX_MATRIX_DIM * MAX_MATRIX_DIM * sizeof(q7_t));
|
||||
zassert_not_null(scratch, ASSERT_MSG_BUFFER_ALLOC_FAILED);
|
||||
|
||||
/* Initialise contexts */
|
||||
mat_in1.pData = tmp1;
|
||||
mat_in2.pData = tmp2;
|
||||
mat_out.pData = output;
|
||||
|
||||
/* Iterate matrices */
|
||||
for (index = 0; index < NUM_MATRICES; index++) {
|
||||
rows = *dims++;
|
||||
internal = *dims++;
|
||||
columns = *dims++;
|
||||
|
||||
/* Initialise matrix dimensions */
|
||||
mat_in1.numRows = rows;
|
||||
mat_in1.numCols = internal;
|
||||
|
||||
mat_in2.numRows = internal;
|
||||
mat_in2.numCols = columns;
|
||||
|
||||
mat_out.numRows = rows;
|
||||
mat_out.numCols = columns;
|
||||
|
||||
/* Load matrix data */
|
||||
memcpy(mat_in1.pData, input1,
|
||||
rows * internal * sizeof(q7_t));
|
||||
|
||||
memcpy(mat_in2.pData, input2,
|
||||
internal * columns * sizeof(q7_t));
|
||||
|
||||
/* Run test function */
|
||||
switch (op) {
|
||||
case OP2_MULT:
|
||||
status = arm_mat_mult_q7(
|
||||
&mat_in1, &mat_in2, &mat_out,
|
||||
scratch);
|
||||
break;
|
||||
default:
|
||||
zassert_unreachable("invalid operation");
|
||||
}
|
||||
|
||||
/* Validate status */
|
||||
zassert_equal(status, ARM_MATH_SUCCESS,
|
||||
ASSERT_MSG_INCORRECT_COMP_RESULT);
|
||||
|
||||
/* Increment output pointer */
|
||||
mat_out.pData += (rows * columns);
|
||||
}
|
||||
|
||||
/* Validate output */
|
||||
zassert_true(
|
||||
test_snr_error_q7(length, output, ref, SNR_ERROR_THRESH),
|
||||
ASSERT_MSG_SNR_LIMIT_EXCEED);
|
||||
|
||||
zassert_true(
|
||||
test_near_equal_q7(length, output, ref,
|
||||
ABS_ERROR_THRESH_Q7),
|
||||
ASSERT_MSG_ABS_ERROR_LIMIT_EXCEED);
|
||||
|
||||
/* Free buffers */
|
||||
free(tmp1);
|
||||
free(tmp2);
|
||||
free(scratch);
|
||||
free(output);
|
||||
}
|
||||
|
||||
DEFINE_TEST_VARIANT5(
|
||||
op2, arm_mat_mult_q7, OP2_MULT,
|
||||
in_mult1, in_mult2, ref_mult,
|
||||
ARRAY_SIZE(ref_mult));
|
||||
|
||||
void test_matrix_binary_q7(void)
|
||||
{
|
||||
ztest_test_suite(matrix_binary_q7,
|
||||
ztest_unit_test(test_op2_arm_mat_mult_q7)
|
||||
);
|
||||
|
||||
ztest_run_test_suite(matrix_binary_q7);
|
||||
}
|
||||
10159
tests/lib/cmsis_dsp/matrix/src/binary_q7.pat
generated
Normal file
10159
tests/lib/cmsis_dsp/matrix/src/binary_q7.pat
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
|
||||
* Copyright (c) 2021 Stephanos Ioannidis <root@stephanos.io>
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
|
@ -12,6 +12,7 @@ extern void test_matrix_unary_q31(void);
|
|||
extern void test_matrix_unary_f32(void);
|
||||
extern void test_matrix_unary_f64(void);
|
||||
|
||||
extern void test_matrix_binary_q7(void);
|
||||
extern void test_matrix_binary_q15(void);
|
||||
extern void test_matrix_binary_q31(void);
|
||||
extern void test_matrix_binary_f32(void);
|
||||
|
|
@ -31,6 +32,9 @@ void test_main(void)
|
|||
test_matrix_unary_f64();
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q7
|
||||
test_matrix_binary_q7();
|
||||
#endif
|
||||
#ifdef CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q15
|
||||
test_matrix_binary_q15();
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -99,6 +99,32 @@ tests:
|
|||
extra_configs:
|
||||
- CONFIG_CMSIS_DSP_TEST_MATRIX_UNARY_F64=y
|
||||
- CONFIG_FPU=y
|
||||
libraries.cmsis_dsp.matrix.binary_q7:
|
||||
filter: ((CONFIG_CPU_CORTEX_R or CONFIG_CPU_CORTEX_M) and TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_ARCH_POSIX
|
||||
integration_platforms:
|
||||
- frdm_k64f
|
||||
- sam_e70_xplained
|
||||
- mps2_an521
|
||||
- native_posix
|
||||
tags: cmsis_dsp
|
||||
platform_exclude: frdm_kw41z
|
||||
min_flash: 128
|
||||
min_ram: 128
|
||||
extra_args: CONF_FILE=prj_base.conf
|
||||
extra_configs:
|
||||
- CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q7=y
|
||||
libraries.cmsis_dsp.matrix.binary_q7.fpu:
|
||||
filter: ((CONFIG_CPU_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU and TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_ARCH_POSIX
|
||||
integration_platforms:
|
||||
- mps2_an521_remote
|
||||
tags: cmsis_dsp fpu
|
||||
platform_exclude: frdm_kw41z
|
||||
min_flash: 128
|
||||
min_ram: 128
|
||||
extra_args: CONF_FILE=prj_base.conf
|
||||
extra_configs:
|
||||
- CONFIG_CMSIS_DSP_TEST_MATRIX_BINARY_Q7=y
|
||||
- CONFIG_FPU=y
|
||||
libraries.cmsis_dsp.matrix.binary_q15:
|
||||
filter: ((CONFIG_CPU_CORTEX_R or CONFIG_CPU_CORTEX_M) and TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_ARCH_POSIX
|
||||
integration_platforms:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue