diff --git a/Examples/cmsis_build/examples.csolution_ac6.yml b/Examples/cmsis_build/examples.csolution_ac6.yml index 42a3e2c2..57974681 100644 --- a/Examples/cmsis_build/examples.csolution_ac6.yml +++ b/Examples/cmsis_build/examples.csolution_ac6.yml @@ -21,7 +21,7 @@ solution: - --info=veneers packs: - - pack: ARM::CMSIS-DSP@1.10.1 + - pack: ARM::CMSIS-DSP@1.11.0 - pack: ARM::CMSIS@5.9.0 - pack: ARM::V2M_MPS3_SSE_300_BSP@1.3.0 - pack: ARM::V2M_MPS3_SSE_310_BSP@1.0.0 diff --git a/Examples/cmsis_build/vht.clayer.yml b/Examples/cmsis_build/vht.clayer.yml index ee510f8f..cb1debfd 100644 --- a/Examples/cmsis_build/vht.clayer.yml +++ b/Examples/cmsis_build/vht.clayer.yml @@ -4,7 +4,7 @@ layer: components: - component: ARM::CMSIS:CORE - - component: ARM::CMSIS:DSP&Source@1.10.1 + - component: ARM::CMSIS:DSP&Source@1.11.0 - component: Device:Startup&C Startup not-for-type: - +VHT-Corstone-300 diff --git a/Testing/README.md b/Testing/README.md index e4503532..ce5e4fd1 100644 --- a/Testing/README.md +++ b/Testing/README.md @@ -72,13 +72,13 @@ The `test_packlist.txt` is in the `Testing\cmsis_build` folder. For instance, to run the test on the virtual hardware for Corstone 300, if you have the Arm MDK installed on Windows : -`C:\Keil_v5\ARM\FVP\MPS2_Cortex-M\FVP_MPS2_Cortex-M55_MDK.exe ^ - -f configs/ARM_VHT_MPS2_M55_config.txt ^ - Objects\test.Release+FVP_M55.axf > results.txt` +`C:\Keil_v5\ARM\VHT\VHT_Corstone_SSE-300_Ethos-U55.exe -f configs\ARM_VHT_Corstone_300_config.txt Objects\test.Release+VHT-Corstone-300.axf > results.txt` **Parsing the results:** -`python processResult.py -f Output.pickle -e -r result.txt` +If you are still in the `cmsis_build` folder: + +`python ../processResult.py -f ../Output.pickle -e -r results.txt` ## REQUIREMENTS diff --git a/Testing/cmsis_build/buildsolution.sh b/Testing/cmsis_build/buildsolution.sh index cbe9e0e7..e8518ba6 100644 --- a/Testing/cmsis_build/buildsolution.sh +++ b/Testing/cmsis_build/buildsolution.sh @@ -1,3 +1,2 @@ csolution convert -s test.csolution_ac6.yml - -csolution convert -s test.csolution_gcc.yml \ No newline at end of file +csolution convert -s test.csolution_gcc.yml diff --git a/Testing/cmsis_build/test.Release+FVP_A5Neon.cprj b/Testing/cmsis_build/test.Release+FVP_A5Neon.cprj index f0a3514d..5b4531b6 100644 --- a/Testing/cmsis_build/test.Release+FVP_A5Neon.cprj +++ b/Testing/cmsis_build/test.Release+FVP_A5Neon.cprj @@ -1,33 +1,33 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXA ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + ARM_MATH_NEON;DISABLEFLOAT16 @@ -35,8 +35,8 @@ - - + + diff --git a/Testing/cmsis_build/test.Release+FVP_A7Neon.cprj b/Testing/cmsis_build/test.Release+FVP_A7Neon.cprj index fa3cd1e1..5fdfb82c 100644 --- a/Testing/cmsis_build/test.Release+FVP_A7Neon.cprj +++ b/Testing/cmsis_build/test.Release+FVP_A7Neon.cprj @@ -1,33 +1,33 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXA ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + ARM_MATH_NEON;DISABLEFLOAT16 @@ -35,8 +35,8 @@ - - + + diff --git a/Testing/cmsis_build/test.Release+FVP_A9Neon.cprj b/Testing/cmsis_build/test.Release+FVP_A9Neon.cprj index 8421a5bc..898dcb5b 100644 --- a/Testing/cmsis_build/test.Release+FVP_A9Neon.cprj +++ b/Testing/cmsis_build/test.Release+FVP_A9Neon.cprj @@ -1,33 +1,33 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXA ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + ARM_MATH_AUTOVECTORIZE;DISABLEFLOAT16 @@ -35,8 +35,8 @@ - - + + diff --git a/Testing/cmsis_build/test.Release+FVP_M55.cprj b/Testing/cmsis_build/test.Release+FVP_M55.cprj index 4f97ecdb..83eaf8ad 100644 --- a/Testing/cmsis_build/test.Release+FVP_M55.cprj +++ b/Testing/cmsis_build/test.Release+FVP_M55.cprj @@ -1,35 +1,35 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXM ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + - + diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj index bdb59c49..dff38564 100644 --- a/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj +++ b/Testing/cmsis_build/test.Release+VHT-Corstone-300.cprj @@ -1,13 +1,13 @@ - + Automatically generated project - + @@ -28,7 +28,7 @@ - + diff --git a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj index 177e38c0..1d4a66e8 100644 --- a/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj +++ b/Testing/cmsis_build/test.Release+VHT-Corstone-310.cprj @@ -1,13 +1,13 @@ - + Automatically generated project - + @@ -28,7 +28,7 @@ - + diff --git a/Testing/cmsis_build/test.Release+VHT_M0P.cprj b/Testing/cmsis_build/test.Release+VHT_M0P.cprj index 03ebd3cd..372feac0 100644 --- a/Testing/cmsis_build/test.Release+VHT_M0P.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M0P.cprj @@ -1,35 +1,35 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXM ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + - + diff --git a/Testing/cmsis_build/test.Release+VHT_M23.cprj b/Testing/cmsis_build/test.Release+VHT_M23.cprj index 8d6d22fe..4daa5f9a 100644 --- a/Testing/cmsis_build/test.Release+VHT_M23.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M23.cprj @@ -1,35 +1,35 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXM ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + - + diff --git a/Testing/cmsis_build/test.Release+VHT_M3.cprj b/Testing/cmsis_build/test.Release+VHT_M3.cprj index 7cb6fb50..2174e92e 100644 --- a/Testing/cmsis_build/test.Release+VHT_M3.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M3.cprj @@ -1,35 +1,35 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXM ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + - + diff --git a/Testing/cmsis_build/test.Release+VHT_M33.cprj b/Testing/cmsis_build/test.Release+VHT_M33.cprj index 76512cd3..5ab8b8c5 100644 --- a/Testing/cmsis_build/test.Release+VHT_M33.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M33.cprj @@ -1,35 +1,35 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXM ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + - + diff --git a/Testing/cmsis_build/test.Release+VHT_M4.cprj b/Testing/cmsis_build/test.Release+VHT_M4.cprj index 35771c13..0242c98e 100644 --- a/Testing/cmsis_build/test.Release+VHT_M4.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M4.cprj @@ -1,35 +1,35 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXM ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + - + diff --git a/Testing/cmsis_build/test.Release+VHT_M7.cprj b/Testing/cmsis_build/test.Release+VHT_M7.cprj index 5e310a5c..3a15ea06 100644 --- a/Testing/cmsis_build/test.Release+VHT_M7.cprj +++ b/Testing/cmsis_build/test.Release+VHT_M7.cprj @@ -1,35 +1,35 @@ - + Automatically generated project - - + + - + - - - - + + + + EMBEDDED;NORMALFVP;CORTEXM ../FrameworkInclude;../GeneratedInclude;../Include/Tests - + - + diff --git a/Testing/cmsis_build/test.cproject.yml b/Testing/cmsis_build/test.cproject.yml index ef220135..a79ffc83 100644 --- a/Testing/cmsis_build/test.cproject.yml +++ b/Testing/cmsis_build/test.cproject.yml @@ -122,14 +122,14 @@ project: components: - component: ARM::CMSIS:CORE - - component: ARM::CMSIS:DSP&Source@1.10.1 + - component: ARM::CMSIS:DSP&Source@1.11.0 not-for-type: - +FVP_A5Neon - +FVP_A7Neon - +FVP_A9Neon # CMSIS-DSP cannot be built with Neon intrinsics for A9 # because of lack of Fused MAC on A9 - - component: ARM::CMSIS:DSP&Source@1.10.1 + - component: ARM::CMSIS:DSP&Source@1.11.0 defines: - ARM_MATH_NEON - DISABLEFLOAT16 @@ -138,7 +138,7 @@ project: - +FVP_A7Neon # On A9, CMSIS-DSP is built with auto-vectorization # but no use of Neon intrinsics - - component: ARM::CMSIS:DSP&Source@1.10.1 + - component: ARM::CMSIS:DSP&Source@1.11.0 defines: - ARM_MATH_AUTOVECTORIZE - DISABLEFLOAT16