diff options
| author | Manuel Bottini <manuel.bottini@arm.com> | 2020-11-19 12:12:06 +0000 |
|---|---|---|
| committer | Pablo Marquez Tello <pablo.tello@arm.com> | 2020-11-23 18:45:46 +0000 |
| commit | c4ff82bdd2e75537d578457e1fdfa5485840e1e3 (patch) | |
| tree | 9b3f98789f0103587f991e0a1941761e4624d17e | |
| parent | f0d63a12285673507d43b23285f4c3fe3dd80e32 (diff) | |
| download | ComputeLibrary-c4ff82bdd2e75537d578457e1fdfa5485840e1e3.tar.gz | |
COMPMID-3987: Nightly failure - Android builds failing in dataset and validation
Removing warnings from vector library in GCC 7.1+
Removing warning in wanted switch cases fall throughs
GCAccessor moving constructor removed
Removing parentheses equality checks in stb_image
Small fixes in GEMM test suite
Change-Id: I8ba8e3fa20b45c32e5b6219473e0f33ab787ca30
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4483
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
(cherry picked from commit 827817e627acfdc50c3a8ed748932e5893cc8a18)
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4172
Tested-by: Georgios Pinitas <georgios.pinitas@arm.com>
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/indirect-interleaves/a32_interleave6_block1_fp32_fp32.hpp | 3 | ||||
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp | 3 | ||||
| -rw-r--r-- | tests/GLES_COMPUTE/GCAccessor.h | 6 | ||||
| -rw-r--r-- | tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp | 8 | ||||
| -rw-r--r-- | utils/Utils.cpp | 6 |
6 files changed, 21 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index 5dac494097..3b2be11766 100644 --- a/SConstruct +++ b/SConstruct @@ -314,6 +314,8 @@ elif env['os'] == 'bare_metal': env.Append(CXXFLAGS = ['-fPIC']) env.Append(CPPDEFINES = ['NO_MULTI_THREADING']) env.Append(CPPDEFINES = ['BARE_METAL']) +if env['os'] == 'linux' and env['arch'] == 'armv7a': + env.Append(CXXFLAGS = [ '-Wno-psabi' ]) if env['opencl']: if env['os'] in ['bare_metal'] or env['standalone']: diff --git a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/a32_interleave6_block1_fp32_fp32.hpp b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/a32_interleave6_block1_fp32_fp32.hpp index 807511f0d2..074299997d 100644 --- a/src/core/NEON/kernels/arm_gemm/indirect-interleaves/a32_interleave6_block1_fp32_fp32.hpp +++ b/src/core/NEON/kernels/arm_gemm/indirect-interleaves/a32_interleave6_block1_fp32_fp32.hpp @@ -22,6 +22,9 @@ * SOFTWARE. */ #pragma once +#if (defined(__GNUC__) && (__GNUC__ >= 7)) +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#endif #ifdef __arm__ diff --git a/src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp b/src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp index bea455ca67..8fdd2c920d 100644 --- a/src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp +++ b/src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp @@ -22,6 +22,9 @@ * SOFTWARE. */ #pragma once +#if (defined(__GNUC__) && (__GNUC__ >= 7)) +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#endif #ifdef __arm__ diff --git a/tests/GLES_COMPUTE/GCAccessor.h b/tests/GLES_COMPUTE/GCAccessor.h index 2a8733cbc5..65df0a5ddc 100644 --- a/tests/GLES_COMPUTE/GCAccessor.h +++ b/tests/GLES_COMPUTE/GCAccessor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Arm Limited. + * Copyright (c) 2017-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -50,8 +50,8 @@ public: GCAccessor &operator=(const GCAccessor &) = delete; /** Allow instances of this class to be move constructed */ GCAccessor(GCAccessor &&) = default; - /** Allow instances of this class to be moved */ - GCAccessor &operator=(GCAccessor &&) = default; + /** Prevent instances of this class to be moved */ + GCAccessor &operator=(GCAccessor &&) = delete; /** Destructor that unmaps the GLES memory. */ ~GCAccessor(); diff --git a/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp b/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp index eb8f9913a6..7cde3d04ca 100644 --- a/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp +++ b/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp @@ -348,7 +348,7 @@ FIXTURE_DATA_TEST_CASE(RunPrecommit, CLGEMMMatrixMultiplyReshapedOnlyRHSFixture< h0_values), i_values_rhs), t_values_rhs), - framework::dataset::make("export_to_cl_image_rhs", false, true)), + framework::dataset::make("export_to_cl_image_rhs", {false, true})), framework::dataset::make("DataType", DataType::F32)), a_values), beta_values), @@ -379,7 +379,7 @@ FIXTURE_DATA_TEST_CASE(RunNightly, CLGEMMMatrixMultiplyReshapedOnlyRHSFixture<fl h0_values), i_values_rhs), t_values_rhs), - framework::dataset::make("export_to_cl_image_rhs", false, true)), + framework::dataset::make("export_to_cl_image_rhs", {false, true})), framework::dataset::make("DataType", DataType::F32)), a_values), beta_values), @@ -411,7 +411,7 @@ FIXTURE_DATA_TEST_CASE(RunPrecommit3D, CLGEMMMatrixMultiplyReshapedOnlyRHS3DFixt h0_values), i_values_rhs), t_values_rhs), - framework::dataset::make("export_to_cl_image_rhs", false, true)), + framework::dataset::make("export_to_cl_image_rhs", {false, true})), framework::dataset::make("has_pad_y", {false, true})), framework::dataset::make("DataType", DataType::F32)), a_values), @@ -443,7 +443,7 @@ FIXTURE_DATA_TEST_CASE(RunNightly3D, CLGEMMMatrixMultiplyReshapedOnlyRHS3DFixtur h0_values), i_values_rhs), t_values_rhs), - framework::dataset::make("export_to_cl_image_rhs", false, true)), + framework::dataset::make("export_to_cl_image_rhs", {false, true})), framework::dataset::make("has_pad_y", {false, true})), framework::dataset::make("DataType", DataType::F32)), a_values), diff --git a/utils/Utils.cpp b/utils/Utils.cpp index 754e7d0734..7380ad7909 100644 --- a/utils/Utils.cpp +++ b/utils/Utils.cpp @@ -37,6 +37,12 @@ #pragma GCC diagnostic ignored "-Wswitch-default" #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wstrict-overflow" +#if (defined(__GNUC__) && (__GNUC__ >= 7)) +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#endif // (defined(__GNUC__) && (__GNUC__ >= 7)) +#if defined(__clang__) +#pragma GCC diagnostic ignored "-Wparentheses-equality" +#endif // defined(__clang__) #define STB_IMAGE_IMPLEMENTATION #include "stb/stb_image.h" #pragma GCC diagnostic pop |