From d8b6d18d2fefee381eb6a26334a13e94126b6d8e Mon Sep 17 00:00:00 2001 From: jaseg Date: Mon, 21 Dec 2020 16:22:11 +0100 Subject: Remove obsolete template code from fw --- .../src/complex_math_tests/cmplx_conj_tests.c | 31 ------ .../src/complex_math_tests/cmplx_dot_prod_tests.c | 31 ------ .../complex_math_tests/cmplx_mag_squared_tests.c | 31 ------ .../src/complex_math_tests/cmplx_mag_tests.c | 31 ------ .../complex_math_tests/cmplx_mult_cmplx_tests.c | 31 ------ .../src/complex_math_tests/cmplx_mult_real_test.c | 31 ------ .../complex_math_test_common_data.c | 114 --------------------- .../complex_math_tests/complex_math_test_group.c | 14 --- 8 files changed, 314 deletions(-) delete mode 100644 fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_conj_tests.c delete mode 100644 fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_dot_prod_tests.c delete mode 100644 fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_squared_tests.c delete mode 100644 fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_tests.c delete mode 100644 fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_cmplx_tests.c delete mode 100644 fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_real_test.c delete mode 100644 fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_common_data.c delete mode 100644 fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_group.c (limited to 'fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests') diff --git a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_conj_tests.c b/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_conj_tests.c deleted file mode 100644 index 7fcc0bc..0000000 --- a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_conj_tests.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "jtest.h" -#include "complex_math_test_data.h" -#include "arr_desc.h" -#include "arm_math.h" /* FUTs */ -#include "ref.h" /* Reference Functions */ -#include "test_templates.h" -#include "complex_math_templates.h" -#include "type_abbrev.h" - -#define JTEST_ARM_CMPLX_CONJ_TEST(suffix) \ - COMPLEX_MATH_DEFINE_TEST_TEMPLATE_BUF1_BLK( \ - cmplx_conj, \ - suffix, \ - TYPE_FROM_ABBREV(suffix), \ - TYPE_FROM_ABBREV(suffix), \ - COMPLEX_MATH_SNR_COMPARE_CMPLX_INTERFACE) - -JTEST_ARM_CMPLX_CONJ_TEST(f32); -JTEST_ARM_CMPLX_CONJ_TEST(q31); -JTEST_ARM_CMPLX_CONJ_TEST(q15); - -/*--------------------------------------------------------------------------------*/ -/* Collect all tests in a group. */ -/*--------------------------------------------------------------------------------*/ - -JTEST_DEFINE_GROUP(cmplx_conj_tests) -{ - JTEST_TEST_CALL(arm_cmplx_conj_f32_test); - JTEST_TEST_CALL(arm_cmplx_conj_q31_test); - JTEST_TEST_CALL(arm_cmplx_conj_q15_test); -} diff --git a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_dot_prod_tests.c b/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_dot_prod_tests.c deleted file mode 100644 index bcdaf5b..0000000 --- a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_dot_prod_tests.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "jtest.h" -#include "complex_math_test_data.h" -#include "arr_desc.h" -#include "arm_math.h" /* FUTs */ -#include "ref.h" /* Reference Functions */ -#include "test_templates.h" -#include "complex_math_templates.h" -#include "type_abbrev.h" - -#define JTEST_ARM_CMPLX_DOT_PROD_TEST(suffix, comparison_interface) \ - COMPLEX_MATH_DEFINE_TEST_TEMPLATE_BUF2_BLK( \ - cmplx_dot_prod, \ - suffix, \ - TYPE_FROM_ABBREV(suffix), \ - TYPE_FROM_ABBREV(suffix), \ - comparison_interface) - -JTEST_ARM_CMPLX_DOT_PROD_TEST(f32, COMPLEX_MATH_SNR_COMPARE_SPLIT_INTERFACE); -JTEST_ARM_CMPLX_DOT_PROD_TEST(q31, COMPLEX_MATH_SNR_COMPARE_SPLIT_INTERFACE); -JTEST_ARM_CMPLX_DOT_PROD_TEST(q15, COMPLEX_MATH_SNR_COMPARE_SPLIT_INTERFACE); - -/*--------------------------------------------------------------------------------*/ -/* Collect all tests in a group. */ -/*--------------------------------------------------------------------------------*/ - -JTEST_DEFINE_GROUP(cmplx_dot_prod_tests) -{ - JTEST_TEST_CALL(arm_cmplx_dot_prod_f32_test); - JTEST_TEST_CALL(arm_cmplx_dot_prod_q31_test); - JTEST_TEST_CALL(arm_cmplx_dot_prod_q15_test); -} diff --git a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_squared_tests.c b/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_squared_tests.c deleted file mode 100644 index 9ca11fc..0000000 --- a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_squared_tests.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "jtest.h" -#include "complex_math_test_data.h" -#include "arr_desc.h" -#include "arm_math.h" /* FUTs */ -#include "ref.h" /* Reference Functions */ -#include "test_templates.h" -#include "complex_math_templates.h" -#include "type_abbrev.h" - -#define JTEST_ARM_CMPLX_MAG_SQUARED_TEST(suffix) \ - COMPLEX_MATH_DEFINE_TEST_TEMPLATE_BUF1_BLK( \ - cmplx_mag_squared, \ - suffix, \ - TYPE_FROM_ABBREV(suffix), \ - TYPE_FROM_ABBREV(suffix), \ - COMPLEX_MATH_COMPARE_RE_INTERFACE) - -JTEST_ARM_CMPLX_MAG_SQUARED_TEST(f32); -JTEST_ARM_CMPLX_MAG_SQUARED_TEST(q31); -JTEST_ARM_CMPLX_MAG_SQUARED_TEST(q15); - -/*--------------------------------------------------------------------------------*/ -/* Collect all tests in a group. */ -/*--------------------------------------------------------------------------------*/ - -JTEST_DEFINE_GROUP(cmplx_mag_squared_tests) -{ - JTEST_TEST_CALL(arm_cmplx_mag_squared_f32_test); - JTEST_TEST_CALL(arm_cmplx_mag_squared_q31_test); - JTEST_TEST_CALL(arm_cmplx_mag_squared_q15_test); -} diff --git a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_tests.c b/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_tests.c deleted file mode 100644 index 8711957..0000000 --- a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mag_tests.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "jtest.h" -#include "complex_math_test_data.h" -#include "arr_desc.h" -#include "arm_math.h" /* FUTs */ -#include "ref.h" /* Reference Functions */ -#include "test_templates.h" -#include "complex_math_templates.h" -#include "type_abbrev.h" - -#define JTEST_ARM_CMPLX_MAG_TEST(suffix, comparison_interface) \ - COMPLEX_MATH_DEFINE_TEST_TEMPLATE_BUF1_BLK( \ - cmplx_mag, \ - suffix, \ - TYPE_FROM_ABBREV(suffix), \ - TYPE_FROM_ABBREV(suffix), \ - comparison_interface) - -JTEST_ARM_CMPLX_MAG_TEST(f32, COMPLEX_MATH_COMPARE_RE_INTERFACE); -JTEST_ARM_CMPLX_MAG_TEST(q31, COMPLEX_MATH_SNR_COMPARE_RE_INTERFACE); -JTEST_ARM_CMPLX_MAG_TEST(q15, COMPLEX_MATH_SNR_COMPARE_RE_INTERFACE); - -/*--------------------------------------------------------------------------------*/ -/* Collect all tests in a group. */ -/*--------------------------------------------------------------------------------*/ - -JTEST_DEFINE_GROUP(cmplx_mag_tests) -{ - JTEST_TEST_CALL(arm_cmplx_mag_f32_test); - JTEST_TEST_CALL(arm_cmplx_mag_q31_test); - JTEST_TEST_CALL(arm_cmplx_mag_q15_test); -} diff --git a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_cmplx_tests.c b/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_cmplx_tests.c deleted file mode 100644 index 22c5a70..0000000 --- a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_cmplx_tests.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "jtest.h" -#include "complex_math_test_data.h" -#include "arr_desc.h" -#include "arm_math.h" /* FUTs */ -#include "ref.h" /* Reference Functions */ -#include "test_templates.h" -#include "complex_math_templates.h" -#include "type_abbrev.h" - -#define JTEST_ARM_CMPLX_MULT_CMPLX_TEST(suffix) \ - COMPLEX_MATH_DEFINE_TEST_TEMPLATE_BUF2_BLK( \ - cmplx_mult_cmplx, \ - suffix, \ - TYPE_FROM_ABBREV(suffix), \ - TYPE_FROM_ABBREV(suffix), \ - COMPLEX_MATH_COMPARE_CMPLX_INTERFACE) - -JTEST_ARM_CMPLX_MULT_CMPLX_TEST(f32); -JTEST_ARM_CMPLX_MULT_CMPLX_TEST(q31); -JTEST_ARM_CMPLX_MULT_CMPLX_TEST(q15); - -/*--------------------------------------------------------------------------------*/ -/* Collect all tests in a group. */ -/*--------------------------------------------------------------------------------*/ - -JTEST_DEFINE_GROUP(cmplx_mult_cmplx_tests) -{ - JTEST_TEST_CALL(arm_cmplx_mult_cmplx_f32_test); - JTEST_TEST_CALL(arm_cmplx_mult_cmplx_q31_test); - JTEST_TEST_CALL(arm_cmplx_mult_cmplx_q15_test); -} diff --git a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_real_test.c b/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_real_test.c deleted file mode 100644 index fce7b82..0000000 --- a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/cmplx_mult_real_test.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "jtest.h" -#include "complex_math_test_data.h" -#include "arr_desc.h" -#include "arm_math.h" /* FUTs */ -#include "ref.h" /* Reference Functions */ -#include "test_templates.h" -#include "complex_math_templates.h" -#include "type_abbrev.h" - -#define JTEST_ARM_CMPLX_MULT_REAL_TEST(suffix, comparison_interface) \ - COMPLEX_MATH_DEFINE_TEST_TEMPLATE_BUF2_BLK( \ - cmplx_mult_real, \ - suffix, \ - TYPE_FROM_ABBREV(suffix), \ - TYPE_FROM_ABBREV(suffix), \ - comparison_interface) - -JTEST_ARM_CMPLX_MULT_REAL_TEST(f32, COMPLEX_MATH_COMPARE_CMPLX_INTERFACE); -JTEST_ARM_CMPLX_MULT_REAL_TEST(q31, COMPLEX_MATH_SNR_COMPARE_CMPLX_INTERFACE); -JTEST_ARM_CMPLX_MULT_REAL_TEST(q15, COMPLEX_MATH_COMPARE_CMPLX_INTERFACE); - -/*--------------------------------------------------------------------------------*/ -/* Collect all tests in a group. */ -/*--------------------------------------------------------------------------------*/ - -JTEST_DEFINE_GROUP(cmplx_mult_real_tests) -{ - JTEST_TEST_CALL(arm_cmplx_mult_real_f32_test); - JTEST_TEST_CALL(arm_cmplx_mult_real_q31_test); - JTEST_TEST_CALL(arm_cmplx_mult_real_q15_test); -} diff --git a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_common_data.c b/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_common_data.c deleted file mode 100644 index 396dc2f..0000000 --- a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_common_data.c +++ /dev/null @@ -1,114 +0,0 @@ -#include "complex_math_test_data.h" - -/*--------------------------------------------------------------------------------*/ -/* Input/Output Buffers */ -/*--------------------------------------------------------------------------------*/ - -ARR_DESC_DEFINE(COMPLEX_MATH_BIGGEST_INPUT_TYPE, - complex_math_output_fut_a, - COMPLEX_MATH_MAX_INPUT_ELEMENTS * 2 /*Complex data has two parts*/, - CURLY(0)); - -ARR_DESC_DEFINE(COMPLEX_MATH_BIGGEST_INPUT_TYPE, - complex_math_output_fut_b, - COMPLEX_MATH_MAX_INPUT_ELEMENTS * 2 /*Complex data has two parts*/, - CURLY(0)); - -ARR_DESC_DEFINE(COMPLEX_MATH_BIGGEST_INPUT_TYPE, - complex_math_output_ref_a, - COMPLEX_MATH_MAX_INPUT_ELEMENTS * 2 /*Complex data has two parts*/, - CURLY(0)); - - -ARR_DESC_DEFINE(COMPLEX_MATH_BIGGEST_INPUT_TYPE, - complex_math_output_ref_b, - COMPLEX_MATH_MAX_INPUT_ELEMENTS * 2 /*Complex data has two parts*/, - CURLY(0)); - - -COMPLEX_MATH_BIGGEST_INPUT_TYPE -complex_math_output_f32_ref_a[COMPLEX_MATH_MAX_INPUT_ELEMENTS * 2]; - -COMPLEX_MATH_BIGGEST_INPUT_TYPE -complex_math_output_f32_ref_b[COMPLEX_MATH_MAX_INPUT_ELEMENTS * 2]; - -COMPLEX_MATH_BIGGEST_INPUT_TYPE -complex_math_output_f32_fut_a[COMPLEX_MATH_MAX_INPUT_ELEMENTS * 2]; - -COMPLEX_MATH_BIGGEST_INPUT_TYPE -complex_math_output_f32_fut_b[COMPLEX_MATH_MAX_INPUT_ELEMENTS * 2]; - -/*--------------------------------------------------------------------------------*/ -/* Block Sizes */ -/*--------------------------------------------------------------------------------*/ - -ARR_DESC_DEFINE(uint32_t, - complex_math_block_sizes, - 4, - CURLY(1, 2, 15, 32)); - -/*--------------------------------------------------------------------------------*/ -/* Test Data */ -/*--------------------------------------------------------------------------------*/ - -ARR_DESC_DEFINE(float32_t, - complex_math_f_32, - 32 * 2 /*Complex data has two parts*/, - CURLY( - -0.432564811528220680 , 0.815622288876143300, - -1.665584378238097000 , 0.711908323500893280, - 0.125332306474830680 , 1.290249754932477000, - 0.287676420358548850 , 0.668600505682040320, - -1.146471350681463700 , 1.190838074243369100, - 1.190915465642998800 , -1.202457114773944000, - 1.189164201652103100 , -0.019789557768770449, - -0.037633276593317645 , -0.156717298831980680, - 0.327292361408654140 , -1.604085562001158500, - 0.174639142820924520 , 0.257304234677489860, - -0.186708577681439360 , -1.056472928081482400, - 0.725790548293302700 , 1.415141485872338600, - -0.588316543014188680 , -0.805090404196879830, - 2.183185818197101100 , 0.528743010962224870, - -0.136395883086595700 , 0.219320672667622370, - 0.113931313520809620 , -0.921901624355539130, - 1.066768211359188800 , -2.170674494305262500, - 0.059281460523605348 , -0.059187824521191180, - -0.095648405483669041 , -1.010633706474247400, - -0.832349463650022490 , 0.614463048895480980, - 0.294410816392640380 , 0.507740785341985520, - -1.336181857937804000 , 1.692429870190521400, - 0.714324551818952160 , 0.591282586924175900, - 1.623562064446270700 , -0.643595202682526120, - -0.691775701702286750 , 0.380337251713910140, - 0.857996672828262640 , -1.009115524340785000, - 1.254001421602532400 , -0.019510669530289293, - -1.593729576447476800 , -0.048220789145312269, - -1.440964431901020000 , 0.000043191841625545, - 0.571147623658177950 , -0.317859451247687890, - -0.399885577715363150 , 1.095003738787492500, - 0.689997375464345140 , -1.873990257640960800 - )); - -ARR_DESC_DEFINE_SUBSET(complex_math_f_15, - complex_math_f_32, - 15 * 2 /*Complex data has two parts*/); - -ARR_DESC_DEFINE_SUBSET(complex_math_f_2, - complex_math_f_32, - 2 * 2 /*Complex data has two parts*/); - -ARR_DESC_DEFINE(float32_t, - complex_math_zeros, - 32 * 2 /*Complex data has two parts*/, - CURLY(0)); - -/* Aggregate all float datasets */ -ARR_DESC_DEFINE(ARR_DESC_t *, - complex_math_f_all, - 4, - CURLY( - &complex_math_zeros, - &complex_math_f_2, - &complex_math_f_15, - &complex_math_f_32 - )); diff --git a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_group.c b/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_group.c deleted file mode 100644 index 38546fb..0000000 --- a/fw/hid-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/src/complex_math_tests/complex_math_test_group.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "jtest.h" -#include "complex_math_tests.h" - -JTEST_DEFINE_GROUP(complex_math_tests) -{ - JTEST_GROUP_CALL(cmplx_conj_tests); - JTEST_GROUP_CALL(cmplx_dot_prod_tests); - JTEST_GROUP_CALL(cmplx_mag_tests); - JTEST_GROUP_CALL(cmplx_mag_squared_tests); - JTEST_GROUP_CALL(cmplx_mult_cmplx_tests); - JTEST_GROUP_CALL(cmplx_mult_real_tests); - - return; -} -- cgit