Merge pull request #4504 from mesonbuild/simdix

Fix SIMD test

7 files changed, 117 insertions, 59 deletions

diff --git a/test cases/common/152 simd/simd_sse2.c b/test cases/common/152 simd/simd_sse2.c
index 0274533..271022e 100644
--- a/test cases/common/152 simd/simd_sse2.c
+++ b/test cases/common/152 simd/simd_sse2.c
@@ -21,7 +21,7 @@ int sse2_available() {
 #endif
 
 void increment_sse2(float arr[4]) {
-    double darr[4];
+    ALIGN_16 double darr[4];
     __m128d val1 = _mm_set_pd(arr[0], arr[1]);
     __m128d val2 = _mm_set_pd(arr[2], arr[3]);
     __m128d one = _mm_set_pd(1.0, 1.0);
diff --git a/test cases/common/152 simd/simd_sse3.c b/test cases/common/152 simd/simd_sse3.c
index e97d102..89c2f8b 100644
--- a/test cases/common/152 simd/simd_sse3.c
+++ b/test cases/common/152 simd/simd_sse3.c
@@ -22,7 +22,7 @@ int sse3_available() {
 #endif
 
 void increment_sse3(float arr[4]) {
-    double darr[4];
+    ALIGN_16 double darr[4];
     __m128d val1 = _mm_set_pd(arr[0], arr[1]);
     __m128d val2 = _mm_set_pd(arr[2], arr[3]);
     __m128d one = _mm_set_pd(1.0, 1.0);
diff --git a/test cases/common/152 simd/simd_sse41.c b/test cases/common/152 simd/simd_sse41.c
index 0308c7e..859fb43 100644
--- a/test cases/common/152 simd/simd_sse41.c
+++ b/test cases/common/152 simd/simd_sse41.c
@@ -24,7 +24,7 @@ int sse41_available() {
 #endif
 
 void increment_sse41(float arr[4]) {
-    double darr[4];
+    ALIGN_16 double darr[4];
     __m128d val1 = _mm_set_pd(arr[0], arr[1]);
     __m128d val2 = _mm_set_pd(arr[2], arr[3]);
     __m128d one = _mm_set_pd(1.0, 1.0);
diff --git a/test cases/common/152 simd/simd_sse42.c b/test cases/common/152 simd/simd_sse42.c
index 137ffc4..edd6e5b 100644
--- a/test cases/common/152 simd/simd_sse42.c
+++ b/test cases/common/152 simd/simd_sse42.c
@@ -27,7 +27,7 @@ int sse42_available() {
 #endif
 
 void increment_sse42(float arr[4]) {
-    double darr[4];
+    ALIGN_16 double darr[4];
     __m128d val1 = _mm_set_pd(arr[0], arr[1]);
     __m128d val2 = _mm_set_pd(arr[2], arr[3]);
     __m128d one = _mm_set_pd(1.0, 1.0);
diff --git a/test cases/common/152 simd/simd_ssse3.c b/test cases/common/152 simd/simd_ssse3.c
index ab4dff4..0156f77 100644
--- a/test cases/common/152 simd/simd_ssse3.c
+++ b/test cases/common/152 simd/simd_ssse3.c
@@ -30,7 +30,7 @@ int ssse3_available() {
 #endif
 
 void increment_ssse3(float arr[4]) {
-    double darr[4];
+    ALIGN_16 double darr[4];
     __m128d val1 = _mm_set_pd(arr[0], arr[1]);
     __m128d val2 = _mm_set_pd(arr[2], arr[3]);
     __m128d one = _mm_set_pd(1.0, 1.0);
diff --git a/test cases/common/152 simd/simdchecker.c b/test cases/common/152 simd/simdchecker.c
index 222fbf3..cd6fe4f 100644
--- a/test cases/common/152 simd/simdchecker.c
+++ b/test cases/common/152 simd/simdchecker.c
@@ -1,93 +1,143 @@
 #include<simdfuncs.h>
 #include<stdio.h>
+#include<string.h>
 
-/*
- * A function that checks at runtime which simd accelerations are
- * available and calls the best one. Falls
- * back to plain C implementation if SIMD is not available.
- */
+typedef void (*simd_func)(float*);
+
+int check_simd_implementation(float *four,
+        const float *four_initial,
+        const char *simd_type,
+        const float *expected,
+        simd_func fptr,
+        const int blocksize) {
+    int rv = 0;
+    memcpy(four, four_initial, blocksize*sizeof(float));
+    printf("Using %s.\n", simd_type);
+    fptr(four);
+    for(int i=0; i<blocksize; i++) {
+        if(four[i] != expected[i]) {
+            printf("Increment function failed, got %f expected %f.\n", four[i], expected[i]);
+            rv = 1;
+        }
+    }
+    return rv;
+}
 
 int main(int argc, char **argv) {
-    float four[4] = {2.0, 3.0, 4.0, 5.0};
+    static const float four_initial[4] = {2.0, 3.0, 4.0, 5.0};
+    ALIGN_16 float four[4];
     const float expected[4] = {3.0, 4.0, 5.0, 6.0};
-    void (*fptr)(float[4]) = NULL;
-    const char *type;
-    int i;
+    int r=0;
+    const int blocksize = 4;
 
-/* Add here. The first matched one is used so put "better" instruction
- * sets at the top.
+/*
+ * Test all implementations that the current CPU supports.
  */
 #if HAVE_NEON
-    if(fptr == NULL && neon_available()) {
-        fptr = increment_neon;
-        type = "NEON";
+    if(neon_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "NEON",
+                expected,
+                increment_neon,
+                blocksize);
     }
 #endif
 #if HAVE_AVX2
-    if(fptr == NULL && avx2_available()) {
-        fptr = increment_avx2;
-        type = "AVX2";
+    if(avx2_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "AVX2",
+                expected,
+                increment_avx2,
+                blocksize);
     }
 #endif
 #if HAVE_AVX
-    if(fptr == NULL && avx_available()) {
-        fptr = increment_avx;
-        type = "AVX";
+    if(avx_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "AVC",
+                expected,
+                increment_avx,
+                blocksize);
     }
 #endif
 #if HAVE_SSE42
-    if(fptr == NULL && sse42_available()) {
-        fptr = increment_sse42;
-        type = "SSE42";
+    if(sse42_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "SSR42",
+                expected,
+                increment_sse42,
+                blocksize);
     }
 #endif
 #if HAVE_SSE41
-    if(fptr == NULL && sse41_available()) {
-        fptr = increment_sse41;
-        type = "SSE41";
+    if(sse41_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "SSE41",
+                expected,
+                increment_sse41,
+                blocksize);
     }
 #endif
 #if HAVE_SSSE3
-    if(fptr == NULL && ssse3_available()) {
-        fptr = increment_ssse3;
-        type = "SSSE3";
+    if(ssse3_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "SSSE3",
+                expected,
+                increment_ssse3,
+                blocksize);
     }
 #endif
 #if HAVE_SSE3
-    if(fptr == NULL && sse3_available()) {
-        fptr = increment_sse3;
-        type = "SSE3";
+    if(sse3_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "SSE3",
+                expected,
+                increment_sse3,
+                blocksize);
     }
 #endif
 #if HAVE_SSE2
-    if(fptr == NULL && sse2_available()) {
-        fptr = increment_sse2;
-        type = "SSE2";
+    if(sse2_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "SSE2",
+                expected,
+                increment_sse2,
+                blocksize);
     }
 #endif
 #if HAVE_SSE
-    if(fptr == NULL && sse_available()) {
-        fptr = increment_sse;
-        type = "SSE";
+    if(sse_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "SSE",
+                expected,
+                increment_sse,
+                blocksize);
     }
 #endif
 #if HAVE_MMX
-    if(fptr == NULL && mmx_available()) {
-        fptr = increment_mmx;
-        type = "MMX";
+    if(mmx_available()) {
+        r += check_simd_implementation(four,
+                four_initial,
+                "MMX",
+                expected,
+                increment_mmx,
+                blocksize);
     }
 #endif
-    if(fptr == NULL) {
-        fptr = increment_fallback;
-        type = "fallback";
-    }
-    printf("Using %s.\n", type);
-    fptr(four);
-    for(i=0; i<4; i++) {
-        if(four[i] != expected[i]) {
-            printf("Increment function failed, got %f expected %f.\n", four[i], expected[i]);
-            return 1;
-        }
-    }
-    return 0;
+    r += check_simd_implementation(four,
+            four_initial,
+            "fallback",
+            expected,
+            increment_fallback,
+            blocksize);
+    return r;
 }
diff --git a/test cases/common/152 simd/simdfuncs.h b/test cases/common/152 simd/simdfuncs.h
index dfb0560..c5e1658 100644
--- a/test cases/common/152 simd/simdfuncs.h
+++ b/test cases/common/152 simd/simdfuncs.h
@@ -2,6 +2,14 @@
 
 #include<simdconfig.h>
 
+#ifdef _MSC_VER
+#define ALIGN_16 __declspec(align(16))
+#else
+#include<stdalign.h>
+#define ALIGN_16 alignas(16)
+#endif
+
+
 /* Yes, I do know that arr[4] decays into a pointer
  * as a function argument. Don't do this in real code
  * but for this test it is ok.