From 72d6ccb7bf0ed5c7d3a0fb199d852d59ff31e85b Mon Sep 17 00:00:00 2001
From: Christophe Favergeon <Christophe.Favergeon@arm.com>
Date: Mon, 20 Nov 2023 14:22:41 +0100
Subject: [PATCH] Updated test script to check CS300 without MVE.

---
 Testing/cmsis_build/.gitignore                |   2 +-
 Testing/cmsis_build/boot.clayer.yml           |   6 +
 Testing/cmsis_build/runall.py                 |   7 +-
 .../test.Release+VHT-Corstone-300-NOMVE.cprj  | 206 ++++++++++++++++++
 .../test.Release+VHT-Corstone-300.cprj        |   6 +-
 .../test.Release+VHT-Corstone-310.cprj        |   6 +-
 Testing/cmsis_build/test.Release+VHT_M0P.cprj |   6 +-
 Testing/cmsis_build/test.Release+VHT_M23.cprj |   6 +-
 Testing/cmsis_build/test.Release+VHT_M3.cprj  |   6 +-
 Testing/cmsis_build/test.Release+VHT_M33.cprj |   6 +-
 Testing/cmsis_build/test.Release+VHT_M4.cprj  |   6 +-
 Testing/cmsis_build/test.Release+VHT_M7.cprj  |   6 +-
 .../test.Release+VHT_M7_UNROLLED.cprj         |   6 +-
 Testing/cmsis_build/test_ac6.csolution.yml    |  14 +-
 14 files changed, 258 insertions(+), 31 deletions(-)
 create mode 100644 Testing/cmsis_build/test.Release+VHT-Corstone-300-NOMVE.cprj

diff --git a/Testing/cmsis_build/.gitignore b/Testing/cmsis_build/.gitignore
index 4d8025bad..8bc2f7a1c 100644
--- a/Testing/cmsis_build/.gitignore
+++ b/Testing/cmsis_build/.gitignore
@@ -3,4 +3,4 @@ results*.txt
 *.html
 *.cbuild.yml
 *.cbuild-idx.yml
-
+disasm.s
diff --git a/Testing/cmsis_build/boot.clayer.yml b/Testing/cmsis_build/boot.clayer.yml
index de314c5df..9cb76a0e2 100644
--- a/Testing/cmsis_build/boot.clayer.yml
+++ b/Testing/cmsis_build/boot.clayer.yml
@@ -11,6 +11,7 @@ layer:
     - component: Device:Startup&C Startup
       not-for-context: 
         - +VHT-Corstone-300 
+        - +VHT-Corstone-300-NOMVE
         - +VHT-Corstone-310
         - +FVP_A5Neon
         - +FVP_A7Neon
@@ -33,10 +34,12 @@ layer:
     - component: ARM::Device:Definition
       for-context: 
         - +VHT-Corstone-300 
+        - +VHT-Corstone-300-NOMVE
         - +VHT-Corstone-310
     - component: ARM::Device:Startup&Baremetal
       for-context: 
         - +VHT-Corstone-300 
+        - +VHT-Corstone-300-NOMVE
         - +VHT-Corstone-310
     - component: ARM::Native Driver:DMA350 Remap
       for-context: 
@@ -44,12 +47,15 @@ layer:
     - component: ARM::Native Driver:Timeout
       for-context: 
         - +VHT-Corstone-300 
+        - +VHT-Corstone-300-NOMVE
         - +VHT-Corstone-310
     - component: ARM::Native Driver:SysCounter
       for-context: 
         - +VHT-Corstone-300 
+        - +VHT-Corstone-300-NOMVE
         - +VHT-Corstone-310
     - component: ARM::Native Driver:SysTimer
       for-context: 
         - +VHT-Corstone-300 
+        - +VHT-Corstone-300-NOMVE
         - +VHT-Corstone-310
diff --git a/Testing/cmsis_build/runall.py b/Testing/cmsis_build/runall.py
index 1c4bd69db..5219af05a 100644
--- a/Testing/cmsis_build/runall.py
+++ b/Testing/cmsis_build/runall.py
@@ -195,6 +195,11 @@ def runAVH(build,core):
 
 #allSuites=[("StatsTestsQ7","../Output.pickle")]
 
