From e4f09e559c15439f65f876e0d08c0730ecb0e840 Mon Sep 17 00:00:00 2001
From: Kristofer Jonsson <kristofer.jonsson@arm.com>
Date: Fri, 26 Nov 2021 16:13:58 +0100
Subject: Fixing compiler warnings

Updating compiler warnings enabled for TFLu.

Fixing compiler warnings reported by Arm Clang and Arm GCC.

Change-Id: Iea959a59ea5416326a3014654389af82903c94a3
---
 drivers/mhu_v2/src/mhu_v2.cpp             |  4 ++--
 lib/ethosu_monitor/src/ethosu_monitor.cpp |  3 ++-
 tflite_micro.cmake                        | 36 ++++++++++++++++++++++++-------
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/drivers/mhu_v2/src/mhu_v2.cpp b/drivers/mhu_v2/src/mhu_v2.cpp
index 1144a0f..cdeb90b 100644
--- a/drivers/mhu_v2/src/mhu_v2.cpp
+++ b/drivers/mhu_v2/src/mhu_v2.cpp
@@ -197,12 +197,12 @@ void MHUv2::printAIDR(bool tx, bool rx) {
     if (tx) {
         aidr = getTxAIDR();
         a    = reinterpret_cast<struct aidr_t *>(&aidr);
-        LOG_INFO("TX MHUv2 reports: Major rev: %d, Minor rev: %d", a->ARCH_MAJOR_REV, a->ARCH_MINOR_REV);
+        LOG("TX MHUv2 reports: Major rev: %d, Minor rev: %d", a->ARCH_MAJOR_REV, a->ARCH_MINOR_REV);
     }
     if (rx) {
         aidr = getRxAIDR();
         a    = reinterpret_cast<struct aidr_t *>(&aidr);
-        LOG_INFO("RX MHUv2 reports: Major rev: %d, Minor rev: %d", a->ARCH_MAJOR_REV, a->ARCH_MINOR_REV);
+        LOG("RX MHUv2 reports: Major rev: %d, Minor rev: %d", a->ARCH_MAJOR_REV, a->ARCH_MINOR_REV);
     }
 }
 
diff --git a/lib/ethosu_monitor/src/ethosu_monitor.cpp b/lib/ethosu_monitor/src/ethosu_monitor.cpp
index 651fc28..0fe4b44 100644
--- a/lib/ethosu_monitor/src/ethosu_monitor.cpp
+++ b/lib/ethosu_monitor/src/ethosu_monitor.cpp
@@ -18,6 +18,7 @@
 
 #include "ethosu_monitor.hpp"
 #include "ethosu_log.h"
+#include <inttypes.h>
 #include <stdio.h>
 
 EthosUMonitor::EthosUMonitor(std::vector<int32_t> __eventRecordIds, Backend __backend) :
@@ -34,7 +35,7 @@ void EthosUMonitor::monitorSample(ethosu_driver *drv) {
             break;
         case PRINTF:
         default:
-            LOG("ethosu_pmu_cntr%d : %u\n", i, eventCount[i]);
+            LOG("ethosu_pmu_cntr%zd : %" PRIu32 "\n", i, eventCount[i]);
         }
     }
 }
diff --git a/tflite_micro.cmake b/tflite_micro.cmake
index e01a423..3d02524 100644
--- a/tflite_micro.cmake
+++ b/tflite_micro.cmake
@@ -184,14 +184,34 @@ target_compile_definitions(tflu PUBLIC
     $<$<STREQUAL:${TFLU_BUILD_TYPE},"release">:"NDEBUG;TF_LITE_STRIP_ERROR_STRINGS">
     $<$<STREQUAL:${TFLU_BUILD_TYPE},"release_with_logs">:"NDEBUG">)
 
-target_compile_options(tflu PRIVATE
-    ${TFLU_OPTIMIZATION_LEVEL}
-    -fno-unwind-tables
-    -ffunction-sections
-    -fdata-sections
-    -fmessage-length=0
-    -funsigned-char
-    "$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti;-fno-exceptions;-fno-threadsafe-statics>")
+target_compile_options(tflu
+    PRIVATE
+        ${TFLU_OPTIMIZATION_LEVEL}
+        -fno-unwind-tables
+        -ffunction-sections
+        -fdata-sections
+        -fmessage-length=0
+        -funsigned-char
+        "$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti;-fno-exceptions;-fno-threadsafe-statics>"
+
+        -Wall
+        -Wextra
+
+        -Wdouble-promotion
+        -Wmissing-field-initializers
+        -Wshadow
+        -Wstrict-aliasing
+        -Wswitch
+        -Wunused-variable
+        -Wunused-function
+        -Wvla
+
+    PUBLIC
+        -Wno-cast-align
+        -Wno-null-dereference
+        -Wno-unused-parameter
+        -Wno-switch-default
+)
 
 # Install libraries and header files
 install(TARGETS tflu DESTINATION "lib")
-- 
cgit v1.2.1