From fae513c5585b9ba09c3aa8bfd4f7119208b7b5f9 Mon Sep 17 00:00:00 2001
From: Michalis Spyrou <michalis.spyrou@arm.com>
Date: Wed, 16 Oct 2019 17:41:33 +0100
Subject: COMPMID-2486: Remove/add disabled compiler warnings

Removed the following flags:
-Wno-vla
-Wno-strict-overflow

Added:
-Wformat-security

Change-Id: I49eb3d724e14db796e543164295674617c37cb65
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2109
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
---
 tests/validation/Validation.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'tests/validation/Validation.h')

diff --git a/tests/validation/Validation.h b/tests/validation/Validation.h
index 1c4b2d4d11..6ef1a466e7 100644
--- a/tests/validation/Validation.h
+++ b/tests/validation/Validation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -380,8 +380,8 @@ void validate_wrap(const IAccessor &tensor, const SimpleTensor<T> &reference, U
 template <typename T, typename U>
 void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, const ValidRegion &valid_region, U tolerance_value, float tolerance_number, float absolute_tolerance_value)
 {
-    int64_t num_mismatches = 0;
-    int64_t num_elements   = 0;
+    uint64_t num_mismatches = 0;
+    uint64_t num_elements   = 0;
 
     ARM_COMPUTE_EXPECT_EQUAL(tensor.element_size(), reference.element_size(), framework::LogLevel::ERRORS);
     ARM_COMPUTE_EXPECT_EQUAL(tensor.data_type(), reference.data_type(), framework::LogLevel::ERRORS);
@@ -441,10 +441,10 @@ void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, const V
         }
     }
 
-    if(num_elements > 0)
+    if(num_elements != 0)
     {
-        const int64_t absolute_tolerance_number = tolerance_number * num_elements;
-        const float   percent_mismatches        = static_cast<float>(num_mismatches) / num_elements * 100.f;
+        const uint64_t absolute_tolerance_number = tolerance_number * num_elements;
+        const float    percent_mismatches        = static_cast<float>(num_mismatches) / num_elements * 100.f;
 
         ARM_COMPUTE_TEST_INFO(num_mismatches << " values (" << std::fixed << std::setprecision(2) << percent_mismatches
                               << "%) mismatched (maximum tolerated " << std::setprecision(2) << tolerance_number * 100 << "%)");
@@ -455,8 +455,8 @@ void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, const V
 template <typename T, typename U, typename = typename std::enable_if<std::is_integral<T>::value>::type>
 void validate_wrap(const IAccessor &tensor, const SimpleTensor<T> &reference, const ValidRegion &valid_region, U tolerance_value, float tolerance_number)
 {
-    int64_t num_mismatches = 0;
-    int64_t num_elements   = 0;
+    uint64_t num_mismatches = 0;
+    uint64_t num_elements   = 0;
 
     ARM_COMPUTE_EXPECT_EQUAL(tensor.element_size(), reference.element_size(), framework::LogLevel::ERRORS);
     ARM_COMPUTE_EXPECT_EQUAL(tensor.data_type(), reference.data_type(), framework::LogLevel::ERRORS);
@@ -529,10 +529,10 @@ void validate_wrap(const IAccessor &tensor, const SimpleTensor<T> &reference, co
         }
     }
 
-    if(num_elements > 0)
+    if(num_elements != 0)
     {
-        const int64_t absolute_tolerance_number = tolerance_number * num_elements;
-        const float   percent_mismatches        = static_cast<float>(num_mismatches) / num_elements * 100.f;
+        const uint64_t absolute_tolerance_number = tolerance_number * num_elements;
+        const float    percent_mismatches        = static_cast<float>(num_mismatches) / num_elements * 100.f;
 
         ARM_COMPUTE_TEST_INFO(num_mismatches << " values (" << std::fixed << std::setprecision(2) << percent_mismatches
                               << "%) mismatched (maximum tolerated " << std::setprecision(2) << tolerance_number * 100 << "%)");
@@ -543,8 +543,8 @@ void validate_wrap(const IAccessor &tensor, const SimpleTensor<T> &reference, co
 template <typename T, typename U>
 void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, const SimpleTensor<T> &valid_mask, U tolerance_value, float tolerance_number, float absolute_tolerance_value)
 {
-    int64_t num_mismatches = 0;
-    int64_t num_elements   = 0;
+    uint64_t num_mismatches = 0;
+    uint64_t num_elements   = 0;
 
     ARM_COMPUTE_EXPECT_EQUAL(tensor.element_size(), reference.element_size(), framework::LogLevel::ERRORS);
     ARM_COMPUTE_EXPECT_EQUAL(tensor.data_type(), reference.data_type(), framework::LogLevel::ERRORS);
@@ -608,10 +608,10 @@ void validate(const IAccessor &tensor, const SimpleTensor<T> &reference, const S
         }
     }
 
-    if(num_elements > 0)
+    if(num_elements != 0)
     {
-        const int64_t absolute_tolerance_number = tolerance_number * num_elements;
-        const float   percent_mismatches        = static_cast<float>(num_mismatches) / num_elements * 100.f;
+        const uint64_t absolute_tolerance_number = tolerance_number * num_elements;
+        const float    percent_mismatches        = static_cast<float>(num_mismatches) / num_elements * 100.f;
 
         ARM_COMPUTE_TEST_INFO(num_mismatches << " values (" << std::fixed << std::setprecision(2) << percent_mismatches
                               << "%) mismatched (maximum tolerated " << std::setprecision(2) << tolerance_number * 100 << "%)");
-- 
cgit v1.2.1