+allSuites=[
+("ComplexTestsF16","../Output_f16.pickle"),
+#("FIRF16","../Output_f16.pickle")
+]
+
 # Solution and build file for all
 # the tests
 # It is a pair : csolution target type and AVH identification
@@ -228,7 +233,7 @@ def runAVH(build,core):
 # Override previous solutions for more restricted testing.
 solutions={
     'test_ac6.csolution.yml':[
-      ("VHT-Corstone-300","CS300"),
+      ("VHT-Corstone-300-NOMVE","CS300"),
     ]
 }
 
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300-NOMVE.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300-NOMVE.cprj
new file mode 100644
index 000000000..eec61c2d8
--- /dev/null
+++ b/Testing/cmsis_build/test.Release+VHT-Corstone-300-NOMVE.cprj
@@ -0,0 +1,206 @@
+<?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-20T14:20:58" tool="csolution 2.0.0"/>
+
+  <info isLayer="false">
+    <description>Automatically generated project</description>
+  </info>
+
+  <packages>
+    <package name="CMSIS" vendor="ARM" version="5.9.0:5.9.0"/>
+    <package name="V2M_MPS3_SSE_300_BSP" vendor="ARM" version="1.3.0:1.3.0"/>
+  </packages>
+
+  <compilers>
+    <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">
+    <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"/>
+    <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -mcpu=cortex-m55+nomve" compiler="AC6"/>
+    <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
+    <ldflags add="--entry=Reset_Handler --info=summarysizes --info=sizes --info=totals --info=unused --info=veneers" compiler="AC6" file="RTE/Device/SSE-300-MPS3/fvp_sse300_mps3_s.sct"/>
+    <defines>EMBEDDED;CORTEXM;SSE300MPS3;ARM_MATH_AUTOVECTORIZE</defines>
+    <includes>../../Include;../../PrivateInclude;../FrameworkInclude;../GeneratedInclude;../Include/Tests</includes>
+  </target>
+
+  <components>
+    <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0"/>
+    <component Cclass="Device" Cgroup="Definition" Cvendor="ARM" Cversion="1.2.0" rtedir="RTE">
+      <file attr="config" category="header" name="Board/Platform/platform_base_address.h" version="1.1.2"/>
+    </component>
+    <component Cclass="Device" Cgroup="Startup" Cvariant="Baremetal" Cvendor="ARM" Cversion="1.2.0" rtedir="RTE">
+      <file attr="config" category="header" name="CMSIS_Driver/Config/Baremetal/cmsis_driver_config.h" version="1.1.1"/>
+      <file attr="config" category="header" name="CMSIS_Driver/Config/RTE_Device.h" version="1.1.0"/>
+      <file attr="config" category="header" name="Device/Config/Baremetal/device_cfg.h" version="1.1.3"/>
+      <file attr="config" category="header" name="Device/Include/region_defs.h" version="1.0.0"/>
+      <file attr="config" category="header" name="Device/Include/region_limits.h" version="1.0.0"/>
+      <file attr="config" category="header" name="Device/Include/system_SSE300MPS3.h" version="1.1.1"/>
+      <file attr="config" category="linkerScript" name="Device/Source/armclang/fvp_sse300_mps3_s.sct" version="1.1.0"/>
+      <file attr="config" category="source" name="Device/Source/startup_fvp_sse300_mps3.c" version="1.1.1"/>
+      <file attr="config" category="source" name="Device/Source/system_SSE300MPS3.c" version="1.1.1"/>
+    </component>
+    <component Cclass="Native Driver" Cgroup="SysCounter" Cvendor="ARM" Cversion="1.1.0"/>
+    <component Cclass="Native Driver" Cgroup="SysTimer" Cvendor="ARM" Cversion="1.1.0"/>
+    <component Cclass="Native Driver" Cgroup="Timeout" Cvendor="ARM" Cversion="1.0.0"/>
+  </components>
+
+  <files>
+    <group name="App">
+      <file category="sourceCpp" name="../main.cpp"/>
+      <file category="sourceC" name="../patterndata.c"/>
+      <file category="sourceCpp" name="../testmain.cpp"/>
+    </group>
+    <group name="TestFramework">
+      <file category="sourceCpp" name="../FrameworkSource/ArrayMemory.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Calibrate.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Error.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/FPGA.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Generators.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/IORunner.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Pattern.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/PatternMgr.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Test.cpp"/>
+      <file category="sourceCpp" name="../FrameworkSource/Timing.cpp"/>
+    </group>
+    <group name="GeneratedConfig">
+      <file category="sourceCpp" name="../GeneratedSource/TestDesc.cpp"/>
+    </group>
+    <group name="Tests">
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BasicTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BayesF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BayesF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BinaryTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/BIQUADQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ComplexTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DECIMF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DECIMQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DECIMQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DistanceTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DistanceTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DistanceTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/DistanceTestsU32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ExampleCategoryF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ExampleCategoryQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ExampleCategoryQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/ExampleCategoryQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FastMathQ63.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/FIRQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/InterpolationTestsQ31.cpp"/>
+      <file category="sourceC" name="../Source/Tests/mfccdata.c"/>
+      <file category="sourceC" name="../Source/Tests/mfccdata_f16.c"/>
+      <file category="sourceCpp" name="../Source/Tests/MFCCF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MFCCF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MFCCQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MFCCQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/MISCQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/QuaternionTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/StatsTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportBarTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportBarTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SupportTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SVMF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/SVMF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformCQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/TransformRQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsF16.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsF64.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ7.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ15.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/UnaryTestsQ31.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/WindowTestsF32.cpp"/>
+      <file category="sourceCpp" name="../Source/Tests/WindowTestsF64.cpp"/>
+    </group>
+    <group name="CMSIS-DSP">
+      <defines>ARM_MATH_ROUNDING</defines>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/BasicMathFunctions/BasicMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctions.c"/>
+      <file category="sourceC" name="../../Source/DistanceFunctions/DistanceFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctions.c"/>
+      <file category="sourceC" name="../../Source/MatrixFunctions/MatrixFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctions.c"/>
+      <file category="sourceC" name="../../Source/BayesFunctions/BayesFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/FastMathFunctions/FastMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/QuaternionMathFunctions/QuaternionMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctions.c"/>
+      <file category="sourceC" name="../../Source/StatisticsFunctions/StatisticsFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTables.c"/>
+      <file category="sourceC" name="../../Source/CommonTables/CommonTablesF16.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctions.c"/>
+      <file category="sourceC" name="../../Source/FilteringFunctions/FilteringFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctions.c"/>
+      <file category="sourceC" name="../../Source/SupportFunctions/SupportFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+      <file category="sourceC" name="../../Source/ComplexMathFunctions/ComplexMathFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctions.c"/>
+      <file category="sourceC" name="../../Source/SVMFunctions/SVMFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctions.c"/>
+      <file category="sourceC" name="../../Source/InterpolationFunctions/InterpolationFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctions.c"/>
+      <file category="sourceC" name="../../Source/TransformFunctions/TransformFunctionsF16.c"/>
+      <file category="sourceC" name="../../Source/ControllerFunctions/ControllerFunctions.c"/>
+      <file category="sourceC" name="../../Source/WindowFunctions/WindowFunctions.c"/>
+    </group>
+  </files>
+</cprj>
+
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj
index 3730032d6..713ef0868 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 @@
 <?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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -12,12 +12,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <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">
     <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="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj
