Skip to content

Commit c511938

Browse files
zaniebzanieb
committed
Pass CFLAGS to the JIT
1 parent 7202f02 commit c511938

File tree

3 files changed

+159
-0
lines changed

3 files changed

+159
-0
lines changed

‎cpython-unix/build-cpython.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@ else
8383
patch -p1 -i ${ROOT}/patch-xopen-source-ios-legacy.patch
8484
fi
8585

86+
# Respect CFLAGS during JIT compilation.
87+
# Backports https://github.com/python/cpython/pull/134276
88+
if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_14}" ]; then
89+
patch -p1 -i ${ROOT}/patch-jit-cflags-314.patch
90+
elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
91+
patch -p1 -i ${ROOT}/patch-jit-cflags-313.patch
92+
93+
fi
94+
8695
# LIBTOOL_CRUFT is unused and breaks cross-compiling on macOS. Nuke it.
8796
# Submitted upstream at https://github.com/python/cpython/pull/101048.
8897
if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_11}" ]; then

‎cpython-unix/patch-jit-cflags-313.patch

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
diff --git a/Tools/jit/_targets.py b/Tools/jit/_targets.py
2+
index 50b5d923a35..4a71476026f 100644
3+
--- a/Tools/jit/_targets.py
4+
+++ b/Tools/jit/_targets.py
5+
@@ -10,6 +10,7 @@
6+
import sys
7+
import tempfile
8+
import typing
9+
+import shlex
10+
11+
import _llvm
12+
import _schema
13+
@@ -44,6 +45,17 @@ class _Target(typing.Generic[_S, _R]):
14+
stable: bool = False
15+
debug: bool = False
16+
verbose: bool = False
17+
+ cflags: str = ""
18+
+ known_symbols: dict[str, int] = dataclasses.field(default_factory=dict)
19+
+
20+
+ def _get_nop(self) -> bytes:
21+
+ if re.fullmatch(r"aarch64-.*", self.triple):
22+
+ nop = b"\x1f\x20\x03\xD5"
23+
+ elif re.fullmatch(r"x86_64-.*|i686.*", self.triple):
24+
+ nop = b"\x90"
25+
+ else:
26+
+ raise ValueError(f"NOP not defined for {self.triple}")
27+
+ return nop
28+
29+
def _compute_digest(self, out: pathlib.Path) -> str:
30+
hasher = hashlib.sha256()
31+
@@ -114,6 +126,7 @@ async def _compile(
32+
return _stencils.StencilGroup()
33+
o = tempdir / f"{opname}.o"
34+
args = [
35+
+ *shlex.split(self.cflags),
36+
f"--target={self.triple}",
37+
"-DPy_BUILD_CORE_MODULE",
38+
"-D_DEBUG" if self.debug else "-DNDEBUG",
39+
diff --git a/Tools/jit/build.py b/Tools/jit/build.py
40+
index 4a23c6f0afa..618b53804db 100644
41+
--- a/Tools/jit/build.py
42+
+++ b/Tools/jit/build.py
43+
@@ -22,7 +22,11 @@
44+
parser.add_argument(
45+
"-v", "--verbose", action="store_true", help="echo commands as they are run"
46+
)
47+
+ parser.add_argument(
48+
+ "--with-cflags", help="additional flags to pass to the compiler", default=""
49+
+ )
50+
args = parser.parse_args()
51+
args.target.debug = args.debug
52+
args.target.verbose = args.verbose
53+
+ args.target.cflags = args.with_cflags
54+
args.target.build(pathlib.Path.cwd(), comment=comment, force=args.force)
55+
diff --git a/configure b/configure
56+
index 1cd1f690f7b..7fb6c4adfea 100755
57+
--- a/configure
58+
+++ b/configure
59+
@@ -8326,7 +8326,7 @@ then :
60+
61+
else $as_nop
62+
as_fn_append CFLAGS_NODIST " $jit_flags"
63+
- REGEN_JIT_COMMAND="\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host"
64+
+ REGEN_JIT_COMMAND="\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host --with-cflags=\"\$(CONFIGURE_CFLAGS)\""
65+
JIT_STENCILS_H="jit_stencils.h"
66+
if test "x$Py_DEBUG" = xtrue
67+
then :
68+
diff --git a/configure.ac b/configure.ac
69+
index 3fcb18922c5..616999a96b2 100644
70+
--- a/configure.ac
71+
+++ b/configure.ac
72+
@@ -1846,7 +1846,7 @@ AS_VAR_IF([jit_flags],
73+
[],
74+
[AS_VAR_APPEND([CFLAGS_NODIST], [" $jit_flags"])
75+
AS_VAR_SET([REGEN_JIT_COMMAND],
76+
- ["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host"])
77+
+ ["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host --with-cflags=\"\$(CONFIGURE_CFLAGS)\""])
78+
AS_VAR_SET([JIT_STENCILS_H], ["jit_stencils.h"])
79+
AS_VAR_IF([Py_DEBUG],
80+
[true],

‎cpython-unix/patch-jit-cflags-314.patch

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
diff --git a/Tools/jit/_targets.py b/Tools/jit/_targets.py
2+
index b3b065652e0..d361f57382e 100644
3+
--- a/Tools/jit/_targets.py
4+
+++ b/Tools/jit/_targets.py
5+
@@ -10,6 +10,7 @@
6+
import sys
7+
import tempfile
8+
import typing
9+
+import shlex
10+
11+
import _llvm
12+
import _schema
13+
@@ -42,6 +43,7 @@ class _Target(typing.Generic[_S, _R]):
14+
stable: bool = False
15+
debug: bool = False
16+
verbose: bool = False
17+
+ cflags: str = ""
18+
known_symbols: dict[str, int] = dataclasses.field(default_factory=dict)
19+
20+
def _get_nop(self) -> bytes:
21+
@@ -115,6 +117,7 @@ async def _compile(
22+
) -> _stencils.StencilGroup:
23+
o = tempdir / f"{opname}.o"
24+
args = [
25+
+ *shlex.split(self.cflags),
26+
f"--target={self.triple}",
27+
"-DPy_BUILD_CORE_MODULE",
28+
"-D_DEBUG" if self.debug else "-DNDEBUG",
29+
diff --git a/Tools/jit/build.py b/Tools/jit/build.py
30+
index a8cb0f67c36..663874ad439 100644
31+
--- a/Tools/jit/build.py
32+
+++ b/Tools/jit/build.py
33+
@@ -22,7 +22,11 @@
34+
parser.add_argument(
35+
"-v", "--verbose", action="store_true", help="echo commands as they are run"
36+
)
37+
+ parser.add_argument(
38+
+ "--with-cflags", help="additional flags to pass to the compiler", default=""
39+
+ )
40+
args = parser.parse_args()
41+
args.target.debug = args.debug
42+
args.target.verbose = args.verbose
43+
+ args.target.cflags = args.with_cflags
44+
args.target.build(pathlib.Path.cwd(), comment=comment, force=args.force)
45+
diff --git a/configure b/configure
46+
index 1b75ddfa26d..3c9e550b5d3 100755
47+
--- a/configure
48+
+++ b/configure
49+
@@ -8399,7 +8399,7 @@ then :
50+
51+
else case e in #(
52+
e) as_fn_append CFLAGS_NODIST " $jit_flags"
53+
- REGEN_JIT_COMMAND="\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host"
54+
+ REGEN_JIT_COMMAND="\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host --with-cflags=\"\$(CONFIGURE_CFLAGS)\""
55+
JIT_STENCILS_H="jit_stencils.h"
56+
if test "x$Py_DEBUG" = xtrue
57+
then :
58+
diff --git a/configure.ac b/configure.ac
59+
index c449bb5ebb3..5f9d08a4ee7 100644
60+
--- a/configure.ac
61+
+++ b/configure.ac
62+
@@ -1827,7 +1827,7 @@ AS_VAR_IF([jit_flags],
63+
[],
64+
[AS_VAR_APPEND([CFLAGS_NODIST], [" $jit_flags"])
65+
AS_VAR_SET([REGEN_JIT_COMMAND],
66+
- ["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host"])
67+
+ ["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py $host --with-cflags=\"\$(CONFIGURE_CFLAGS)\""])
68+
AS_VAR_SET([JIT_STENCILS_H], ["jit_stencils.h"])
69+
AS_VAR_IF([Py_DEBUG],
70+
[true],

0 commit comments

Comments
 (0)