From 94f94260ace13688285fc8c62687079b26c18854 Mon Sep 17 00:00:00 2001 From: jaseg Date: Sun, 20 Dec 2020 15:18:02 +0100 Subject: Submodule-cache WIP --- .../inc/statistics_tests/statistics_templates.h | 157 --------------------- .../inc/statistics_tests/statistics_test_data.h | 44 ------ .../inc/statistics_tests/statistics_test_group.h | 9 -- .../Common/inc/statistics_tests/statistics_tests.h | 15 -- 4 files changed, 225 deletions(-) delete mode 100644 fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_templates.h delete mode 100644 fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_data.h delete mode 100644 fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_group.h delete mode 100644 fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_tests.h (limited to 'fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests') diff --git a/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_templates.h b/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_templates.h deleted file mode 100644 index ddca35c..0000000 --- a/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_templates.h +++ /dev/null @@ -1,157 +0,0 @@ -#ifndef _STATISTICS_TEMPLATES_H_ -#define _STATISTICS_TEMPLATES_H_ - -/*--------------------------------------------------------------------------------*/ -/* Includes */ -/*--------------------------------------------------------------------------------*/ - -#include "test_templates.h" - -/*--------------------------------------------------------------------------------*/ -/* Group Specific Templates */ -/*--------------------------------------------------------------------------------*/ - -/** - * Compare the outputs from the function under test and the reference function. - */ -#define STATISTICS_COMPARE_INTERFACE(block_size, \ - output_type) \ - do \ - { \ - TEST_ASSERT_BUFFERS_EQUAL( \ - statistics_output_ref.data_ptr, \ - statistics_output_fut.data_ptr, \ - 1 * sizeof(output_type) /* All fns return one value*/ \ - ); \ - TEST_ASSERT_EQUAL( \ - statistics_idx_fut, \ - statistics_idx_ref); \ - } while (0) \ - -/* - * Comparison SNR thresholds for the data types used in statistics_tests. - */ -#define STATISTICS_SNR_THRESHOLD_float32_t 120 -#define STATISTICS_SNR_THRESHOLD_q31_t 100 -#define STATISTICS_SNR_THRESHOLD_q15_t 60 -#define STATISTICS_SNR_THRESHOLD_q7_t 30 - -/** - * Compare reference and fut outputs using SNR. - * - * @note The outputs are converted to float32_t before comparison. - */ -#define STATISTICS_SNR_COMPARE_INTERFACE(block_size, \ - output_type) \ - do \ - { \ - TEST_CONVERT_AND_ASSERT_SNR( \ - statistics_output_f32_ref, \ - statistics_output_ref.data_ptr, \ - statistics_output_f32_fut, \ - statistics_output_fut.data_ptr, \ - 1, /* All fns return one element*/ \ - output_type, \ - STATISTICS_SNR_THRESHOLD_##output_type \ - ); \ - } while (0) - - - -/*--------------------------------------------------------------------------------*/ -/* Input Interfaces */ -/*--------------------------------------------------------------------------------*/ -/* - * General: - * Input interfaces provide inputs to functions inside test templates. They - * ONLY provide the inputs. The output variables should be hard coded. - * - * The input interfaces must have the following format: - * - * ARM_xxx_INPUT_INTERFACE() or - * REF_xxx_INPUT_INTERFACE() - * - * The xxx must be lowercase, and is intended to be the indentifying substring - * in the function's name. Acceptable values are 'sub' or 'add' from the - * functions arm_add_q31. - */ - -#define ARM_max_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, \ - statistics_output_fut.data_ptr, &statistics_idx_fut) - -#define REF_max_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, \ - statistics_output_ref.data_ptr, &statistics_idx_ref) - -#define ARM_mean_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_fut.data_ptr) - -#define REF_mean_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_ref.data_ptr) - -#define ARM_min_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, \ - statistics_output_fut.data_ptr, &statistics_idx_fut) - -#define REF_min_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, \ - statistics_output_ref.data_ptr, &statistics_idx_ref) - -#define ARM_power_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_fut.data_ptr) - -#define REF_power_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_ref.data_ptr) - -#define ARM_rms_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_fut.data_ptr) - -#define REF_rms_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_ref.data_ptr) - -#define ARM_std_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_fut.data_ptr) - -#define REF_std_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_ref.data_ptr) - -#define ARM_var_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_fut.data_ptr) - -#define REF_var_INPUT_INTERFACE(input, block_size) \ - PAREN(input, block_size, statistics_output_ref.data_ptr) - - -/*--------------------------------------------------------------------------------*/ -/* Test Templates */ -/*--------------------------------------------------------------------------------*/ - -/** - * Specialization of #TEST_TEMPLATE_BUF1_BLK() for statistics tests. - * - * @note This macro relies on the existance of ARM_xxx_INPUT_INTERFACE and - * REF_xxx_INPUT_INTERFACEs. - */ -#define STATISTICS_DEFINE_TEST_TEMPLATE_BUF1_BLK(fn_name, \ - suffix, \ - input_type, \ - output_type, \ - comparison_interface) \ - JTEST_DEFINE_TEST(arm_##fn_name##_##suffix##_test, \ - arm_##fn_name##_##suffix) \ - { \ - TEST_TEMPLATE_BUF1_BLK( \ - statistics_f_all, \ - statistics_block_sizes, \ - input_type, \ - output_type, \ - arm_##fn_name##_##suffix, \ - ARM_##fn_name##_INPUT_INTERFACE, \ - ref_##fn_name##_##suffix, \ - REF_##fn_name##_INPUT_INTERFACE, \ - comparison_interface); \ - } - - -#endif /* _STATISTICS_TEMPLATES_H_ */ diff --git a/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_data.h b/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_data.h deleted file mode 100644 index 3e1ee09..0000000 --- a/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_data.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef _STATISTICS_TEST_DATA_H_ -#define _STATISTICS_TEST_DATA_H_ - -/*--------------------------------------------------------------------------------*/ -/* Includes */ -/*--------------------------------------------------------------------------------*/ - -#include "arr_desc.h" -#include "arm_math.h" - -/*--------------------------------------------------------------------------------*/ -/* Macros and Defines */ -/*--------------------------------------------------------------------------------*/ -#define STATISTICS_MAX_INPUT_ELEMENTS 32 -#define STATISTICS_BIGGEST_INPUT_TYPE float32_t - -/*--------------------------------------------------------------------------------*/ -/* Declare Variables */ -/*--------------------------------------------------------------------------------*/ - -/* Input/Output Buffers */ -ARR_DESC_DECLARE(statistics_output_fut); -ARR_DESC_DECLARE(statistics_output_ref); -extern uint32_t statistics_idx_fut; -extern uint32_t statistics_idx_ref; - -extern STATISTICS_BIGGEST_INPUT_TYPE -statistics_output_f32_ref[STATISTICS_MAX_INPUT_ELEMENTS]; - -extern STATISTICS_BIGGEST_INPUT_TYPE -statistics_output_f32_fut[STATISTICS_MAX_INPUT_ELEMENTS]; - - -/* Block Sizes */ -ARR_DESC_DECLARE(statistics_block_sizes); - -/* Float Inputs */ -ARR_DESC_DECLARE(statistics_zeros); -ARR_DESC_DECLARE(statistics_f_2); -ARR_DESC_DECLARE(statistics_f_15); -ARR_DESC_DECLARE(statistics_f_32); -ARR_DESC_DECLARE(statistics_f_all); - -#endif /* _STATISTICS_TEST_DATA_H_ */ diff --git a/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_group.h b/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_group.h deleted file mode 100644 index d1446ed..0000000 --- a/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_test_group.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _STATISTICS_TEST_GROUP_H_ -#define _STATISTICS_TEST_GROUP_H_ - -/*--------------------------------------------------------------------------------*/ -/* Declare Test Groups */ -/*--------------------------------------------------------------------------------*/ -JTEST_DECLARE_GROUP(statistics_tests); - -#endif /* _STATISTICS_TEST_GROUP_H_ */ diff --git a/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_tests.h b/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_tests.h deleted file mode 100644 index 20df03e..0000000 --- a/fw/midi-dials/Drivers/CMSIS/DSP/DSP_Lib_TestSuite/Common/inc/statistics_tests/statistics_tests.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _STATISTICS_TESTS_H_ -#define _STATISTICS_TESTS_H_ - -/*--------------------------------------------------------------------------------*/ -/* Test/Group Declarations */ -/*--------------------------------------------------------------------------------*/ -JTEST_DECLARE_GROUP(max_tests); -JTEST_DECLARE_GROUP(mean_tests); -JTEST_DECLARE_GROUP(min_tests); -JTEST_DECLARE_GROUP(power_tests); -JTEST_DECLARE_GROUP(rms_tests); -JTEST_DECLARE_GROUP(std_tests); -JTEST_DECLARE_GROUP(var_tests); - -#endif /* _STATISTICS_TESTS_H_ */ -- cgit