Corrected issue ARM-software#133 : missing const qualifier

christophe0606 · christophe0606 · commit 91e83cb02f8c · 2024-01-10T08:32:28.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -15,7 +15,7 @@
     <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
-  <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-300-MPS3" Dtz="TZ" Dvendor="ARM:82">
+  <target Bname="V2M-MPS3-SSE-300-FVP" Bvendor="ARM" Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-300-MPS3" Dtz="TZ" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT-Corstone-300-NOMVE/Release" name="test" outdir="out/test/VHT-Corstone-300-NOMVE/Release" rtedir="RTE" type="exe"/>
     <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -15,7 +15,7 @@
     <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
-  <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-300-MPS3" Dtz="TZ" Dvendor="ARM:82">
+  <target Bname="V2M-MPS3-SSE-300-FVP" Bvendor="ARM" Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-300-MPS3" Dtz="TZ" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT-Corstone-300/Release" name="test" outdir="out/test/VHT-Corstone-300/Release" rtedir="RTE" type="exe"/>
     <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M0P.cprj b/Testing/cmsis_build/test.Release+VHT_M0P.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
diff --git a/Testing/cmsis_build/test.Release+VHT_M23.cprj b/Testing/cmsis_build/test.Release+VHT_M23.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
diff --git a/Testing/cmsis_build/test.Release+VHT_M3.cprj b/Testing/cmsis_build/test.Release+VHT_M3.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
diff --git a/Testing/cmsis_build/test.Release+VHT_M33.cprj b/Testing/cmsis_build/test.Release+VHT_M33.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
diff --git a/Testing/cmsis_build/test.Release+VHT_M4.cprj b/Testing/cmsis_build/test.Release+VHT_M4.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
diff --git a/Testing/cmsis_build/test.Release+VHT_M7.cprj b/Testing/cmsis_build/test.Release+VHT_M7.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
diff --git a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2023-11-27T06:42:48" tool="csolution 2.0.0"/>
+  <created timestamp="2024-01-10T08:28:29" tool="csolution 2.2.1"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
diff --git a/Testing/cmsis_build/test.cproject.yml b/Testing/cmsis_build/test.cproject.yml
@@ -1,21 +1,21 @@
 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
       for-context: 
         - +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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ extern "C"`
`162`	`162`	`*`
`163`	`163`	`*/`
`164`	`164`	`float32_t arm_linear_interp_f32(`
`165`		`- arm_linear_interp_instance_f32 * S,`
	`165`	`+ const arm_linear_interp_instance_f32 * S,`
`166`	`166`	`float32_t x);`
`167`	`167`
`168`	`168`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`*`
`50`	`50`	`*/`
`51`	`51`	`float16_t arm_linear_interp_f16(`
`52`		`- arm_linear_interp_instance_f16 * S,`
	`52`	`+ const arm_linear_interp_instance_f16 * S,`
`53`	`53`	`float16_t x)`
`54`	`54`	`{`
`55`	`55`	`float16_t y;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`*`
`78`	`78`	`*/`
`79`	`79`	`float32_t arm_linear_interp_f32(`
`80`		`- arm_linear_interp_instance_f32 * S,`
	`80`	`+ const arm_linear_interp_instance_f32 * S,`
`81`	`81`	`float32_t x)`
`82`	`82`	`{`
`83`	`83`	`float32_t y;`