michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: lib: cmsis_dsp: matrix: Update Unary Q15 tests for 1.9.0

Browse source 
This commit updates the matrix Unary Q15 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 2021-08-21 02:46:38 +09:00 • committed by Carles Cufí
commit 539e43dbbc
2 changed files with 3692 additions and 1978 deletions
Download patch file Download diff file Expand all files Collapse all files

172
tests/lib/cmsis_dsp/matrix/src/unary_q15.c
View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
* Copyright (C) 2010-2020 ARM Limited or its affiliates. All rights reserved.
* 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
*/
@ -14,7 +14,7 @@
#include "unary_q15.pat"
#define SNR_ERROR_THRESH ((float32_t)70)
#define ABS_ERROR_THRESH_Q15 ((q15_t)2)
#define ABS_ERROR_THRESH_Q15 ((q15_t)4)
#define ABS_ERROR_THRESH_Q63 ((q63_t)(1 << 16))
#define NUM_MATRICES (ARRAY_SIZE(in_dims) / 2)
@ -24,6 +24,8 @@
#define OP2_SUB (1)
#define OP1_SCALE (0)
#define OP1_TRANS (1)
#define OP2V_VEC_MULT (0)
#define OP1C_CMPLX_TRANS (0)
static void test_op2(int op, const q15_t *ref, size_t length)
{
@ -31,6 +33,7 @@ static void test_op2(int op, const q15_t *ref, size_t length)
uint16_t *dims = (uint16_t *)in_dims;
q15_t *tmp1, *tmp2, *output;
uint16_t rows, columns;
arm_status status;
arm_matrix_instance_q15 mat_in1;
arm_matrix_instance_q15 mat_in2;
@ -67,15 +70,21 @@ static void test_op2(int op, const q15_t *ref, size_t length)
/* Run test function */
switch (op) {
case OP2_ADD:
arm_mat_add_q15(&mat_in1, &mat_in2, &mat_out);
status = arm_mat_add_q15(&mat_in1, &mat_in2,
&mat_out);
break;
case OP2_SUB:
arm_mat_sub_q15(&mat_in1, &mat_in2, &mat_out);
status = arm_mat_sub_q15(&mat_in1, &mat_in2,
&mat_out);
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);
}
@ -106,6 +115,7 @@ static void test_op1(int op, const q15_t *ref, size_t length, bool transpose)
uint16_t *dims = (uint16_t *)in_dims;
q15_t *tmp1, *output;
uint16_t rows, columns;
arm_status status;
arm_matrix_instance_q15 mat_in1;
arm_matrix_instance_q15 mat_out;
@ -138,15 +148,20 @@ static void test_op1(int op, const q15_t *ref, size_t length, bool transpose)
/* Run test function */
switch (op) {
case OP1_SCALE:
arm_mat_scale_q15(&mat_in1, 0x4000, 0, &mat_out);
status = arm_mat_scale_q15(&mat_in1, 0x4000, 0,
&mat_out);
break;
case OP1_TRANS:
arm_mat_trans_q15(&mat_in1, &mat_out);
status = arm_mat_trans_q15(&mat_in1, &mat_out);
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);
}
@ -170,13 +185,154 @@ DEFINE_TEST_VARIANT4(op1, arm_mat_scale_q15, OP1_SCALE,
DEFINE_TEST_VARIANT4(op1, arm_mat_trans_q15, OP1_TRANS,
ref_trans, ARRAY_SIZE(ref_trans), true);
static void test_op2v(int op, const q15_t *ref, size_t length)
{
size_t index;
const uint16_t *dims = in_dims;
q15_t *tmp1, *vec, *output_buf, *output;
uint16_t rows, internal;
arm_matrix_instance_q15 mat_in1;
/* Allocate buffers */
tmp1 = malloc(MAX_MATRIX_DIM * MAX_MATRIX_DIM * sizeof(q15_t));
zassert_not_null(tmp1, ASSERT_MSG_BUFFER_ALLOC_FAILED);
vec = malloc(2 * MAX_MATRIX_DIM * sizeof(q15_t));
zassert_not_null(vec, ASSERT_MSG_BUFFER_ALLOC_FAILED);
output_buf = malloc(length * sizeof(q15_t));
zassert_not_null(output_buf, ASSERT_MSG_BUFFER_ALLOC_FAILED);
/* Initialise contexts */
mat_in1.pData = tmp1;
output = output_buf;
/* Iterate matrices */
for (index = 0; index < NUM_MATRICES; index++) {
rows = *dims++;
internal = *dims++;
/* Initialise matrix dimensions */
mat_in1.numRows = rows;
mat_in1.numCols = internal;
/* Load matrix data */
memcpy(mat_in1.pData, in_com1,
2 * rows * internal * sizeof(q15_t));
memcpy(vec, in_vec1, 2 * internal * sizeof(q15_t));
/* Run test function */
switch (op) {
case OP2V_VEC_MULT:
arm_mat_vec_mult_q15(&mat_in1, vec, output);
break;
default:
zassert_unreachable("invalid operation");
}
/* Increment output pointer */
output += rows;
}
/* Validate output */
zassert_true(
test_snr_error_q15(length, output_buf, ref, SNR_ERROR_THRESH),
ASSERT_MSG_SNR_LIMIT_EXCEED);
zassert_true(
test_near_equal_q15(length, output_buf, ref, ABS_ERROR_THRESH_Q15),
ASSERT_MSG_ABS_ERROR_LIMIT_EXCEED);
/* Free buffers */
free(tmp1);
free(vec);
free(output_buf);
}
DEFINE_TEST_VARIANT3(op2v, arm_mat_vec_mult_q15, OP2V_VEC_MULT,
ref_vec_mult, ARRAY_SIZE(ref_vec_mult));
static void test_op1c(int op, const q15_t *ref, size_t length, bool transpose)
{
size_t index;
const uint16_t *dims = in_dims;
q15_t *tmp1, *output;
uint16_t rows, columns;
arm_status status;
arm_matrix_instance_q15 mat_in1;
arm_matrix_instance_q15 mat_out;
/* Allocate buffers */
tmp1 = malloc(2 * MAX_MATRIX_DIM * MAX_MATRIX_DIM * sizeof(q15_t));
zassert_not_null(tmp1, ASSERT_MSG_BUFFER_ALLOC_FAILED);
output = malloc(2 * length * sizeof(q15_t));
zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
/* Initialise contexts */
mat_in1.pData = tmp1;
mat_out.pData = output;
/* Iterate matrices */
for (index = 0; index < NUM_MATRICES; index++) {
rows = *dims++;
columns = *dims++;
/* Initialise matrix dimensions */
mat_in1.numRows = rows;
mat_in1.numCols = columns;
mat_out.numRows = transpose ? columns : rows;
mat_out.numCols = transpose ? rows : columns;
/* Load matrix data */
memcpy(mat_in1.pData,
in_cmplx1, 2 * rows * columns * sizeof(q15_t));
/* Run test function */
switch (op) {
case OP1C_CMPLX_TRANS:
status = arm_mat_cmplx_trans_q15(&mat_in1, &mat_out);
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 += 2 * (rows * columns);
}
/* Validate output */
zassert_true(
test_snr_error_q15(2 * length, output, ref, SNR_ERROR_THRESH),
ASSERT_MSG_SNR_LIMIT_EXCEED);
zassert_true(
test_near_equal_q15(2 * length, output, ref, ABS_ERROR_THRESH_Q15),
ASSERT_MSG_ABS_ERROR_LIMIT_EXCEED);
/* Free buffers */
free(tmp1);
free(output);
}
DEFINE_TEST_VARIANT4(op1c, arm_mat_cmplx_trans_q15, OP1C_CMPLX_TRANS,
ref_cmplx_trans, ARRAY_SIZE(ref_cmplx_trans) / 2, true);
void test_matrix_unary_q15(void)
{
ztest_test_suite(matrix_unary_q15,
ztest_unit_test(test_op2_arm_mat_add_q15),
ztest_unit_test(test_op2_arm_mat_sub_q15),
ztest_unit_test(test_op1_arm_mat_scale_q15),
ztest_unit_test(test_op1_arm_mat_trans_q15)
ztest_unit_test(test_op1_arm_mat_trans_q15),
ztest_unit_test(test_op2v_arm_mat_vec_mult_q15),
ztest_unit_test(test_op1c_arm_mat_cmplx_trans_q15)
);
ztest_run_test_suite(matrix_unary_q15);

5498
tests/lib/cmsis_dsp/matrix/src/unary_q15.pat generated
View file

File diff suppressed because it is too large Load diff