Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-101525: Fix make test if the --enable-bolt enabled #103574

Merged
merged 1 commit into from Apr 17, 2023

Conversation

corona10
Copy link
Member

@corona10 corona10 commented Apr 16, 2023

The make test failed without this change due to the already BOLTed binary.
Skip the BOLTrized process if the binary is already BOLTed.

$ make test
Rebuilding with profile guided optimizations:
rm -f profile-clean-stamp
make build_all CFLAGS_NODIST=" -fprofile-use -fprofile-correction" LDFLAGS_NODIST=""
make[1]: Entering directory '/home1/corona10/cpython'
./python -E -S -m sysconfig --generate-posix-vars ;\
if test $? -ne 0 ; then \
        echo "generate-posix-vars failed" ; \
        rm -f ./pybuilddir.txt ; \
        exit 1 ; \
fi
./python -E -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
The necessary bits to build these optional modules were not found:
nis
To find the necessary bits, look in configure.ac and config.log.

Checked 111 modules (30 built-in, 79 shared, 1 n/a on linux-x86_64, 0 disabled, 1 missing, 0 failed on import)
make[1]: Leaving directory '/home1/corona10/cpython'
rm -f *.fdata
/usr/local/bin/llvm-bolt ./python -instrument -instrumentation-file-append-pid -instrumentation-file=/home1/corona10/cpython/python.bolt -o python.bolt_inst
BOLT-INFO: Target architecture: x86_64
BOLT-INFO: BOLT version: 712dfec1781db8aa92782b98cac5517db548b7f9
/usr/local/bin/llvm-bolt: './python': BOLT-ERROR: input file was processed by BOLT. Cannot re-optimize.
make: *** [Makefile:827: bolt-opt] Error 1

I used the recommended approach to detect the BOLTed binary from the BOLT team.
llvm/llvm-project#60253

Copy link
Contributor

@erlend-aasland erlend-aasland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AC changes look good to me. For the Makefile changes, I trust you know what you are doing, because I don't :)

@corona10 corona10 merged commit 5d9762e into python:main Apr 17, 2023
20 checks passed
@corona10
Copy link
Member Author

AC changes look good to me. For the Makefile changes, I trust you know what you are doing, because I don't :)

Look like I got approval from the Erlend at SLC :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants