reorg flag setting

Author: mr-c

mypyc/build_setup.py

@@ -3,7 +3,7 @@
 
 try:
     # Import setuptools so that it monkey-patch overrides distutils
-    import setuptools
+    import setuptools  # noqa: F401
 except ImportError:
     pass
 
@@ -15,16 +15,16 @@
 
 EXTRA_FLAGS_PER_COMPILER_TYPE_PER_PATH_COMPONENT = {
     "unix": {
-        "base64/arch/ssse3": "-mssse3",
-        "base64/arch/sse41": "-msse4.1",
-        "base64/arch/sse42": "-msse4.2",
-        "base64/arch/avx2": "-mavx2",
-        "base64/arch/avx": "-mavx",
+        "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"],
     },
     "msvc": {
-        "base64/arch/sse42": "/arch:SSE4.2",
-        "base64/arch/avx2": "/arch:AVX2",
-        "base64/arch/avx": "/arch:AVX",
+        "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"],
     },
 }
 
@@ -47,11 +47,13 @@ def spawn(self, cmd, **kwargs) -> None:  # type: ignore[no-untyped-def]
             for path in extra_options.keys():
                 if path in str(argument):
                     if compiler_type == "bcpp":
+                        compiler = new_cmd.pop()
                         # Borland accepts a source file name at the end,
                         # insert the options before it
-                        new_cmd[-1:-1] = extra_options[path]
+                        new_cmd.extend(extra_options[path])
+                        new_cmd.append(compiler)
                     else:
-                        new_cmd.append(extra_options[path])
+                        new_cmd.extend(extra_options[path])
 
                     # path component is found, no need to search any further
                     break

mypyc/lib-rt/base64/config.h

@@ -1,22 +1,16 @@
 #ifndef BASE64_CONFIG_H
 #define BASE64_CONFIG_H
 
-#define BASE64_WITH_SSSE3 1
 #define HAVE_SSSE3 BASE64_WITH_SSSE3
 
-#define BASE64_WITH_SSE41 1
 #define HAVE_SSE41 BASE64_WITH_SSE41
 
-#define BASE64_WITH_SSE42 1
 #define HAVE_SSE42 BASE64_WITH_SSE42
 
-#define BASE64_WITH_AVX 1
 #define HAVE_AVX BASE64_WITH_AVX
 
-#define BASE64_WITH_AVX2 1
 #define HAVE_AVX2 BASE64_WITH_AVX2
 
-#define BASE64_WITH_AVX512 0
 #define HAVE_AVX512 BASE64_WITH_AVX512
 
 #define BASE64_WITH_NEON32 0

mypyc/lib-rt/setup.py

@@ -27,16 +27,16 @@
 
 EXTRA_FLAGS_PER_COMPILER_TYPE_PER_PATH_COMPONENT = {
     "unix": {
-        "base64/arch/ssse3": "-mssse3",
-        "base64/arch/sse41": "-msse4.1",
-        "base64/arch/sse42": "-msse4.2",
-        "base64/arch/avx2": "-mavx2",
-        "base64/arch/avx": "-mavx",
+        "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"],
     },
     "msvc": {
-        "base64/arch/sse42": "/arch:SSE4.2",
-        "base64/arch/avx2": "/arch:AVX2",
-        "base64/arch/avx": "/arch:AVX",
+        "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"],
     },
 }
 
@@ -59,11 +59,13 @@ def spawn(self, cmd, **kwargs) -> None:  # type: ignore[no-untyped-def]
             for path in extra_options.keys():
                 if path in str(argument):
                     if compiler_type == "bcpp":
+                        compiler = new_cmd.pop()
                         # Borland accepts a source file name at the end,
                         # insert the options before it
-                        new_cmd[-1:-1] = extra_options[path]
+                        new_cmd.extend(extra_options[path])
+                        new_cmd.append(compiler)
                     else:
-                        new_cmd.append(extra_options[path])
+                        new_cmd.extend(extra_options[path])
 
                     # path component is found, no need to search any further
                     break