commit bcf9552b176a1577a2ce3c3a1f03f524fd5bcde5
author Viet-Hoa Do <viet-hoa.do@arm.com> Wed Nov 01 11:27:32 2023 +0000
committer Viet-Hoa Do <viet-hoa.do@arm.com> Wed Nov 01 13:09:41 2023 +0000
tree 3b7cc932bf1d811e1e9b690293bc46d8d4b9137a
parent 704c22f1373e1276acb43c71e7e17048271bbc03

Fix compilation error with clang and multi-isa

* Fix SVE header being included in non-SVE file.

Resolves: COMPMID-6613
Signed-off-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Change-Id: Ic7f662a239b761b83e67e11b6cc03f7d5f5cd051
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10573
Reviewed-by: Jakub Sujak <jakub.sujak@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

src/core/NEON/wrapper/traits.h

diff --git a/src/core/NEON/wrapper/traits.h b/src/core/NEON/wrapper/traits.h
index 729d9ff..1dac61a 100644
--- a/src/core/NEON/wrapper/traits.h
+++ b/src/core/NEON/wrapper/traits.h
@@ -32,9 +32,9 @@
 
 #include <arm_neon.h>
 
-#if defined(ARM_COMPUTE_ENABLE_SVE)
+#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(__ARM_FEATURE_SVE)
 #include <arm_sve.h>
-#endif /* defined(ARM_COMPUTE_ENABLE_SVE) */
+#endif /* defined(ARM_COMPUTE_ENABLE_SVE) && defined(__ARM_FEATURE_SVE) */
 
 #include <cmath>
 #include <cstdint>
@@ -125,13 +125,13 @@
 #endif // __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
 
 
-#if defined(ARM_COMPUTE_ENABLE_SVE)
+#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(__ARM_FEATURE_SVE)
 /** Create the appropriate SVE vector given its type */
 template <typename T> struct sve_vector;
 
 template <> struct sve_vector<uint8_t>{ using scalar_type = uint8_t; using type = svuint8_t; };
 template <> struct sve_vector<int8_t>{ using scalar_type = int8_t; using type = svint8_t; };
-#endif /* defined(ARM_COMPUTE_ENABLE_SVE) */
+#endif /* defined(ARM_COMPUTE_ENABLE_SVE) && defined(__ARM_FEATURE_SVE) */
 
 #endif /* DOXYGEN_SKIP_THIS */