diff --git a/arbor/include/arbor/simd/native.hpp b/arbor/include/arbor/simd/native.hpp index 54b90add3a113188b8daec62de9221c1fd5870d5..8164ceaa427d87172e1cc832204225bdcbedb20a 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 4d7f4277ba8c214bfaf5f364bcc05818cbd874b6..f2710461581030314eb01cf044f93fcda332ded6 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 c28503be16c36cd8debe1c6523e1aeeb3075fb13..3d611b260f6b1df9b8a34444ea1af223008ca078 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