[mypyc] librt base64: replace BASE64_WITH_[x86 features] with directly using HAVE_[x86 features]

Author: mr-c

mypyc/build_setup.py

@@ -15,16 +15,16 @@
 
 EXTRA_FLAGS_PER_COMPILER_TYPE_PER_PATH_COMPONENT = {
     "unix": {
-        "base64/arch/ssse3": ["-mssse3", "-DBASE64_WITH_SSSE3"],
-        "base64/arch/sse41": ["-msse4.1", "-DBASE64_WITH_SSE41"],
-        "base64/arch/sse42": ["-msse4.2", "-DBASE64_WITH_SSE42"],
-        "base64/arch/avx2": ["-mavx2", "-DBASE64_WITH_AVX2"],
-        "base64/arch/avx": ["-mavx", "-DBASE64_WITH_AVX"],
+        "base64/arch/ssse3": ["-mssse3"],
+        "base64/arch/sse41": ["-msse4.1"],
+        "base64/arch/sse42": ["-msse4.2"],
+        "base64/arch/avx2": ["-mavx2"],
+        "base64/arch/avx": ["-mavx"],
     },
     "msvc": {
-        "base64/arch/sse42": ["/arch:SSE4.2", "/DBASE64_WITH_SSE42"],
-        "base64/arch/avx2": ["/arch:AVX2", "/DBASE64_WITH_AVX2"],
-        "base64/arch/avx": ["/arch:AVX", "/DBASE64_WITH_AVX"],
+        "base64/arch/sse42": ["/arch:SSE4.2"],
+        "base64/arch/avx2": ["/arch:AVX2"],
+        "base64/arch/avx": ["/arch:AVX"],
     },
 }
 

mypyc/lib-rt/base64/config.h

@@ -1,17 +1,14 @@
 #ifndef BASE64_CONFIG_H
 #define BASE64_CONFIG_H
 
-#define HAVE_SSSE3 BASE64_WITH_SSSE3
-
-#define HAVE_SSE41 BASE64_WITH_SSE41
-
-#define HAVE_SSE42 BASE64_WITH_SSE42
-
-#define HAVE_AVX BASE64_WITH_AVX
-
-#define HAVE_AVX2 BASE64_WITH_AVX2
-
-#define HAVE_AVX512 BASE64_WITH_AVX512
+#if (defined(__x86_64__) && defined(__LP64__)) || defined(_M_X64)
+  #define HAVE_SSSE3 1
+  #define HAVE_SSE41 1
+  #define HAVE_SSE42 1
+  #define HAVE_AVX 1
+  #define HAVE_AVX2 1
+  #define HAVE_AVX512 0
+#endif
 
 #define BASE64_WITH_NEON32 0
 #define HAVE_NEON32 BASE64_WITH_NEON32

mypyc/lib-rt/setup.py

@@ -27,16 +27,16 @@
 
 EXTRA_FLAGS_PER_COMPILER_TYPE_PER_PATH_COMPONENT = {
     "unix": {
-        "base64/arch/ssse3": ["-mssse3", "-DBASE64_WITH_SSSE3"],
-        "base64/arch/sse41": ["-msse4.1", "-DBASE64_WITH_SSE41"],
-        "base64/arch/sse42": ["-msse4.2", "-DBASE64_WITH_SSE42"],
-        "base64/arch/avx2": ["-mavx2", "-DBASE64_WITH_AVX2"],
-        "base64/arch/avx": ["-mavx", "-DBASE64_WITH_AVX"],
+        "base64/arch/ssse3": ["-mssse3"],
+        "base64/arch/sse41": ["-msse4.1"],
+        "base64/arch/sse42": ["-msse4.2"],
+        "base64/arch/avx2": ["-mavx2"],
+        "base64/arch/avx": ["-mavx"],
     },
     "msvc": {
-        "base64/arch/sse42": ["/arch:SSE4.2", "/DBASE64_WITH_SSE42"],
-        "base64/arch/avx2": ["/arch:AVX2", "/DBASE64_WITH_AVX2"],
-        "base64/arch/avx": ["/arch:AVX", "/DBASE64_WITH_AVX"],
+        "base64/arch/sse42": ["/arch:SSE4.2"],
+        "base64/arch/avx2": ["/arch:AVX2"],
+        "base64/arch/avx": ["/arch:AVX"],
     },
 }