From 44d6e22f953839a9e294a36d975289eac8615cf2 Mon Sep 17 00:00:00 2001
From: Kristofer Jonsson <kristofer.jonsson@arm.com>
Date: Fri, 21 May 2021 18:59:18 +0200
Subject: Fixing compilation warnings

Change-Id: I3a1a361e6e8d40d2ac505b3c8d065c00224f1c2f
---
 lib/arm_profiler/include/arm_profiler.hpp       | 2 +-
 lib/arm_profiler/src/arm_profiler.cpp           | 8 ++++++--
 lib/ethosu_profiler/include/ethosu_profiler.hpp | 3 +--
 lib/ethosu_profiler/src/ethosu_profiler.cpp     | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/arm_profiler/include/arm_profiler.hpp b/lib/arm_profiler/include/arm_profiler.hpp
index f5206fe..36adb8d 100644
--- a/lib/arm_profiler/include/arm_profiler.hpp
+++ b/lib/arm_profiler/include/arm_profiler.hpp
@@ -38,7 +38,7 @@ private:
     std::unique_ptr<int32_t[]> start_ticks_;
     std::unique_ptr<int32_t[]> end_ticks_;
 
-    int num_events_ = 0;
+    size_t num_events_;
 
     TF_LITE_REMOVE_VIRTUAL_DELETE;
 };
diff --git a/lib/arm_profiler/src/arm_profiler.cpp b/lib/arm_profiler/src/arm_profiler.cpp
index c58037f..95bc3e4 100644
--- a/lib/arm_profiler/src/arm_profiler.cpp
+++ b/lib/arm_profiler/src/arm_profiler.cpp
@@ -28,7 +28,7 @@
 
 namespace tflite {
 
-ArmProfiler::ArmProfiler(size_t max_events) : max_events_(max_events) {
+ArmProfiler::ArmProfiler(size_t max_events) : max_events_(max_events), num_events_(0) {
     tags_        = std::make_unique<const char *[]>(max_events_);
     start_ticks_ = std::make_unique<int32_t[]>(max_events_);
     end_ticks_   = std::make_unique<int32_t[]>(max_events_);
@@ -39,9 +39,11 @@ uint32_t ArmProfiler::BeginEvent(const char *tag) {
         tflite::GetMicroErrorReporter()->Report("Profiling event overflow, max: %u events", max_events_);
         num_events_ = 0;
     }
+
     tags_[num_events_]        = tag;
     start_ticks_[num_events_] = GetCurrentTimeTicks();
     end_ticks_[num_events_]   = start_ticks_[num_events_] - 1;
+
     return num_events_++;
 }
 
@@ -54,9 +56,11 @@ void ArmProfiler::EndEvent(uint32_t event_handle) {
 
 int32_t ArmProfiler::GetTotalTicks() const {
     int32_t ticks = 0;
-    for (int i = 0; i < num_events_; ++i) {
+
+    for (size_t i = 0; i < num_events_; ++i) {
         ticks += end_ticks_[i] - start_ticks_[i];
     }
+
     return ticks;
 }
 
diff --git a/lib/ethosu_profiler/include/ethosu_profiler.hpp b/lib/ethosu_profiler/include/ethosu_profiler.hpp
index 503ebba..12c337c 100644
--- a/lib/ethosu_profiler/include/ethosu_profiler.hpp
+++ b/lib/ethosu_profiler/include/ethosu_profiler.hpp
@@ -39,8 +39,7 @@ private:
     std::unique_ptr<const char *[]> tags_;
     std::unique_ptr<uint64_t[]> start_ticks_;
     std::unique_ptr<uint64_t[]> end_ticks_;
-
-    int num_events_ = 0;
+    size_t num_events_;
 
     TF_LITE_REMOVE_VIRTUAL_DELETE;
 };
diff --git a/lib/ethosu_profiler/src/ethosu_profiler.cpp b/lib/ethosu_profiler/src/ethosu_profiler.cpp
index bf4aae7..50b65f0 100644
--- a/lib/ethosu_profiler/src/ethosu_profiler.cpp
+++ b/lib/ethosu_profiler/src/ethosu_profiler.cpp
@@ -38,7 +38,7 @@ uint64_t GetCurrentEthosuTicks(struct ethosu_driver *drv) {
 
 namespace tflite {
 
-EthosUProfiler::EthosUProfiler(size_t max_events) : max_events_(max_events) {
+EthosUProfiler::EthosUProfiler(size_t max_events) : max_events_(max_events), num_events_(0) {
     tags_        = std::make_unique<const char *[]>(max_events_);
     start_ticks_ = std::make_unique<uint64_t[]>(max_events_);
     end_ticks_   = std::make_unique<uint64_t[]>(max_events_);
@@ -92,7 +92,8 @@ void EthosUProfiler::EndEvent(uint32_t event_handle) {
 
 uint64_t EthosUProfiler::GetTotalTicks() const {
     uint64_t ticks = 0;
-    for (int i = 0; i < num_events_; ++i) {
+
+    for (size_t i = 0; i < num_events_; ++i) {
         ticks += end_ticks_[i] - start_ticks_[i];
     }
 
-- 
cgit v1.2.1