From ec60bcc1eb4972ccc506033fa3ee5d95980b635e Mon Sep 17 00:00:00 2001
From: Nora Abi Akar <nora.abiakar@gmail.com>
Date: Tue, 25 Feb 2020 17:58:44 +0100
Subject: [PATCH] Fix neon flag (#975)
Replace deprecated `__ARM_NEON__` preprocessor define with `__ARM_NEON`, which should be defined by the compiler provided `ARB_ARCH` is set correctly, e.g. with `-DARB_ARCH=armv8-a+simd `
---
arbor/include/arbor/simd/native.hpp | 2 +-
arbor/include/arbor/simd/neon.hpp | 4 ++--
test/unit/test_simd.cpp | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arbor/include/arbor/simd/native.hpp b/arbor/include/arbor/simd/native.hpp
index 54b90add..8164ceaa 100644
--- a/arbor/include/arbor/simd/native.hpp
+++ b/arbor/include/arbor/simd/native.hpp
@@ -65,7 +65,7 @@ ARB_DEF_NATIVE_SIMD_(double, 8, avx512)
#endif
-#if defined(__ARM_NEON__) || defined(__aarch64__)
+#if defined(__ARM_NEON)
#include <arbor/simd/neon.hpp>
ARB_DEF_NATIVE_SIMD_(int, 2, neon)
diff --git a/arbor/include/arbor/simd/neon.hpp b/arbor/include/arbor/simd/neon.hpp
index 4d7f4277..f2710461 100644
--- a/arbor/include/arbor/simd/neon.hpp
+++ b/arbor/include/arbor/simd/neon.hpp
@@ -2,7 +2,7 @@
// NEON SIMD intrinsics implementation.
-#if defined(__ARM_NEON__) || defined(__aarch64__)
+#if defined(__ARM_NEON)
#include <arm_neon.h>
#include <cmath>
#include <cstdint>
@@ -647,4 +647,4 @@ struct neon<int, 2> {
} // namespace simd
} // namespace arb
-#endif // def __ARM_NEON__
+#endif // def __ARM_NEON
diff --git a/test/unit/test_simd.cpp b/test/unit/test_simd.cpp
index c28503be..3d611b26 100644
--- a/test/unit/test_simd.cpp
+++ b/test/unit/test_simd.cpp
@@ -589,7 +589,7 @@ typedef ::testing::Types<
simd<int, 8, simd_abi::avx512>,
simd<double, 8, simd_abi::avx512>,
#endif
-#if defined(__ARM_NEON__) || defined(__aarch64__)
+#if defined(__ARM_NEON)
simd<int, 2, simd_abi::neon>,
simd<double, 2, simd_abi::neon>,
#endif
@@ -875,7 +875,7 @@ typedef ::testing::Types<
#ifdef __AVX512F__
simd<double, 8, simd_abi::avx512>,
#endif
-#if defined(__ARM_NEON__) || defined(__aarch64__)
+#if defined(__ARM_NEON)
simd<double, 2, simd_abi::neon>,
#endif
@@ -1202,7 +1202,7 @@ typedef ::testing::Types<
simd_and_index<simd<int, 8, simd_abi::avx512>,
simd<int, 8, simd_abi::avx512>>,
#endif
-#if defined(__ARM_NEON__) || defined(__aarch64__)
+#if defined(__ARM_NEON)
simd_and_index<simd<double, 2, simd_abi::neon>,
simd<int, 2, simd_abi::neon>>,
@@ -1288,7 +1288,7 @@ typedef ::testing::Types<
simd_pair<simd<double, 8, simd_abi::avx512>,
simd<int, 8, simd_abi::avx512>>,
#endif
-#if defined(__ARM_NEON__) || defined(__aarch64__)
+#if defined(__ARM_NEON)
simd_pair<simd<double, 2, simd_abi::neon>,
simd<int, 2, simd_abi::neon>>,
#endif
--
GitLab