From 586fff9f1e30ad06b52aec3332f956cc25cfe56f Mon Sep 17 00:00:00 2001 From: Pablo Marquez Tello Date: Fri, 10 Jun 2022 09:20:14 +0100 Subject: Fix build error v8.2-a-sve * bf16 instrinsics should be used when __ARM_FEATURE_SVE_BF16 is present * Fixed NDK14 compiler warning declaring copy ctor for Window explicitly * Resolves MLCE-867 Change-Id: I84ac5f213d9700e2fda7da55d83bba7cf79ad52c Signed-off-by: Pablo Marquez Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7728 Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins Tested-by: Arm Jenkins --- arm_compute/core/Window.h | 1 + src/core/NEON/wrapper/intrinsics/svdup_n.h | 6 ++++-- src/core/NEON/wrapper/svtraits.h | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arm_compute/core/Window.h b/arm_compute/core/Window.h index c566cffa88..440b942dcf 100644 --- a/arm_compute/core/Window.h +++ b/arm_compute/core/Window.h @@ -90,6 +90,7 @@ public: : _start(start), _end(end), _step(step) { } + Dimension(const Dimension &d) = default; /** Default assignment operator to allow dimensions to be copied */ Dimension &operator=(const Dimension &d) = default; /** Return the start of the dimension */ diff --git a/src/core/NEON/wrapper/intrinsics/svdup_n.h b/src/core/NEON/wrapper/intrinsics/svdup_n.h index b1aed97d9c..9c42c86db7 100644 --- a/src/core/NEON/wrapper/intrinsics/svdup_n.h +++ b/src/core/NEON/wrapper/intrinsics/svdup_n.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Arm Limited. + * Copyright (c) 2020, 2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -46,7 +46,9 @@ SVDUP_N_IMPL(uint64_t, svuint64_t, u64) SVDUP_N_IMPL(float16_t, svfloat16_t, f16) SVDUP_N_IMPL(float, svfloat32_t, f32) SVDUP_N_IMPL(float64_t, svfloat64_t, f64) +#if __ARM_FEATURE_SVE_BF16 SVDUP_N_IMPL(bfloat16_t, svbfloat16_t, bf16) +#endif // #if __ARM_FEATURE_SVE_BF16 #undef SVDUP_N_IMPL @@ -54,4 +56,4 @@ SVDUP_N_IMPL(bfloat16_t, svbfloat16_t, bf16) } // namespace arm_compute #endif /* defined(__ARM_FEATURE_SVE) */ -#endif /* SRC_CORE_NEON_WRAPPER_INTRINSICS_SVDUP_N_H */ \ No newline at end of file +#endif /* SRC_CORE_NEON_WRAPPER_INTRINSICS_SVDUP_N_H */ diff --git a/src/core/NEON/wrapper/svtraits.h b/src/core/NEON/wrapper/svtraits.h index 1d599a246c..5ccd0ba8f1 100644 --- a/src/core/NEON/wrapper/svtraits.h +++ b/src/core/NEON/wrapper/svtraits.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -59,7 +59,10 @@ DEFINE_TYPES(uint64_t) DEFINE_TYPES(float16_t) DEFINE_TYPES(float32_t) DEFINE_TYPES(float64_t) + +#if __ARM_FEATURE_SVE_BF16 DEFINE_TYPES(bfloat16_t) +#endif // #if __ARM_FEATURE_SVE_BF16 #undef DEFINE_TYPES -- cgit v1.2.1