mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 336f8ed2ee into a273bc99d2

Browse source
This commit is contained in:
stratakis 2025-12-23 01:01:57 -05:00 • committed by GitHub
commit c20634b492
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 194 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Build/2025-12-17-01-14-21.gh-issue-101525.DIP-BH.rst Normal file
View file

@ -0,0 +1,2 @@
Determine if we need to skip optimizations of functions with computed gotos
during BOLT runs, depending on the llvm version and the compilation options.

94
configure generated vendored
View file

@ -9294,6 +9294,39 @@ printf "%s\n" "\"Found llvm-bolt\"" >&6; }
as_fn_error $? "llvm-bolt is required for a --enable-bolt build but could not be found." "$LINENO" 5
fi
# Check for packed relocations (-Wl,-z,pack-relative-relocs) which use DT_RELR format.
# BOLT has issues analyzing these compact relocations.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for packed relocations in LDFLAGS" >&5
printf %s "checking for packed relocations in LDFLAGS... " >&6; }
has_packed_relocs="no"
case "$LDFLAGS $LDFLAGS_NODIST" in
*-Wl,-z,pack-relative-relocs*)
has_packed_relocs="yes"
;;
esac
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $has_packed_relocs" >&5
printf "%s\n" "$has_packed_relocs" >&6; }
# Check BOLT version if it's < 21.1.0, to determine if we need to skip functions with computed gotos.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking llvm-bolt version" >&5
printf %s "checking llvm-bolt version... " >&6; }
llvm_bolt_version=$("${LLVM_BOLT}" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${llvm_bolt_version}" >&5
printf "%s\n" "${llvm_bolt_version}" >&6; }
# Parse version
llvm_bolt_major=$(echo "${llvm_bolt_version}" | cut -d. -f1)
llvm_bolt_minor=$(echo "${llvm_bolt_version}" | cut -d. -f2)
bolt_need_skip_computed_goto="yes"
if test -n "${llvm_bolt_major}" && test "${llvm_bolt_major}" -ge 21; then
if test "${llvm_bolt_major}" -gt 21 || test "${llvm_bolt_minor}" -ge 1; then
bolt_need_skip_computed_goto="no"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LLVM ${llvm_bolt_version} supports computed gotos" >&5
printf "%s\n" "LLVM ${llvm_bolt_version} supports computed gotos" >&6; }
fi
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}merge-fdata", so it can be a program name with args.
@ -9429,9 +9462,68 @@ fi
printf %s "checking BOLT_COMMON_FLAGS... " >&6; }
if test -z "${BOLT_COMMON_FLAGS}"
then
BOLT_COMMON_FLAGS=" -update-debug-sections -skip-funcs=_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1,sre_ucs1_match.lto_priv.0/1,sre_ucs2_match.lto_priv.0/1,sre_ucs4_match.lto_priv.0/1 "
BOLT_COMMON_FLAGS=" -update-debug-sections "
if test "${bolt_need_skip_computed_goto}" = "yes"; then
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS} -skip-funcs=_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1"
if test "${has_packed_relocs}" != "yes" && test "${ac_cv_cc_name}" = "gcc" && test "${with_lto}" != "no" && test -n "${with_lto}"; then
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS},sre_ucs1_match.lto_priv.0/1,sre_ucs2_match.lto_priv.0/1,sre_ucs4_match.lto_priv.0/1"
fi
fi
if test "${has_packed_relocs}" = "yes"; then
bolt_base="_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1"
bolt_sre_lto="sre_ucs1_match.lto_priv.0/1,sre_ucs2_match.lto_priv.0/1,sre_ucs4_match.lto_priv.0/1"
bolt_all_lto="_PyEval_EvalFrameDefault.lto_priv.0/1,${bolt_sre_lto}"
case "${ac_cv_cc_name}" in
gcc)
bolt_skip_list=""
bolt_need_base=$( (test "${bolt_need_skip_computed_goto}" != "yes" && test "${enable_shared}" = "yes") && echo "yes" || echo "no")
bolt_need_lto=$( (test "${with_lto}" != "no" && test -n "${with_lto}") && echo "yes" || echo "no")
bolt_need_pgo=$( (test "${enable_optimizations}" = "yes" && test "${enable_shared}" = "yes") && echo "yes" || echo "no")
test "${bolt_need_base}" = "yes" && bolt_skip_list="${bolt_base}"
if test "${bolt_need_lto}" = "yes"; then
if test "${enable_shared}" = "yes"; then
test -n "${bolt_skip_list}" && bolt_skip_list="${bolt_skip_list},"
bolt_skip_list="${bolt_skip_list}${bolt_all_lto}"
elif test "${bolt_need_skip_computed_goto}" != "yes"; then
bolt_skip_list="${bolt_all_lto}"
else
test -n "${bolt_skip_list}" && bolt_skip_list="${bolt_skip_list},"
bolt_skip_list="${bolt_skip_list}${bolt_all_lto}"
fi
fi
if test "${bolt_need_pgo}" = "yes"; then
test -n "${bolt_skip_list}" && bolt_skip_list="${bolt_skip_list},"
if test "${bolt_need_lto}" = "yes"; then
bolt_skip_list="${bolt_skip_list}_PyEval_EvalFrameDefault.localalias.lto_priv.0/1"
else
bolt_skip_list="${bolt_skip_list}_PyEval_EvalFrameDefault.localalias/1"
fi
fi
if test -n "${bolt_skip_list}"; then
if test "${bolt_need_skip_computed_goto}" = "yes"; then
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS},${bolt_skip_list}"
else
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS} -skip-funcs=${bolt_skip_list}"
fi
fi
;;
clang*)
if test "${bolt_need_skip_computed_goto}" != "yes"; then
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS} -skip-funcs=${bolt_base}"
fi
;;
esac
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BOLT_COMMON_FLAGS" >&5
printf "%s\n" "$BOLT_COMMON_FLAGS" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking BOLT_INSTRUMENT_FLAGS" >&5

