Test manufacturer id

Author: AntoinePrv

.github/workflows/cross-sve.yml

@@ -45,6 +45,7 @@ jobs:
         echo "XSIMD_TEST_CPU_ASSUME_SSE4_2=0" >> "$GITHUB_ENV"
         echo "XSIMD_TEST_CPU_ASSUME_NEON64=1" >> "$GITHUB_ENV"
         echo "XSIMD_TEST_CPU_ASSUME_SVE=1"    >> "$GITHUB_ENV"
+        echo "XSIMD_TEST_CPU_ASSUME_MANUFACTURER=unknown" >> "$GITHUB_ENV"
     - name: Testing xsimd
       run: qemu-aarch64 --cpu max,sve${{ matrix.vector_bits }}=on -L /usr/aarch64-linux-gnu/ ./test/test_xsimd
       working-directory: ${{ github.workspace }}/_build

.github/workflows/linux.yml

@@ -125,6 +125,7 @@ jobs:
         export XSIMD_TEST_CPU_ASSUME_NEON64="0"
         export XSIMD_TEST_CPU_ASSUME_SSE4_2="1"
         export XSIMD_TEST_CPU_ASSUME_AVX="1"
+        export XSIMD_TEST_CPU_ASSUME_MANUFACTURER="intel,amd"
         cd _build/test
         if echo '${{ matrix.sys.flags }}' | grep -q 'avx512' ; then
             export XSIMD_TEST_CPU_ASSUME_AVX512F="1"

.github/workflows/macos.yml

@@ -27,9 +27,11 @@ jobs:
         if echo '${{ matrix.os }}' | grep -q intel; then
           echo "XSIMD_TEST_CPU_ASSUME_NEON64=0" >> "$GITHUB_ENV"
           echo "XSIMD_TEST_CPU_ASSUME_SSE4_2=1" >> "$GITHUB_ENV"
+          echo "XSIMD_TEST_CPU_ASSUME_MANUFACTURER=intel" >> "$GITHUB_ENV"
         else
           echo "XSIMD_TEST_CPU_ASSUME_NEON64=1" >> "$GITHUB_ENV"
           echo "XSIMD_TEST_CPU_ASSUME_SSE4_2=0" >> "$GITHUB_ENV"
+          echo "XSIMD_TEST_CPU_ASSUME_MANUFACTURER=unknown" >> "$GITHUB_ENV"
         fi
     - name: Testing xsimd
       run: ${{github.workspace}}/_build/test/test_xsimd

.github/workflows/windows.yml

@@ -55,6 +55,7 @@ jobs:
         XSIMD_TEST_CPU_ASSUME_NEON64: "0"
         XSIMD_TEST_CPU_ASSUME_SSE4_2: "1"
         XSIMD_TEST_CPU_ASSUME_AVX2: "1"
+        XSIMD_TEST_CPU_ASSUME_MANUFACTURER: "intel,amd"
       run: ./_build/test/test_xsimd
 
   build-windows-mingw:
@@ -117,4 +118,5 @@ jobs:
         # Set CPU feature test expectations
         XSIMD_TEST_CPU_ASSUME_NEON64: "1"
         XSIMD_TEST_CPU_ASSUME_SSE4_2: "0"
+        XSIMD_TEST_CPU_ASSUME_MANUFACTURER: "unknown"
       run: ./_build/test/test_xsimd

test/test_cpu_features.cpp

@@ -9,6 +9,8 @@
  * The full license is in the file LICENSE, distributed with this software. *
  ****************************************************************************/
 
+#include <algorithm>
+#include <array>
 #include <cstdlib>
 #include <string>
 
@@ -31,6 +33,12 @@ namespace detail
             CHECK_EQ(actual, val[0] == '1');
         }
     }
+
+    // TODO(c++23): use str.contains
+    bool contains(const std::string& haystack, const char* needle)
+    {
+        return haystack.find(needle) != std::string::npos;
+    }
 }
 
 #define CHECK_ENV_FEATURE(env_var, feature) detail::check_env_flag(env_var, #feature, feature)
@@ -72,6 +80,40 @@ TEST_CASE("[cpu_features] x86 implication chains")
     CHECK_IMPLICATION(cpu.avxvnni(), cpu.avx2());
 }
 
+TEST_CASE("[cpu_features] x86 manufacturer from environment")
+{
+    xsimd::x86_cpu_features cpu;
+
+    const char* val = std::getenv("XSIMD_TEST_CPU_ASSUME_MANUFACTURER");
+    if (val)
+    {
+        struct entry
+        {
+            const char* name;
+            xsimd::x86_manufacturer value;
+        };
+        std::array<entry, 9> manufacturers = { {
+            { "intel", xsimd::x86_manufacturer::intel },
+            { "amd", xsimd::x86_manufacturer::amd },
+            { "via", xsimd::x86_manufacturer::via },
+            { "zhaoxin", xsimd::x86_manufacturer::zhaoxin },
+            { "hygon", xsimd::x86_manufacturer::hygon },
+            { "transmeta", xsimd::x86_manufacturer::transmeta },
+            { "elbrus", xsimd::x86_manufacturer::elbrus },
+            { "microsoft_vpc", xsimd::x86_manufacturer::microsoft_vpc },
+            { "unknown", xsimd::x86_manufacturer::unknown },
+        } };
+
+        auto manufacturer = cpu.known_manufacturer();
+        const std::string allowed(val);
+        bool match = std::any_of(manufacturers.begin(), manufacturers.end(), [&](const entry& e)
+                                 { return e.value == manufacturer && detail::contains(allowed, e.name); });
+
+        auto const msg = std::string("XSIMD_TEST_CPU_ASSUME_MANUFACTURER = ") + val;
+        INFO(msg);
+        CHECK_UNARY(match);
+    }
+}
 
 TEST_CASE("[cpu_features] x86 features from environment")
 {
@@ -111,4 +153,3 @@ TEST_CASE("[cpu_features] arm features from environment")
     CHECK_ENV_FEATURE("XSIMD_TEST_CPU_ASSUME_SVE", cpu.sve());
     CHECK_ENV_FEATURE("XSIMD_TEST_CPU_ASSUME_I8MM", cpu.i8mm());
 }
-