From 91e83cb02f8c4cb2cd0a146b54f22d9b33d12abd Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Wed, 10 Jan 2024 08:32:28 +0100 Subject: [PATCH] Corrected issue #133 : missing const qualifier --- Include/dsp/interpolation_functions.h | 2 +- Include/dsp/interpolation_functions_f16.h | 2 +- .../arm_linear_interp_f16.c | 2 +- .../arm_linear_interp_f32.c | 2 +- Testing/cmsis_build/boot.clayer.yml | 9 ++++----- Testing/cmsis_build/runall.py | 3 ++- .../test.Release+VHT-Corstone-300-NOMVE.cprj | 4 ++-- .../test.Release+VHT-Corstone-300.cprj | 4 ++-- Testing/cmsis_build/test.Release+VHT_M0P.cprj | 2 +- Testing/cmsis_build/test.Release+VHT_M23.cprj | 2 +- Testing/cmsis_build/test.Release+VHT_M3.cprj | 2 +- Testing/cmsis_build/test.Release+VHT_M33.cprj | 2 +- Testing/cmsis_build/test.Release+VHT_M4.cprj | 2 +- Testing/cmsis_build/test.Release+VHT_M7.cprj | 2 +- .../test.Release+VHT_M7_UNROLLED.cprj | 2 +- Testing/cmsis_build/test.cproject.yml | 6 +++--- Testing/cmsis_build/test_ac6.cbuild-pack.yml | 17 +++++++++++++++++ Testing/cmsis_build/test_ac6.csolution.yml | 15 +++++++++------ 18 files changed, 50 insertions(+), 30 deletions(-) create mode 100644 Testing/cmsis_build/test_ac6.cbuild-pack.yml diff --git a/Include/dsp/interpolation_functions.h b/Include/dsp/interpolation_functions.h index dbea4eb3c..c65e359e6 100755 --- a/Include/dsp/interpolation_functions.h +++ b/Include/dsp/interpolation_functions.h @@ -162,7 +162,7 @@ extern "C" * */ float32_t arm_linear_interp_f32( - arm_linear_interp_instance_f32 * S, + const arm_linear_interp_instance_f32 * S, float32_t x); /** diff --git a/Include/dsp/interpolation_functions_f16.h b/Include/dsp/interpolation_functions_f16.h index eb7cdb8da..3df5ecdae 100755 --- a/Include/dsp/interpolation_functions_f16.h +++ b/Include/dsp/interpolation_functions_f16.h @@ -70,7 +70,7 @@ typedef struct * @return y processed output sample. */ float16_t arm_linear_interp_f16( - arm_linear_interp_instance_f16 * S, + const arm_linear_interp_instance_f16 * S, float16_t x); /** diff --git a/Source/InterpolationFunctions/arm_linear_interp_f16.c b/Source/InterpolationFunctions/arm_linear_interp_f16.c index 862e6757e..e60abf5ca 100755 --- a/Source/InterpolationFunctions/arm_linear_interp_f16.c +++ b/Source/InterpolationFunctions/arm_linear_interp_f16.c @@ -49,7 +49,7 @@ * */ float16_t arm_linear_interp_f16( - arm_linear_interp_instance_f16 * S, + const arm_linear_interp_instance_f16 * S, float16_t x) { float16_t y; diff --git a/Source/InterpolationFunctions/arm_linear_interp_f32.c b/Source/InterpolationFunctions/arm_linear_interp_f32.c index 8da2c6313..11aad985d 100755 --- a/Source/InterpolationFunctions/arm_linear_interp_f32.c +++ b/Source/InterpolationFunctions/arm_linear_interp_f32.c @@ -77,7 +77,7 @@ * */ float32_t arm_linear_interp_f32( - arm_linear_interp_instance_f32 * S, + const arm_linear_interp_instance_f32 * S, float32_t x) { float32_t y; diff --git a/Testing/cmsis_build/boot.clayer.yml b/Testing/cmsis_build/boot.clayer.yml index 9cb76a0e2..511d90aab 100644 --- a/Testing/cmsis_build/boot.clayer.yml +++ b/Testing/cmsis_build/boot.clayer.yml @@ -10,7 +10,7 @@ layer: - +VHT-Corstone-310 - component: Device:Startup&C Startup not-for-context: - - +VHT-Corstone-300 + - +VHT-Corstone-300 - +VHT-Corstone-300-NOMVE - +VHT-Corstone-310 - +FVP_A5Neon @@ -40,21 +40,20 @@ layer: for-context: - +VHT-Corstone-300 - +VHT-Corstone-300-NOMVE - - +VHT-Corstone-310 - component: ARM::Native Driver:DMA350 Remap for-context: - +VHT-Corstone-310 - - component: ARM::Native Driver:Timeout + - component: ARM::Native Driver:SysCounter for-context: - +VHT-Corstone-300 - +VHT-Corstone-300-NOMVE - +VHT-Corstone-310 - - component: ARM::Native Driver:SysCounter + - component: ARM::Native Driver:SysTimer for-context: - +VHT-Corstone-300 - +VHT-Corstone-300-NOMVE - +VHT-Corstone-310 - - component: ARM::Native Driver:SysTimer + - component: ARM::Native Driver:Timeout for-context: - +VHT-Corstone-300 - +VHT-Corstone-300-NOMVE diff --git a/Testing/cmsis_build/runall.py b/Testing/cmsis_build/runall.py index 5d31e6c73..c7857940c 100644 --- a/Testing/cmsis_build/runall.py +++ b/Testing/cmsis_build/runall.py @@ -196,7 +196,8 @@ def runAVH(build,core): #allSuites=[("StatsTestsQ7","../Output.pickle")] allSuites=[ -("MISCF32","../Output.pickle"), +("InterpolationTestsF32","../Output.pickle"), +("InterpolationTestsF16","../Output_f16.pickle"), #("MISCQ15","../Output.pickle"), #("MISCQ7","../Output.pickle"), #("FIRF16","../Output_f16.pickle") diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300-NOMVE.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300-NOMVE.cprj index 0b28bc9d7..1bc816455 100644 --- a/Testing/cmsis_build/test.Release+VHT-Corstone-300-NOMVE.cprj +++ b/Testing/cmsis_build/test.Release+VHT-Corstone-300-NOMVE.cprj @@ -1,6 +1,6 @@ - + Automatically generated project @@ -15,7 +15,7 @@ - + diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj index 33aa542b0..108956b63 100644 --- a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj +++ b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj @@ -1,6 +1,6 @@ - + Automatically generated project @@ -15,7 +15,7 @@ - + diff --git a/Testing/cmsis_build/test.Release+VHT_M0P.cprj b/Testing/cmsis_build/test.Release+VHT_M0P.cprj index efddadf8e..9f89dd78d 100644 --- a/Testing/cmsis_build/test.Release+VHT_M0P.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M0P.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M23.cprj b/Testing/cmsis_build/test.Release+VHT_M23.cprj index 43f3d8ee9..fafbb1326 100644 --- a/Testing/cmsis_build/test.Release+VHT_M23.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M23.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M3.cprj b/Testing/cmsis_build/test.Release+VHT_M3.cprj index 6d971e881..04f1319fc 100644 --- a/Testing/cmsis_build/test.Release+VHT_M3.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M3.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M33.cprj b/Testing/cmsis_build/test.Release+VHT_M33.cprj index ebe47509b..77cbcb7bb 100644 --- a/Testing/cmsis_build/test.Release+VHT_M33.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M33.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M4.cprj b/Testing/cmsis_build/test.Release+VHT_M4.cprj index e278b04d2..91ad5c70f 100644 --- a/Testing/cmsis_build/test.Release+VHT_M4.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M4.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M7.cprj b/Testing/cmsis_build/test.Release+VHT_M7.cprj index e727ee95f..b491dfcb1 100644 --- a/Testing/cmsis_build/test.Release+VHT_M7.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M7.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj index ef8cafa60..670c81277 100644 --- a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj @@ -1,6 +1,6 @@ - + Automatically generated project diff --git a/Testing/cmsis_build/test.cproject.yml b/Testing/cmsis_build/test.cproject.yml index 3d585fa9f..9017336bc 100644 --- a/Testing/cmsis_build/test.cproject.yml +++ b/Testing/cmsis_build/test.cproject.yml @@ -1,13 +1,13 @@ project: setups: - - setup: + - setup: Cortex-A9 define: - ARM_MATH_AUTOVECTORIZE - DISABLEFLOAT16 for-context: - +FVP_A9Neon - - setup: + - setup: Cortex-A5 or A7 define: - ARM_MATH_NEON - DISABLEFLOAT16 @@ -15,7 +15,7 @@ project: - +FVP_A5Neon - +FVP_A7Neon - - setup: + - setup: Any Cortex-M not-for-context: - +FVP_A5Neon - +FVP_A7Neon diff --git a/Testing/cmsis_build/test_ac6.cbuild-pack.yml b/Testing/cmsis_build/test_ac6.cbuild-pack.yml new file mode 100644 index 000000000..58ae8ec4d --- /dev/null +++ b/Testing/cmsis_build/test_ac6.cbuild-pack.yml @@ -0,0 +1,17 @@ +cbuild-pack: + resolved-packs: + - resolved-pack: ARM::CMSIS@5.9.0 + selected-by: + - ARM::CMSIS@5.9.0 + - resolved-pack: ARM::DMA350@1.0.0 + selected-by: + - ARM::DMA350@1.0.0 + - resolved-pack: ARM::V2M_MPS3_SSE_300_BSP@1.3.0 + selected-by: + - ARM::V2M_MPS3_SSE_300_BSP@1.3.0 + - resolved-pack: ARM::V2M_MPS3_SSE_310_BSP@1.3.0 + selected-by: + - ARM::V2M_MPS3_SSE_310_BSP@1.3.0 + - resolved-pack: Keil::ARM_Compiler@1.7.2 + selected-by: + - Keil::ARM_Compiler@1.7.2 diff --git a/Testing/cmsis_build/test_ac6.csolution.yml b/Testing/cmsis_build/test_ac6.csolution.yml index d4ed7af02..a90df4ecc 100644 --- a/Testing/cmsis_build/test_ac6.csolution.yml +++ b/Testing/cmsis_build/test_ac6.csolution.yml @@ -51,25 +51,28 @@ solution: packs: - pack: ARM::CMSIS@5.9.0 - pack: ARM::V2M_MPS3_SSE_300_BSP@1.3.0 - - pack: ARM::V2M_MPS3_SSE_310_BSP@1.1.0 + - pack: ARM::V2M_MPS3_SSE_310_BSP@1.3.0 - pack: Keil::ARM_Compiler@1.7.2 - pack: ARM::DMA350@1.0.0 target-types: - - type: VHT-Corstone-310 - device: ARM::SSE-310-MPS3 - define: - - CORTEXM - - SSE310MPS3 + #- type: VHT-Corstone-310 + # device: ARM::SSE-310-MPS3_FVP + # board: ARM::V2M-MPS3-SSE-310 + # define: + # - CORTEXM + # - SSE310MPS3 - type: VHT-Corstone-300 device: ARM::SSE-300-MPS3 + board: ARM::V2M-MPS3-SSE-300-FVP define: - CORTEXM - SSE300MPS3 - type: VHT-Corstone-300-NOMVE device: ARM::SSE-300-MPS3 + board: ARM::V2M-MPS3-SSE-300-FVP misc: - C: - -mcpu=cortex-m55+nomve