From fa73bb9825d6151b55edc219119e5f136ba05fd7 Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Tue, 27 Oct 2020 08:06:45 +0100 Subject: [PATCH] CMSIS-DSP: Removed build warnings for tests. --- Testing/Source/Benchmarks/BIQUADF16.cpp | 2 ++ .../Source/Benchmarks/BasicMathsBenchmarksF16.cpp | 2 ++ Testing/Source/Benchmarks/BayesF16.cpp | 1 + Testing/Source/Benchmarks/BinaryF16.cpp | 2 ++ .../Benchmarks/ComplexMathsBenchmarksF16.cpp | 2 ++ Testing/Source/Benchmarks/DistanceF16.cpp | 1 + Testing/Source/Benchmarks/FIRF16.cpp | 2 ++ Testing/Source/Benchmarks/FastMathF16.cpp | 4 +++- Testing/Source/Benchmarks/MISCF16.cpp | 2 ++ Testing/Source/Benchmarks/SVMF16.cpp | 1 + Testing/Source/Benchmarks/StatsF16.cpp | 2 +- Testing/Source/Benchmarks/SupportBarF16.cpp | 3 +++ Testing/Source/Benchmarks/SupportF16.cpp | 2 ++ Testing/Source/Benchmarks/TransformF16.cpp | 2 ++ Testing/Source/Benchmarks/UnaryF16.cpp | 2 ++ Testing/Source/Benchmarks/UnaryF32.cpp | 4 ++-- Testing/bench.txt | 2 +- Testing/bench_f16.txt | 4 ++-- Testing/createDb.sql | 14 ++++++++------ 19 files changed, 41 insertions(+), 13 deletions(-) diff --git a/Testing/Source/Benchmarks/BIQUADF16.cpp b/Testing/Source/Benchmarks/BIQUADF16.cpp index 1bba1dd2..4a22c808 100755 --- a/Testing/Source/Benchmarks/BIQUADF16.cpp +++ b/Testing/Source/Benchmarks/BIQUADF16.cpp @@ -97,4 +97,6 @@ void BIQUADF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/BasicMathsBenchmarksF16.cpp b/Testing/Source/Benchmarks/BasicMathsBenchmarksF16.cpp index 30186a00..28887bbb 100755 --- a/Testing/Source/Benchmarks/BasicMathsBenchmarksF16.cpp +++ b/Testing/Source/Benchmarks/BasicMathsBenchmarksF16.cpp @@ -93,4 +93,6 @@ void BasicMathsBenchmarksF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/BayesF16.cpp b/Testing/Source/Benchmarks/BayesF16.cpp index aa1e74e1..eabf6a86 100755 --- a/Testing/Source/Benchmarks/BayesF16.cpp +++ b/Testing/Source/Benchmarks/BayesF16.cpp @@ -75,5 +75,6 @@ void BayesF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { (void)id; + (void)mgr; this->nb++; } diff --git a/Testing/Source/Benchmarks/BinaryF16.cpp b/Testing/Source/Benchmarks/BinaryF16.cpp index 2445fcf8..333729e4 100755 --- a/Testing/Source/Benchmarks/BinaryF16.cpp +++ b/Testing/Source/Benchmarks/BinaryF16.cpp @@ -56,4 +56,6 @@ void BinaryF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/ComplexMathsBenchmarksF16.cpp b/Testing/Source/Benchmarks/ComplexMathsBenchmarksF16.cpp index a704c3e3..8ccf4017 100755 --- a/Testing/Source/Benchmarks/ComplexMathsBenchmarksF16.cpp +++ b/Testing/Source/Benchmarks/ComplexMathsBenchmarksF16.cpp @@ -79,4 +79,6 @@ void ComplexMathsBenchmarksF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/DistanceF16.cpp b/Testing/Source/Benchmarks/DistanceF16.cpp index b9365a5b..6c6a2ed0 100755 --- a/Testing/Source/Benchmarks/DistanceF16.cpp +++ b/Testing/Source/Benchmarks/DistanceF16.cpp @@ -119,4 +119,5 @@ void DistanceF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/FIRF16.cpp b/Testing/Source/Benchmarks/FIRF16.cpp index d82ac9b7..d3605e1b 100755 --- a/Testing/Source/Benchmarks/FIRF16.cpp +++ b/Testing/Source/Benchmarks/FIRF16.cpp @@ -43,4 +43,6 @@ void FIRF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/FastMathF16.cpp b/Testing/Source/Benchmarks/FastMathF16.cpp index 69559320..3aafc508 100755 --- a/Testing/Source/Benchmarks/FastMathF16.cpp +++ b/Testing/Source/Benchmarks/FastMathF16.cpp @@ -31,7 +31,7 @@ void FastMathF16::setUp(Testing::testID_t id,std::vector& params,Client::PatternMgr *mgr) { - + (void)id; std::vector::iterator it = params.begin(); this->nbSamples = *it; @@ -46,4 +46,6 @@ void FastMathF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/MISCF16.cpp b/Testing/Source/Benchmarks/MISCF16.cpp index 88785c15..da2cc434 100755 --- a/Testing/Source/Benchmarks/MISCF16.cpp +++ b/Testing/Source/Benchmarks/MISCF16.cpp @@ -49,4 +49,6 @@ void MISCF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/SVMF16.cpp b/Testing/Source/Benchmarks/SVMF16.cpp index 1cab10a7..2bc23caf 100755 --- a/Testing/Source/Benchmarks/SVMF16.cpp +++ b/Testing/Source/Benchmarks/SVMF16.cpp @@ -238,6 +238,7 @@ void SVMF16::setUp(Testing::testID_t id,std::vector& testparam void SVMF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)mgr; switch(id) { case SVMF16::TEST_SVM_LINEAR_PREDICT_F16_1: diff --git a/Testing/Source/Benchmarks/StatsF16.cpp b/Testing/Source/Benchmarks/StatsF16.cpp index 8a4e1047..be1c9ed2 100755 --- a/Testing/Source/Benchmarks/StatsF16.cpp +++ b/Testing/Source/Benchmarks/StatsF16.cpp @@ -186,5 +186,5 @@ void StatsF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { (void)id; - + (void)mgr; } diff --git a/Testing/Source/Benchmarks/SupportBarF16.cpp b/Testing/Source/Benchmarks/SupportBarF16.cpp index 5d48bcc7..784f55d6 100755 --- a/Testing/Source/Benchmarks/SupportBarF16.cpp +++ b/Testing/Source/Benchmarks/SupportBarF16.cpp @@ -39,4 +39,7 @@ void SupportBarF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; + } diff --git a/Testing/Source/Benchmarks/SupportF16.cpp b/Testing/Source/Benchmarks/SupportF16.cpp index f262b6dc..56e7a6c3 100755 --- a/Testing/Source/Benchmarks/SupportF16.cpp +++ b/Testing/Source/Benchmarks/SupportF16.cpp @@ -72,4 +72,6 @@ void SupportF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/TransformF16.cpp b/Testing/Source/Benchmarks/TransformF16.cpp index 653a5670..e4ca2cd7 100755 --- a/Testing/Source/Benchmarks/TransformF16.cpp +++ b/Testing/Source/Benchmarks/TransformF16.cpp @@ -104,4 +104,6 @@ void TransformF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/UnaryF16.cpp b/Testing/Source/Benchmarks/UnaryF16.cpp index bba748e5..a476b9cc 100755 --- a/Testing/Source/Benchmarks/UnaryF16.cpp +++ b/Testing/Source/Benchmarks/UnaryF16.cpp @@ -272,4 +272,6 @@ static int cholesky_offset(int d) void UnaryF16::tearDown(Testing::testID_t id,Client::PatternMgr *mgr) { + (void)id; + (void)mgr; } diff --git a/Testing/Source/Benchmarks/UnaryF32.cpp b/Testing/Source/Benchmarks/UnaryF32.cpp index 38ca3979..7678049e 100755 --- a/Testing/Source/Benchmarks/UnaryF32.cpp +++ b/Testing/Source/Benchmarks/UnaryF32.cpp @@ -89,7 +89,7 @@ static int cholesky_offset(int d) arm_mat_solve_lower_triangular_f32(&this->in1,&this->in2,&this->out); } - void UnaryF32::test_ldlt_decomposition() + void UnaryF32::test_ldlt_decomposition_f32() { arm_mat_ldlt_f32(&this->in1,&this->outll,&this->outd,(uint16_t*)outp); } @@ -257,7 +257,7 @@ static int cholesky_offset(int d) } break; - case TEST_LDLT_DECOMPOSITION_11: + case TEST_LDLT_DECOMPOSITION_F32_11: { float32_t *p, *aPtr; diff --git a/Testing/bench.txt b/Testing/bench.txt index f003123c..723cca82 100755 --- a/Testing/bench.txt +++ b/Testing/bench.txt @@ -1308,7 +1308,7 @@ group Root { Cholesky decomposition:test_mat_cholesky_dpo_f32 -> PARAM_CHOLESKY_ID Backward substitution:test_solve_upper_triangular_f32 -> PARAM_CHOLESKY_ID Foward substitution:test_solve_lower_triangular_f32 -> PARAM_CHOLESKY_ID - LDLT decomposition:test_ldlt_decomposition -> PARAM_CHOLESKY_ID + LDLT decomposition:test_ldlt_decomposition_f32 -> PARAM_CHOLESKY_ID } -> PARAM1_ID } diff --git a/Testing/bench_f16.txt b/Testing/bench_f16.txt index a3b91f12..afcf5183 100755 --- a/Testing/bench_f16.txt +++ b/Testing/bench_f16.txt @@ -490,11 +490,11 @@ group Root { Pattern REFLDLT_D_DPO1_F16_ID : RefLDLT_D_DPO1_f16.txt Pattern REFLDLT_LL_DPO1_F16_ID : RefLDLT_LL_DPO1_f16.txt - Pattern REFLDLT_PERM_DPO1_F16_ID : RefLDLT_PERM_DPO1_f16.txt + Pattern REFLDLT_PERM_DPO1_F16_ID : RefLDLT_PERM_DPO1_s16.txt Pattern REFLDLT_D_SDPO1_F16_ID : RefLDLT_D_SDPO1_f16.txt Pattern REFLDLT_LL_SDPO1_F16_ID : RefLDLT_LL_SDPO1_f16.txt - Pattern REFLDLT_PERM_SDPO1_F16_ID : RefLDLT_PERM_SDPO1_f16.txt + Pattern REFLDLT_PERM_SDPO1_F16_ID : RefLDLT_PERM_SDPO1_s16.txt Pattern INPUT_UT_DPO_F16_ID : InputUTDPO1_f16.txt Pattern INPUT_LT_DPO_F16_ID : InputLTDPO1_f16.txt diff --git a/Testing/createDb.sql b/Testing/createDb.sql index a1569d8b..21cd540e 100755 --- a/Testing/createDb.sql +++ b/Testing/createDb.sql @@ -106,11 +106,13 @@ INSERT INTO CORE VALUES(13,"a15","ARMCA15"); INSERT INTO CORE VALUES(14,"m55mvef","ARMv81MML_DSP_DP_MVE_FP"); -# Second item is text as displayed in UI -# Third is CONFIGID generated by run script -# and different from COREID as was used before -# Above we have entries with COREIDs but it is -# no more used +/* +Second item is text as displayed in UI +Third is CONFIGID generated by run script +and different from COREID as was used before +Above we have entries with COREIDs but it is +no more used +*/ INSERT INTO CORE VALUES(15,"m0","M0"); INSERT INTO CORE VALUES(16,"m7","M7"); INSERT INTO CORE VALUES(17,"m33","M33"); @@ -121,7 +123,7 @@ INSERT INTO CORE VALUES(21,"r8","R8"); INSERT INTO CORE VALUES(22,"r5","R5"); INSERT INTO CORE VALUES(23,"a32","A32"); INSERT INTO CORE VALUES(24,"r52","R52"); -INSERT INTO CORE VALUES(25,"'m55 autovec","M55AUTOVEC"); +INSERT INTO CORE VALUES(25,"m55 autovec","M55AUTOVEC"); .quit