From 1382df9645a4894367ff483855b7da1361a6d7b2 Mon Sep 17 00:00:00 2001
From: Gabriel Wang <gabriel.wang@arm.com>
Date: Tue, 23 May 2023 09:08:03 +0100
Subject: [PATCH] update __cpu_time__ to support RTOS

---
 example/example.uvoptx    |   4 ++--
 example/main.c            |   4 ++--
 lib/libperf_counter_gcc.a | Bin 7368 -> 7368 bytes
 lib/perf_counter.h        |   8 ++++----
 lib/perf_counter.lib      | Bin 19510 -> 19510 bytes
 perf_counter.h            |   8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/example/example.uvoptx b/example/example.uvoptx
index 75e7724..310ac4b 100644
--- a/example/example.uvoptx
+++ b/example/example.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>7</CpuCode>
       <DebugOpt>
@@ -297,7 +297,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>7</CpuCode>
       <DebugOpt>
diff --git a/example/main.c b/example/main.c
index 796f32c..11a7cd9 100644
--- a/example/main.c
+++ b/example/main.c
@@ -195,9 +195,9 @@ int main (void)
         }
 
         __cpu_time__(10) {
-            delay_us(3000);
+            delay_us(30000);
         }
-        delay_us(7000);
+        delay_us(70000);
 
     }
 }
diff --git a/lib/libperf_counter_gcc.a b/lib/libperf_counter_gcc.a
index b34c187a98893d929895115a8c5a8563771578f1..ad82e39293939cd95add33902745e4f678d2350d 100644
GIT binary patch
delta 45
scmX?MdBSpn44Z|KrJ=d;MkPKLFw@L(vLA=oW*?S6%uuP#ejHUI03cBd{Qv*}

delta 45
rcmX?MdBSpn44bK?rG<sXMkPKL2-9S;ABWgxAC^DNP^ry+991F!Bkc?)

diff --git a/lib/perf_counter.h b/lib/perf_counter.h
index e91c8d1..f1a527f 100644
--- a/lib/perf_counter.h
+++ b/lib/perf_counter.h
@@ -357,9 +357,9 @@ __asm(".global __ensure_systick_wrapper\n\t");
 #define __cpu_time__(__CNT, ...)                                                \
     static int64_t SAFE_NAME(s_lTimestamp) = 0, SAFE_NAME(s_lTotal) = 0;        \
     static uint32_t s_wLoopCounter = (__CNT);                                   \
-    using(int64_t lStart = 0, ({                                                \
+    using(float __usage__ = 0, ({                                               \
     if (0 == s_wLoopCounter) {                                                  \
-        float __usage__ = (float)((double)SAFE_NAME(s_lTotal)                   \
+        __usage__ = (float)((double)SAFE_NAME(s_lTotal)                         \
                         / (double)(     get_system_ticks()                      \
                                   -     SAFE_NAME(s_lTimestamp)));              \
         __usage__ *= 100.0f;                                                    \
@@ -375,8 +375,8 @@ __asm(".global __ensure_systick_wrapper\n\t");
         SAFE_NAME(s_lTimestamp) = get_system_ticks();                           \
         s_wLoopCounter = (__CNT);                                               \
     }                                                                           \
-    lStart = get_system_ticks();}),                                             \
-    ({SAFE_NAME(s_lTotal) += get_system_ticks() - lStart;                       \
+    start_task_cycle_counter();}),                                              \
+    ({SAFE_NAME(s_lTotal) += stop_task_cycle_counter();                         \
     s_wLoopCounter--;}))
 
 /*!
diff --git a/lib/perf_counter.lib b/lib/perf_counter.lib
index 38ca63affa7b324626e077646571c1d75b4f5939..5f2ca4df898eacfcb3f745da39651ebb5163b430 100644
GIT binary patch
delta 33
icmdlsgK^so#tnKbY!*hAhGwRlO<3+Z!q^gSa%=#x#|cUR

delta 33
icmdlsgK^so#tnKbY-R=qhQ=nFO<3+Z!q^gSa%=#v&j~01

diff --git a/perf_counter.h b/perf_counter.h
index e91c8d1..f1a527f 100644
--- a/perf_counter.h
+++ b/perf_counter.h
@@ -357,9 +357,9 @@ __asm(".global __ensure_systick_wrapper\n\t");
 #define __cpu_time__(__CNT, ...)                                                \
     static int64_t SAFE_NAME(s_lTimestamp) = 0, SAFE_NAME(s_lTotal) = 0;        \
     static uint32_t s_wLoopCounter = (__CNT);                                   \
-    using(int64_t lStart = 0, ({                                                \
+    using(float __usage__ = 0, ({                                               \
     if (0 == s_wLoopCounter) {                                                  \
-        float __usage__ = (float)((double)SAFE_NAME(s_lTotal)                   \
+        __usage__ = (float)((double)SAFE_NAME(s_lTotal)                         \
                         / (double)(     get_system_ticks()                      \
                                   -     SAFE_NAME(s_lTimestamp)));              \
         __usage__ *= 100.0f;                                                    \
@@ -375,8 +375,8 @@ __asm(".global __ensure_systick_wrapper\n\t");
         SAFE_NAME(s_lTimestamp) = get_system_ticks();                           \
         s_wLoopCounter = (__CNT);                                               \
     }                                                                           \
-    lStart = get_system_ticks();}),                                             \
-    ({SAFE_NAME(s_lTotal) += get_system_ticks() - lStart;                       \
+    start_task_cycle_counter();}),                                              \
+    ({SAFE_NAME(s_lTotal) += stop_task_cycle_counter();                         \
     s_wLoopCounter--;}))
 
 /*!