[3.12] gh-128437: Add BOLT_COMMON_FLAGS with -update-debug-sections (gh-128455) (gh-128513)

gh-128437: Add `BOLT_COMMON_FLAGS` with `-update-debug-sections` (gh-128455)

Add `BOLT_COMMON_FLAGS` with `-update-debug-sections`

(cherry picked from commit b60044b838)

Co-authored-by: Zanie Blue <contact@zanie.dev>
Co-authored-by: Gregory Szorc <gregory.szorc@gmail.com>
This commit is contained in:
Miss Islington (bot) 2025-01-05 10:23:04 +01:00 committed by GitHub
parent 06e4173393
commit 90535fe021
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 4 deletions

18
configure generated vendored
View file

@ -912,6 +912,7 @@ CFLAGS_ALIASING
OPT
BOLT_APPLY_FLAGS
BOLT_INSTRUMENT_FLAGS
BOLT_COMMON_FLAGS
BOLT_BINARIES
MERGE_FDATA
LLVM_BOLT
@ -1134,6 +1135,7 @@ CPPFLAGS
CPP
HOSTRUNNER
PROFILE_TASK
BOLT_COMMON_FLAGS
BOLT_INSTRUMENT_FLAGS
BOLT_APPLY_FLAGS
LIBUUID_CFLAGS
@ -1947,6 +1949,8 @@ Some influential environment variables:
HOSTRUNNER Program to run CPython for the host platform
PROFILE_TASK
Python args for PGO generation task
BOLT_COMMON_FLAGS
Common arguments to llvm-bolt when instrumenting and applying
BOLT_INSTRUMENT_FLAGS
Arguments to llvm-bolt when instrumenting binaries
BOLT_APPLY_FLAGS
@ -9156,11 +9160,21 @@ then :
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking BOLT_COMMON_FLAGS" >&5
printf %s "checking BOLT_COMMON_FLAGS... " >&6; }
if test -z "${BOLT_COMMON_FLAGS}"
then
BOLT_COMMON_FLAGS=-update-debug-sections
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking BOLT_INSTRUMENT_FLAGS" >&5
printf %s "checking BOLT_INSTRUMENT_FLAGS... " >&6; }
if test -z "${BOLT_INSTRUMENT_FLAGS}"
then
BOLT_INSTRUMENT_FLAGS=
BOLT_INSTRUMENT_FLAGS="${BOLT_COMMON_FLAGS}"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BOLT_INSTRUMENT_FLAGS" >&5
printf "%s\n" "$BOLT_INSTRUMENT_FLAGS" >&6; }
@ -9170,7 +9184,7 @@ printf "%s\n" "$BOLT_INSTRUMENT_FLAGS" >&6; }
printf %s "checking BOLT_APPLY_FLAGS... " >&6; }
if test -z "${BOLT_APPLY_FLAGS}"
then
BOLT_APPLY_FLAGS=" -update-debug-sections -reorder-blocks=ext-tsp -reorder-functions=cdsort -split-functions -icf=1 -inline-all -split-eh -reorder-functions-use-hot-size -peepholes=none -jump-tables=aggressive -inline-ap -indirect-call-promotion=all -dyno-stats -use-gnu-stack -frame-opt=hot "
BOLT_APPLY_FLAGS=" ${BOLT_COMMON_FLAGS} -reorder-blocks=ext-tsp -reorder-functions=cdsort -split-functions -icf=1 -inline-all -split-eh -reorder-functions-use-hot-size -peepholes=none -jump-tables=aggressive -inline-ap -indirect-call-promotion=all -dyno-stats -use-gnu-stack -frame-opt=hot "
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BOLT_APPLY_FLAGS" >&5

View file

@ -2104,6 +2104,20 @@ AS_VAR_IF([enable_shared], [yes], [
BOLT_BINARIES="${BOLT_BINARIES} \$(INSTSONAME)"
])
AC_ARG_VAR(
[BOLT_COMMON_FLAGS],
[Common arguments to llvm-bolt when instrumenting and applying]
)
AC_MSG_CHECKING([BOLT_COMMON_FLAGS])
if test -z "${BOLT_COMMON_FLAGS}"
then
AS_VAR_SET(
[BOLT_COMMON_FLAGS],
[-update-debug-sections]
)
fi
AC_ARG_VAR(
[BOLT_INSTRUMENT_FLAGS],
[Arguments to llvm-bolt when instrumenting binaries]
@ -2111,7 +2125,7 @@ AC_ARG_VAR(
AC_MSG_CHECKING([BOLT_INSTRUMENT_FLAGS])
if test -z "${BOLT_INSTRUMENT_FLAGS}"
then
BOLT_INSTRUMENT_FLAGS=
BOLT_INSTRUMENT_FLAGS="${BOLT_COMMON_FLAGS}"
fi
AC_MSG_RESULT([$BOLT_INSTRUMENT_FLAGS])
@ -2125,7 +2139,7 @@ then
AS_VAR_SET(
[BOLT_APPLY_FLAGS],
[m4_normalize("
-update-debug-sections
${BOLT_COMMON_FLAGS}
-reorder-blocks=ext-tsp
-reorder-functions=cdsort
-split-functions