Merge branch 'xtensor-stack:master' into refactor_examples

DerThorsten · web-flow · commit 903b1428d7f1 · 2021-08-18T09:39:02.000+02:00
diff --git a/include/xsimd/config/xsimd_config.hpp b/include/xsimd/config/xsimd_config.hpp
@@ -1,6 +1,9 @@
 #ifndef XSIMD_CONFIG_HPP
 #define XSIMD_CONFIG_HPP
 
+#define XSIMD_VERSION_MAJOR 8
+#define XSIMD_VERSION_MINOR 0
+#define XSIMD_VERSION_PATCH 0
 
 /**
  * high level free functions
diff --git a/include/xsimd/config/xsimd_cpuid.hpp b/include/xsimd/config/xsimd_cpuid.hpp
@@ -5,6 +5,11 @@
 #include <algorithm>
 #include <array>
 
+#if defined(__linux__) && (defined(__ARM_NEON) || defined(_M_ARM))
+#include <sys/auxv.h>
+#include <asm/hwcap.h>
+#endif
+
 #if defined(_MSC_VER)
 // Contains the definition of __cpuidex
 #include <intrin.h>
@@ -46,12 +51,14 @@ namespace xsimd
                  neon64 = 1;
                  best = neon64::version();
 #elif defined(__ARM_NEON) || defined(_M_ARM)
-                 // TODO: fix undefined error of AT_HWCAP on arm7
-                 //neon = bool(getauxval(AT_HWCAP) & HWCAP_NEON);
-                 //best = neon::version() * neon;
-                 neon = 1;
+#if defined(__linux__)
+                 neon = bool(getauxval(AT_HWCAP) & HWCAP_NEON);
+#else
+                 // that's very conservative :-/
+                 neon = 0;
+#endif
                  neon64 = 0;
-                 best = neon::version();
+                 best = neon::version() * neon;
 
 #elif defined(__x86_64__) || defined(__i386__) || defined(_M_AMD64) || defined(_M_IX86)
                  auto get_cpuid = [](int reg[4], int func_id)
diff --git a/include/xsimd/types/xsimd_avx2_register.hpp b/include/xsimd/types/xsimd_avx2_register.hpp
@@ -10,6 +10,7 @@ namespace xsimd
         static constexpr bool supported() { return XSIMD_WITH_AVX2; }
         static constexpr bool available() { return true; }
         static constexpr unsigned version() { return generic::version(2, 2, 0); }
+        static constexpr char const* name() { return "avx2"; }
     };
 
 #if XSIMD_WITH_AVX2
diff --git a/include/xsimd/types/xsimd_avx512bw_register.hpp b/include/xsimd/types/xsimd_avx512bw_register.hpp
@@ -9,6 +9,7 @@ namespace xsimd {
     static constexpr bool supported() { return XSIMD_WITH_AVX512BW; }
     static constexpr bool available() { return true; }
     static constexpr unsigned version() { return generic::version(3, 4, 0); }
+    static constexpr char const* name() { return "avx512bw"; }
   };
 
 #if XSIMD_WITH_AVX512BW
diff --git a/include/xsimd/types/xsimd_avx512cd_register.hpp b/include/xsimd/types/xsimd_avx512cd_register.hpp
@@ -9,6 +9,7 @@ namespace xsimd {
     static constexpr bool supported() { return XSIMD_WITH_AVX512BW; }
     static constexpr bool available() { return true; }
     static constexpr unsigned version() { return generic::version(3, 2, 0); }
+    static constexpr char const* name() { return "avx512cd"; }
   };
 
 #if XSIMD_WITH_AVX512BW
diff --git a/include/xsimd/types/xsimd_avx512dq_register.hpp b/include/xsimd/types/xsimd_avx512dq_register.hpp
@@ -9,6 +9,7 @@ namespace xsimd {
     static constexpr bool supported() { return XSIMD_WITH_AVX512DQ; }
     static constexpr bool available() { return true; }
     static constexpr unsigned version() { return generic::version(3, 3, 0); }
+    static constexpr char const* name() { return "avx512dq"; }
   };
 
 #if XSIMD_WITH_AVX512DQ
diff --git a/include/xsimd/types/xsimd_avx512f_register.hpp b/include/xsimd/types/xsimd_avx512f_register.hpp
@@ -11,6 +11,7 @@ namespace xsimd {
     static constexpr unsigned version() { return generic::version(3, 1, 0); }
     static constexpr std::size_t alignment() { return 64; }
     static constexpr bool requires_alignment() { return true; }
+    static constexpr char const* name() { return "avx512f"; }
   };
 
 #if XSIMD_WITH_AVX512F
diff --git a/include/xsimd/types/xsimd_avx_register.hpp b/include/xsimd/types/xsimd_avx_register.hpp
@@ -11,6 +11,7 @@ namespace xsimd {
     static constexpr unsigned version() { return generic::version(2, 1, 0); }
     static constexpr std::size_t alignment() { return 32; }
     static constexpr bool requires_alignment() { return true; }
+    static constexpr char const* name() { return "avx"; }
   };
 }
 
diff --git a/include/xsimd/types/xsimd_fma3_register.hpp b/include/xsimd/types/xsimd_fma3_register.hpp
@@ -10,6 +10,7 @@ namespace xsimd {
     static constexpr bool supported() { return XSIMD_WITH_FMA3; }
     static constexpr bool available() { return true; }
     static constexpr unsigned version() { return generic::version(1, 5, 0); }
+    static constexpr char const* name() { return "sse4.2+fma"; }
   };
 
 #if XSIMD_WITH_FMA3
diff --git a/include/xsimd/types/xsimd_fma5_register.hpp b/include/xsimd/types/xsimd_fma5_register.hpp
@@ -10,6 +10,7 @@ namespace xsimd {
     static constexpr bool supported() { return XSIMD_WITH_FMA5; }
     static constexpr bool available() { return true; }
     static constexpr unsigned version() { return generic::version(2, 3, 0); }
+    static constexpr char const* name() { return "avx2+fma"; }
   };
 
 #if XSIMD_WITH_FMA5
diff --git a/include/xsimd/types/xsimd_neon64_register.hpp b/include/xsimd/types/xsimd_neon64_register.hpp
@@ -12,6 +12,7 @@ namespace xsimd
         static constexpr bool requires_alignment() { return true; }
         static constexpr std::size_t alignment() { return 16; }
         static constexpr unsigned version() { return generic::version(8, 1, 0); }
+        static constexpr char const* name() { return "arm64+neon"; }
     };
 
 #if XSIMD_WITH_NEON64
diff --git a/include/xsimd/types/xsimd_neon_register.hpp b/include/xsimd/types/xsimd_neon_register.hpp
@@ -17,6 +17,7 @@ namespace xsimd
         static constexpr bool requires_alignment() { return true; }
         static constexpr std::size_t alignment() { return 16; }
         static constexpr unsigned version() { return generic::version(7, 0, 0); }
+        static constexpr char const* name() { return "arm32+neon"; }
     };
 
 #if XSIMD_WITH_NEON
diff --git a/include/xsimd/types/xsimd_sse2_register.hpp b/include/xsimd/types/xsimd_sse2_register.hpp
@@ -18,6 +18,7 @@ namespace xsimd
         static constexpr bool requires_alignment() { return true; }
         static constexpr unsigned version() { return generic::version(1, 2, 0); }
         static constexpr std::size_t alignment() { return 16; }
+        static constexpr char const* name() { return "sse2"; }
     };
 
 #if XSIMD_WITH_SSE2
diff --git a/include/xsimd/types/xsimd_sse3_register.hpp b/include/xsimd/types/xsimd_sse3_register.hpp
@@ -14,6 +14,7 @@ namespace xsimd
         static constexpr bool supported() { return XSIMD_WITH_SSE3; }
         static constexpr bool available() { return true; }
         static constexpr unsigned version() { return generic::version(1, 3, 0); }
+        static constexpr char const* name() { return "sse3"; }
     };
 
 #if XSIMD_WITH_SSE3
diff --git a/include/xsimd/types/xsimd_sse4_1_register.hpp b/include/xsimd/types/xsimd_sse4_1_register.hpp
@@ -14,6 +14,7 @@ namespace xsimd
         static constexpr bool supported() { return XSIMD_WITH_SSE4_1; }
         static constexpr bool available() { return true; }
         static constexpr unsigned version() { return generic::version(1, 4, 1); }
+        static constexpr char const* name() { return "sse4.1"; }
     };
 
 #if XSIMD_WITH_SSE4_1
diff --git a/include/xsimd/types/xsimd_sse4_2_register.hpp b/include/xsimd/types/xsimd_sse4_2_register.hpp
@@ -14,6 +14,7 @@ namespace xsimd
         static constexpr bool supported() { return XSIMD_WITH_SSE4_2; }
         static constexpr bool available() { return true; }
         static constexpr unsigned version() { return generic::version(1, 4, 2); }
+        static constexpr char const* name() { return "sse4.2"; }
     };
 
 #if XSIMD_WITH_SSE4_2
diff --git a/include/xsimd/types/xsimd_ssse3_register.hpp b/include/xsimd/types/xsimd_ssse3_register.hpp
@@ -14,6 +14,7 @@ namespace xsimd
         static constexpr bool supported() { return XSIMD_WITH_SSSE3; }
         static constexpr bool available() { return true; }
         static constexpr unsigned version() { return generic::version(1, 3, 1); }
+        static constexpr char const* name() { return "ssse3"; }
     };
 
 #if XSIMD_WITH_SSSE3
diff --git a/test/test_arch.cpp b/test/test_arch.cpp
@@ -30,6 +30,13 @@ TEST(arch, supported)
   xsimd::supported_architectures::for_each(check_supported{});
 }
 
+TEST(arch, name)
+{
+  constexpr char const* name = xsimd::default_arch::name();
+  (void)name;
+}
+
+
 struct check_available {
   template<class Arch>
   void operator()(Arch) const {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ namespace xsimd {`
`11`	`11`	`static constexpr unsigned version() { return generic::version(2, 1, 0); }`
`12`	`12`	`static constexpr std::size_t alignment() { return 32; }`
`13`	`13`	`static constexpr bool requires_alignment() { return true; }`
	`14`	`+ static constexpr char const* name() { return "avx"; }`
`14`	`15`	`};`
`15`	`16`	`}`
`16`	`17`