index d7f1c88c9..dcc63502d 100644
--- a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj
+++ b/Testing/cmsis_build/test.Release+VHT-Corstone-310.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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -13,12 +13,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
   <target Ddsp="DSP" Dfpu="DP_FPU" Dmve="FP_MVE" Dname="SSE-310-MPS3" Dtz="TZ" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT-Corstone-310/Release" name="test" outdir="out/test/VHT-Corstone-310/Release" rtedir="RTE" type="exe"/>
-    <options debug="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M0P.cprj b/Testing/cmsis_build/test.Release+VHT_M0P.cprj
index 565e270d8..40755689a 100644
--- 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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -11,12 +11,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="ARMCM0P" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT_M0P/Release" name="test" outdir="out/test/VHT_M0P/Release" rtedir="RTE" type="exe"/>
-    <options debug="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M23.cprj b/Testing/cmsis_build/test.Release+VHT_M23.cprj
index 1dbf7ff76..49ba7acc5 100644
--- 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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -11,12 +11,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="ARMCM23" Dtz="NO_TZ" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT_M23/Release" name="test" outdir="out/test/VHT_M23/Release" rtedir="RTE" type="exe"/>
-    <options debug="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M3.cprj b/Testing/cmsis_build/test.Release+VHT_M3.cprj
index f27d738d0..c565fd178 100644
--- 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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -11,12 +11,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="ARMCM3" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT_M3/Release" name="test" outdir="out/test/VHT_M3/Release" rtedir="RTE" type="exe"/>
-    <options debug="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M33.cprj b/Testing/cmsis_build/test.Release+VHT_M33.cprj
index 327171086..3f1703bc6 100644
--- 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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -11,12 +11,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
   <target Ddsp="DSP" Dfpu="SP_FPU" Dname="ARMCM33_DSP_FP" Dtz="NO_TZ" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT_M33/Release" name="test" outdir="out/test/VHT_M33/Release" rtedir="RTE" type="exe"/>