105
configure.ac
View file

@ -2142,6 +2142,34 @@ if test "$Py_BOLT" = 'true' ; then
AC_MSG_ERROR([llvm-bolt is required for a --enable-bolt build but could not be found.])
fi
# Check for packed relocations (-Wl,-z,pack-relative-relocs) which use DT_RELR format.
# BOLT has issues analyzing these compact relocations.
AC_MSG_CHECKING([for packed relocations in LDFLAGS])
has_packed_relocs="no"
case "$LDFLAGS $LDFLAGS_NODIST" in
*-Wl,-z,pack-relative-relocs*)
has_packed_relocs="yes"
;;
esac
AC_MSG_RESULT([$has_packed_relocs])
# Check BOLT version if it's < 21.1.0, to determine if we need to skip functions with computed gotos.
AC_MSG_CHECKING([llvm-bolt version])
llvm_bolt_version=$("${LLVM_BOLT}" --version 2>/dev/null | grep -oE '[[0-9]]+\.[[0-9]]+\.[[0-9]]+' | head -1)
AC_MSG_RESULT([${llvm_bolt_version}])
# Parse version
llvm_bolt_major=$(echo "${llvm_bolt_version}" | cut -d. -f1)
llvm_bolt_minor=$(echo "${llvm_bolt_version}" | cut -d. -f2)
bolt_need_skip_computed_goto="yes"
if test -n "${llvm_bolt_major}" && test "${llvm_bolt_major}" -ge 21; then
if test "${llvm_bolt_major}" -gt 21 || test "${llvm_bolt_minor}" -ge 1; then
bolt_need_skip_computed_goto="no"
AC_MSG_RESULT([LLVM ${llvm_bolt_version} supports computed gotos])
fi
fi
AC_SUBST([MERGE_FDATA])
AC_PATH_TOOL([MERGE_FDATA], [merge-fdata], [''], [${llvm_path}])
if test -n "${MERGE_FDATA}" -a -x "${MERGE_FDATA}"
@ -2171,15 +2199,80 @@ then
[BOLT_COMMON_FLAGS],
[m4_normalize("
[-update-debug-sections]
dnl At least LLVM 19.x doesn't support computed gotos in PIC compiled code.
dnl Exclude functions containing computed gotos.
dnl TODO this may be fixed in LLVM 20.x via https://github.com/llvm/llvm-project/pull/120267.
dnl GCC's LTO creates .lto_priv.0 clones of these functions.
[-skip-funcs=_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1,sre_ucs1_match.lto_priv.0/1,sre_ucs2_match.lto_priv.0/1,sre_ucs4_match.lto_priv.0/1]
")]
)
dnl BOLT versions before LLVM 21.1.0 don't support computed gotos in PIC compiled code.
dnl Exclude functions containing computed gotos for older versions.
dnl Fixed in LLVM 21.1.0+ via https://github.com/llvm/llvm-project/pull/120267
if test "${bolt_need_skip_computed_goto}" = "yes"; then
dnl Skip base computed goto functions
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS} -skip-funcs=_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1"
dnl GCC's LTO creates .lto_priv.0 clones that also need to be skipped
dnl Skip if packed relocs not present.
if test "${has_packed_relocs}" != "yes" && test "${ac_cv_cc_name}" = "gcc" && test "${with_lto}" != "no" && test -n "${with_lto}"; then
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS},sre_ucs1_match.lto_priv.0/1,sre_ucs2_match.lto_priv.0/1,sre_ucs4_match.lto_priv.0/1"
fi
fi
dnl When packed relocations are used, BOLT cannot properly
dnl analyze the DT_RELR format. Build skip list for functions that fail with packed relocs.
if test "${has_packed_relocs}" = "yes"; then
bolt_base="_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1"
bolt_sre_lto="sre_ucs1_match.lto_priv.0/1,sre_ucs2_match.lto_priv.0/1,sre_ucs4_match.lto_priv.0/1"
bolt_all_lto="_PyEval_EvalFrameDefault.lto_priv.0/1,${bolt_sre_lto}"
case "${ac_cv_cc_name}" in
gcc)
dnl GCC's LTO creates .lto_priv.0 variants; PGO creates .localalias variants (in shared builds)
bolt_skip_list=""
dnl Determine what to include based on build configuration
bolt_need_base=$( (test "${bolt_need_skip_computed_goto}" != "yes" && test "${enable_shared}" = "yes") && echo "yes" || echo "no")
bolt_need_lto=$( (test "${with_lto}" != "no" && test -n "${with_lto}") && echo "yes" || echo "no")
bolt_need_pgo=$( (test "${enable_optimizations}" = "yes" && test "${enable_shared}" = "yes") && echo "yes" || echo "no")
dnl Build the skip list $bolt_skip_list
test "${bolt_need_base}" = "yes" && bolt_skip_list="${bolt_base}"
if test "${bolt_need_lto}" = "yes"; then
if test "${enable_shared}" = "yes"; then
test -n "${bolt_skip_list}" && bolt_skip_list="${bolt_skip_list},"
bolt_skip_list="${bolt_skip_list}${bolt_all_lto}"
elif test "${bolt_need_skip_computed_goto}" != "yes"; then
bolt_skip_list="${bolt_all_lto}"
else
dnl BOLT < 21.1.0 + static: need to add LTO variants
test -n "${bolt_skip_list}" && bolt_skip_list="${bolt_skip_list},"
bolt_skip_list="${bolt_skip_list}${bolt_all_lto}"
fi
fi
if test "${bolt_need_pgo}" = "yes"; then
test -n "${bolt_skip_list}" && bolt_skip_list="${bolt_skip_list},"
if test "${bolt_need_lto}" = "yes"; then
bolt_skip_list="${bolt_skip_list}_PyEval_EvalFrameDefault.localalias.lto_priv.0/1"
else
bolt_skip_list="${bolt_skip_list}_PyEval_EvalFrameDefault.localalias/1"
fi
fi
dnl Apply the skip list to BOLT_COMMON_FLAGS
if test -n "${bolt_skip_list}"; then
if test "${bolt_need_skip_computed_goto}" = "yes"; then
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS},${bolt_skip_list}"
else
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS} -skip-funcs=${bolt_skip_list}"
fi
fi
;;
clang*)
if test "${bolt_need_skip_computed_goto}" != "yes"; then
BOLT_COMMON_FLAGS="${BOLT_COMMON_FLAGS} -skip-funcs=${bolt_base}"
fi
;;
esac
fi
fi
AC_MSG_RESULT([$BOLT_COMMON_FLAGS])
AC_ARG_VAR(
[BOLT_INSTRUMENT_FLAGS],