CMake: remove DEAL_II_HAVE_ARM_NEON and use DEAL_II_VECTORIZATION_WIDTH_IN_BITS

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index 32b41e4fb026dcb954e6c9589efb9b86c2e541d5..818a031d06f1c87b1edfa9df6c403d62d91a832a 100644 (file)
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -138,8 +138,6 @@
 #define DEAL_II_COMPILER_VECTORIZATION_LEVEL 0
 #endif
 
-#cmakedefine DEAL_II_HAVE_ARM_NEON
-
 #define DEAL_II_OPENMP_SIMD_PRAGMA @DEAL_II_OPENMP_SIMD_PRAGMA@
 
 

diff --git a/include/deal.II/base/vectorization.h b/include/deal.II/base/vectorization.h
index b43f59a83a02b7b798d65191515341b7861a6f66..5a05d48652e2335a7a3e2f95af34f0eb3fe08d6b 100644 (file)
--- a/include/deal.II/base/vectorization.h
+++ b/include/deal.II/base/vectorization.h
@@ -1003,7 +1003,7 @@ vectorized_transpose_and_store(const bool                            add_into,
 
 #ifndef DOXYGEN
 
-#  if defined(DEAL_II_HAVE_ARM_NEON) && defined(__ARM_NEON)
+#  if DEAL_II_VECTORIZATION_WIDTH_IN_BITS >= 128 && defined(__ARM_NEON)
 
 /**
  * Specialization for double and ARM Neon.
@@ -6313,7 +6313,7 @@ compare_and_apply_mask(const VectorizedArray<double, 2> &left,
 
 #  endif
 
-#  if defined(DEAL_II_HAVE_ARM_NEON) && defined(__ARM_NEON)
+#  if DEAL_II_VECTORIZATION_WIDTH_IN_BITS >= 128 && defined(__ARM_NEON)
 
 template <SIMDComparison predicate>
 DEAL_II_ALWAYS_INLINE inline VectorizedArray<float, 4>