-    <options debug="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M4.cprj b/Testing/cmsis_build/test.Release+VHT_M4.cprj
index c44605c8a..48dc49f78 100644
--- 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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -11,12 +11,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
   <target Dfpu="SP_FPU" Dname="ARMCM4_FP" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT_M4/Release" name="test" outdir="out/test/VHT_M4/Release" rtedir="RTE" type="exe"/>
-    <options debug="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M7.cprj b/Testing/cmsis_build/test.Release+VHT_M7.cprj
index e1d9593cd..fc13298b1 100644
--- 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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -11,12 +11,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
   <target Dfpu="DP_FPU" Dname="ARMCM7_DP" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT_M7/Release" name="test" outdir="out/test/VHT_M7/Release" rtedir="RTE" type="exe"/>
-    <options debug="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj b/Testing/cmsis_build/test.Release+VHT_M7_UNROLLED.cprj
index f65a85a28..d2ad2ccc0 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 @@
 <?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-10-25T07:44:53" tool="csolution 2.0.0"/>
+  <created timestamp="2023-11-20T14:20:58" tool="csolution 2.0.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
@@ -11,12 +11,12 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.100:6.20.100"/>
+    <compiler name="AC6" version="6.22.0:6.22.0"/>
   </compilers>
 
   <target Dfpu="DP_FPU" Dname="ARMCM7_DP" Dvendor="ARM:82">
     <output elf="test.axf" intdir="tmp/test/VHT_M7_UNROLLED/Release" name="test" outdir="out/test/VHT_M7_UNROLLED/Release" rtedir="RTE" type="exe"/>
-    <options debug="off"/>
+    <options debug="on"/>
     <asflags add="-masm=auto" compiler="AC6"/>
     <cflags add="-Wsign-compare -Wdouble-promotion -DNDEBUG -Wall -Wextra -Werror -std=c11 -Ofast -ffast-math -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier" compiler="AC6"/>
     <cxxflags add="-fno-rtti -DNDEBUG -Wall -Wextra -std=c++11 -Ofast -ffast-math" compiler="AC6"/>
diff --git a/Testing/cmsis_build/test_ac6.csolution.yml b/Testing/cmsis_build/test_ac6.csolution.yml
index 875349eb8..d4ed7af02 100644
--- a/Testing/cmsis_build/test_ac6.csolution.yml
+++ b/Testing/cmsis_build/test_ac6.csolution.yml
@@ -1,5 +1,5 @@
 solution:
-  compiler: AC6@6.20.100
+  compiler: AC6@6.22.0
   misc:
     - C:
       - -Wsign-compare 
@@ -68,6 +68,16 @@ solution:
         - CORTEXM
         - SSE300MPS3
 
+    - type: VHT-Corstone-300-NOMVE
+      device: ARM::SSE-300-MPS3
+      misc:
+        - C: 
+          - -mcpu=cortex-m55+nomve
+      define:
+        - CORTEXM
+        - SSE300MPS3
+        - ARM_MATH_AUTOVECTORIZE
+
     - type: VHT_M33
       device: ARMCM33_DSP_FP
       define:
@@ -112,7 +122,7 @@ solution:
 
   build-types:
     - type: Release
-      debug: off
+      debug: on
 
   projects:
     - project: ./test.cproject.yml
\ No newline at end of file