From 5f377693fcf6b826f965058b1c7c05896d37c5b6 Mon Sep 17 00:00:00 2001
From: Advait Jain <advaitjain@google.com>
Date: Thu, 27 May 2021 22:03:35 -0700
Subject: [PATCH] Move timer intialization to the init function.

---
 .../cortex_m_corstone_300/system_setup.cc     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/tensorflow/lite/micro/cortex_m_corstone_300/system_setup.cc b/tensorflow/lite/micro/cortex_m_corstone_300/system_setup.cc
index ab4b2ef02a6048..652981a78b60b7 100644
--- a/tensorflow/lite/micro/cortex_m_corstone_300/system_setup.cc
+++ b/tensorflow/lite/micro/cortex_m_corstone_300/system_setup.cc
@@ -63,17 +63,7 @@ constexpr int kClocksPerSecond = 25e6;
 
 int32_t ticks_per_second() { return kClocksPerSecond; }
 
-int32_t GetCurrentTimeTicks() {
-  static bool is_initialized = false;
-  if (!is_initialized) {
-    KIN1_UnlockAccessToDWT();
-    KIN1_InitCycleCounter();
-    KIN1_ResetCycleCounter();
-    KIN1_EnableCycleCounter();
-    is_initialized = true;
-  }
-  return KIN1_GetCycleCounter();
-}
+int32_t GetCurrentTimeTicks() { return KIN1_GetCycleCounter(); }
 
 #ifdef ETHOS_U
 void ethosuIrqHandler0() { ethosu_irq_handler(); }
@@ -86,6 +76,11 @@ void uart_init(void);
 void InitializeTarget() {
   uart_init();
 
+  KIN1_UnlockAccessToDWT();
+  KIN1_InitCycleCounter();
+  KIN1_ResetCycleCounter();
+  KIN1_EnableCycleCounter();
+
 #ifdef ETHOS_U
   constexpr int ethosu_base_address = 0x48102000;
   constexpr int ethosu_irq = 56;
@@ -95,7 +90,7 @@ void InitializeTarget() {
     MicroPrintf("Failed to initialize Ethos-U driver");
   }
   NVIC_SetVector(static_cast<IRQn_Type>(ethosu_irq),
-                 (uint32_t)&ethosuIrqHandler0);
+      (uint32_t)&ethosuIrqHandler0);
   NVIC_EnableIRQ(static_cast<IRQn_Type>(ethosu_irq));
 #endif
 }