From 62425781d0243911c8970e656b715a4c623fa0c7 Mon Sep 17 00:00:00 2001
From: Christophe Favergeon <Christophe.Favergeon@arm.com>
Date: Wed, 14 Apr 2021 09:30:11 +0200
Subject: [PATCH] CMSIS-DSP: Improvement to AC6+FVP support in test framework.

---
 Platforms/NORMALFVP/ARMv81MML/LinkScripts/AC6/lnk.sct | 2 +-
 Platforms/NORMALFVP/ARMv81MML/README.md               | 5 +++++
 Testing/CMakeLists.txt                                | 2 ++
 Testing/FrameworkSource/Timing.cpp                    | 8 ++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100755 Platforms/NORMALFVP/ARMv81MML/README.md

diff --git a/Platforms/NORMALFVP/ARMv81MML/LinkScripts/AC6/lnk.sct b/Platforms/NORMALFVP/ARMv81MML/LinkScripts/AC6/lnk.sct
index d85f4c66..2841cc86 100755
--- a/Platforms/NORMALFVP/ARMv81MML/LinkScripts/AC6/lnk.sct
+++ b/Platforms/NORMALFVP/ARMv81MML/LinkScripts/AC6/lnk.sct
@@ -7,7 +7,7 @@
 
 #include "mem_ARMv81MML.h"
 
-LOAD_REGION 0x0
+LOAD_REGION 0x10000000
 {
     CODE +0 0x100000
     {
diff --git a/Platforms/NORMALFVP/ARMv81MML/README.md b/Platforms/NORMALFVP/ARMv81MML/README.md
new file mode 100755
index 00000000..955126a8
--- /dev/null
+++ b/Platforms/NORMALFVP/ARMv81MML/README.md
@@ -0,0 +1,5 @@
+# README
+
+Options to use with the FVP
+
+-C cpu0.SECEXT=1 -C fvp_mps2.mps2_visualisation.disable-visualisation=1 -q -C cpu0.MVE=2 -C cpu0.semihosting-enable=1 -a cpu0=Testing 
\ No newline at end of file
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 6a8bc193..d56e5b0a 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -463,6 +463,8 @@ endif()
 target_sources(FrameworkLib PRIVATE ${FRAMEWORKSRC})
 target_sources(FrameworkLib PRIVATE ${FRAMEWORKMODESRC})
 
+target_compile_definitions(FrameworkLib PRIVATE ${PLATFORMOPT}) 
+
 if (DISABLEFLOAT16)
     target_compile_definitions(FrameworkLib PRIVATE DISABLEFLOAT16) 
 endif()
diff --git a/Testing/FrameworkSource/Timing.cpp b/Testing/FrameworkSource/Timing.cpp
index 13d4ab65..9750e3a8 100644
--- a/Testing/FrameworkSource/Timing.cpp
+++ b/Testing/FrameworkSource/Timing.cpp
@@ -162,7 +162,15 @@ Testing::cycles_t getCycles()
     {
       result = SYSTICK_INITIAL_VALUE - (v - startCycles);
     }
+    /* SysTick tested and tuned on IPSS.
+       On other FVP, the value is forced to 0
+       because measurement is wrong.
+    */
+    #if defined(NORMALFVP)
+    return(0);
+    #else
     return(result);
+    #endif
 #endif 
 
 #if defined(CORTEXA) || defined(CORTEXR)