Make ARM related header discriminators less clunky

jfalcou · Oct 12, 2024 · 88ab1ce · 88ab1ce
1 parent 5474137
commit 88ab1ce
Show file tree

Hide file tree

Showing 79 changed files with 125 additions and 125 deletions.
diff --git a/include/eve/arch/arm/predef.hpp b/include/eve/arch/arm/predef.hpp
@@ -14,9 +14,9 @@
 #if defined(EVE_SIMD_IS_ANY_FIXED_SVE) && !defined(EVE_NO_SIMD)
 #  define EVE_SUPPORTS_NATIVE_SIMD
 #  define EVE_HW_ARM_SVE
-#  define EVE_INCLUDE_SVE_HEADER
+#  define EVE_INCLUDE_ARM_SVE_HEADER
 #elif defined(SPY_SIMD_IS_ARM) && !defined(EVE_NO_SIMD)
 #  define EVE_SUPPORTS_NATIVE_SIMD
 #  define EVE_HW_ARM
-#  define EVE_INCLUDE_ARM_HEADER
+#  define EVE_INCLUDE_ARM_NEON_HEADER
 #endif
diff --git a/include/eve/arch/top_bits.hpp b/include/eve/arch/top_bits.hpp
@@ -36,7 +36,7 @@ namespace eve {
 #  include <eve/arch/x86/top_bits.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/arch/arm/sve/top_bits.hpp>
 #endif
 

diff --git a/include/eve/detail/function/bit_cast.hpp b/include/eve/detail/function/bit_cast.hpp
@@ -30,6 +30,6 @@ namespace eve
 
 #include <eve/detail/function/simd/common/bit_cast.hpp>
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/bit_cast.hpp>
 #endif
diff --git a/include/eve/detail/function/bitmask.hpp b/include/eve/detail/function/bitmask.hpp
@@ -14,7 +14,7 @@
 #  include <eve/detail/function/simd/x86/bitmask.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/bitmask.hpp>
 #endif
 

diff --git a/include/eve/detail/function/byte_16_runtime_shuffle.hpp b/include/eve/detail/function/byte_16_runtime_shuffle.hpp
@@ -33,7 +33,7 @@ namespace eve
 #  include <eve/detail/function/simd/x86/byte_16_runtime_shuffle.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/byte_16_runtime_shuffle.hpp>
 #endif
 

diff --git a/include/eve/detail/function/combine.hpp b/include/eve/detail/function/combine.hpp
@@ -18,11 +18,11 @@
 #  include <eve/detail/function/simd/ppc/combine.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/combine.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/combine.hpp>
 #endif
 

diff --git a/include/eve/detail/function/friends.hpp b/include/eve/detail/function/friends.hpp
@@ -18,11 +18,11 @@
 #  include <eve/detail/function/simd/ppc/friends.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/friends.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/friends.hpp>
 #endif
 

diff --git a/include/eve/detail/function/interleave.hpp b/include/eve/detail/function/interleave.hpp
@@ -42,6 +42,6 @@ namespace eve
 #  include <eve/detail/function/simd/ppc/interleave.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/interleave.hpp>
 #endif
diff --git a/include/eve/detail/function/load.hpp b/include/eve/detail/function/load.hpp
@@ -28,11 +28,11 @@ namespace eve
 #  include <eve/detail/function/simd/ppc/load.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/load.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/load.hpp>
 #endif
 

diff --git a/include/eve/detail/function/make.hpp b/include/eve/detail/function/make.hpp
@@ -33,7 +33,7 @@ namespace eve::detail
 #  include <eve/detail/function/simd/x86/make.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/make.hpp>
 #endif
 

diff --git a/include/eve/detail/function/movemask.hpp b/include/eve/detail/function/movemask.hpp
@@ -19,6 +19,6 @@
 #  include <eve/detail/function/simd/ppc/movemask.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/movemask.hpp>
 #endif
diff --git a/include/eve/detail/function/slice.hpp b/include/eve/detail/function/slice.hpp
@@ -72,11 +72,11 @@ namespace eve
 #  include <eve/detail/function/simd/ppc/slice.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/slice.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/slice.hpp>
 #endif
 

diff --git a/include/eve/detail/function/subscript.hpp b/include/eve/detail/function/subscript.hpp
@@ -46,7 +46,7 @@ namespace eve::detail
 #  include <eve/detail/function/simd/x86/subscript.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/subscript.hpp>
 #endif
 

diff --git a/include/eve/detail/function/sum.hpp b/include/eve/detail/function/sum.hpp
@@ -29,10 +29,10 @@ namespace eve
 #  include <eve/detail/function/simd/x86/sum.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/sum.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/sum.hpp>
 #endif
diff --git a/include/eve/detail/function/to_logical.hpp b/include/eve/detail/function/to_logical.hpp
@@ -18,11 +18,11 @@
 #  include <eve/detail/function/simd/ppc/to_logical.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/function/simd/arm/neon/to_logical.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/function/simd/arm/sve/to_logical.hpp>
 #endif
 

diff --git a/include/eve/detail/shuffle_v2/shuffle_l2.hpp b/include/eve/detail/shuffle_v2/shuffle_l2.hpp
@@ -29,11 +29,11 @@ EVE_CALLABLE_API(shuffle_l2_, shuffle_l2)
 #  include <eve/detail/shuffle_v2/simd/x86/shuffle_l2.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/shuffle_v2/simd/arm/neon/shuffle_l2.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/shuffle_v2/simd/arm/sve/shuffle_l2.hpp>
 #endif
 

diff --git a/include/eve/detail/shuffle_v2/shuffle_l3.hpp b/include/eve/detail/shuffle_v2/shuffle_l3.hpp
@@ -29,11 +29,11 @@ EVE_CALLABLE_API(shuffle_l3_, shuffle_l3)
 #  include <eve/detail/shuffle_v2/simd/x86/shuffle_l3.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/shuffle_v2/simd/arm/neon/shuffle_l3.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/shuffle_v2/simd/arm/sve/shuffle_l3.hpp>
 #endif
 

diff --git a/include/eve/detail/shuffle_v2/shuffle_l4_l5.hpp b/include/eve/detail/shuffle_v2/shuffle_l4_l5.hpp
@@ -32,10 +32,10 @@ EVE_CALLABLE_API(shuffle_l4_l5_, shuffle_l4_l5)
 #  include <eve/detail/shuffle_v2/simd/x86/shuffle_l4_l5.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/detail/shuffle_v2/simd/arm/neon/shuffle_l4_l5.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/detail/shuffle_v2/simd/arm/sve/shuffle_l4_l5.hpp>
 #endif
diff --git a/include/eve/module/core/compress/compress.hpp b/include/eve/module/core/compress/compress.hpp
@@ -95,6 +95,6 @@ namespace eve
 #  include <eve/module/core/compress/simd/x86/compress.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/compress/simd/arm/sve/compress.hpp>
 #endif
diff --git a/include/eve/module/core/compress/compress_copy_scalar.hpp b/include/eve/module/core/compress/compress_copy_scalar.hpp
@@ -89,6 +89,6 @@ EVE_CALLABLE_API(compress_copy_scalar_impl_, compress_copy_scalar_impl)
 
 #include <eve/module/core/compress/simd/common/compress_copy_scalar.hpp>
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/compress/simd/arm/sve/compress_copy_scalar.hpp>
 #endif
diff --git a/include/eve/module/core/compress/detail/compress_mask_num.hpp b/include/eve/module/core/compress/detail/compress_mask_num.hpp
@@ -79,7 +79,7 @@ namespace eve
 #  include <eve/module/core/compress/detail/simd/x86/compress_mask_num.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/compress/detail/simd/arm/neon/compress_mask_num.hpp>
 #endif
 

diff --git a/include/eve/module/core/constant/iota.hpp b/include/eve/module/core/constant/iota.hpp
@@ -71,6 +71,6 @@ inline constexpr auto iota = functor<iota_t>;
 
 #include <eve/module/core/constant/simd/common/iota.hpp>
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/constant/simd/arm/sve/iota.hpp>
 #endif
diff --git a/include/eve/module/core/detail/basic_shuffle.hpp b/include/eve/module/core/detail/basic_shuffle.hpp
@@ -33,10 +33,10 @@ EVE_CALLABLE_API(basic_shuffle_, basic_shuffle)
 #  include <eve/module/core/detail/simd/ppc/basic_shuffle.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/detail/simd/arm/neon/basic_shuffle.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/detail/simd/arm/sve/basic_shuffle.hpp>
 #endif
diff --git a/include/eve/module/core/regular/abs.hpp b/include/eve/module/core/regular/abs.hpp
@@ -98,10 +98,10 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/ppc/abs.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/abs.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/abs.hpp>
 #endif
diff --git a/include/eve/module/core/regular/add.hpp b/include/eve/module/core/regular/add.hpp
@@ -142,10 +142,10 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/x86/add.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/add.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/add.hpp>
 #endif
diff --git a/include/eve/module/core/regular/all.hpp b/include/eve/module/core/regular/all.hpp
@@ -65,10 +65,10 @@ EVE_MAKE_CALLABLE(all_, all);
 #  include <eve/module/core/regular/impl/simd/ppc/all.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/all.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/all.hpp>
 #endif
diff --git a/include/eve/module/core/regular/any.hpp b/include/eve/module/core/regular/any.hpp
@@ -63,10 +63,10 @@ EVE_MAKE_CALLABLE(any_, any);
 #  include <eve/module/core/regular/impl/simd/ppc/any.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/any.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/any.hpp>
 #endif
diff --git a/include/eve/module/core/regular/average.hpp b/include/eve/module/core/regular/average.hpp
@@ -133,6 +133,6 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/ppc/average.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/average.hpp>
 #endif
diff --git a/include/eve/module/core/regular/bit_and.hpp b/include/eve/module/core/regular/bit_and.hpp
@@ -106,10 +106,10 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/x86/bit_and.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/bit_and.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/bit_and.hpp>
 #endif
diff --git a/include/eve/module/core/regular/bit_andnot.hpp b/include/eve/module/core/regular/bit_andnot.hpp
@@ -102,10 +102,10 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/ppc/bit_andnot.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/bit_andnot.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/bit_andnot.hpp>
 #endif
diff --git a/include/eve/module/core/regular/bit_notand.hpp b/include/eve/module/core/regular/bit_notand.hpp
@@ -96,10 +96,10 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/ppc/bit_notand.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/bit_notand.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/bit_notand.hpp>
 #endif
diff --git a/include/eve/module/core/regular/bit_notor.hpp b/include/eve/module/core/regular/bit_notor.hpp
@@ -89,6 +89,6 @@ namespace eve
 
 #include <eve/module/core/regular/impl/bit_notor.hpp>
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/bit_notor.hpp>
 #endif
diff --git a/include/eve/module/core/regular/bit_or.hpp b/include/eve/module/core/regular/bit_or.hpp
@@ -100,10 +100,10 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/x86/bit_or.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/bit_or.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/bit_or.hpp>
 #endif
diff --git a/include/eve/module/core/regular/bit_ornot.hpp b/include/eve/module/core/regular/bit_ornot.hpp
@@ -84,6 +84,6 @@ namespace eve
 
 #include <eve/module/core/regular/impl/bit_ornot.hpp>
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/bit_ornot.hpp>
 #endif
diff --git a/include/eve/module/core/regular/bit_select.hpp b/include/eve/module/core/regular/bit_select.hpp
@@ -78,6 +78,6 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/ppc/bit_select.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/bit_select.hpp>
 #endif
diff --git a/include/eve/module/core/regular/bit_xor.hpp b/include/eve/module/core/regular/bit_xor.hpp
@@ -99,10 +99,10 @@ namespace eve
 #  include <eve/module/core/regular/impl/simd/ppc/bit_xor.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_ARM_HEADER)
+#if defined(EVE_INCLUDE_ARM_NEON_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/neon/bit_xor.hpp>
 #endif
 
-#if defined(EVE_INCLUDE_SVE_HEADER)
+#if defined(EVE_INCLUDE_ARM_SVE_HEADER)
 #  include <eve/module/core/regular/impl/simd/arm/sve/bit_xor.hpp>
 #endif