FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-101282: Apply BOLT optimisations to libpython for shared builds by indygreg · Pull Request #104709 · python/cpython · GitHub

/ cpython Public

gh-101282: Apply BOLT optimisations to libpython for shared builds - #104709

Merged
erlend-aasland merged 4 commits into
python:mainfrom
indygreg:rework-bolt
May 22, 2023
Merged

gh-101282: Apply BOLT optimisations to libpython for shared builds#104709
erlend-aasland merged 4 commits into
python:mainfrom
indygreg:rework-bolt

Conversation

indygreg commented May 20, 2023
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

(This change is a quick and dirty way to merge some of the build system improvements I'm proposing in gh-101093 before the 3.12 feature freeze. I wanted to scope bloat myself to fix some longstanding deficiencies in the build system around profile-guided builds. But I'm getting soft resistance to the reviews so close to the freeze deadline and it is obvious that we need a simpler solution to hit the 3.12 deadline. While this change is quick and dirty, it attempts to not make things worse.)

Before this change, we only applied bolt to the main python binary. After this change, we apply bolt to libpython if it is configured. In shared library builds, most of the C code is in libpython so it is critical to apply bolt to libpython to realize bolt benefits.

This change also reworks how bolt instrumentation is applied. It effectively removes the readelf based logic added in gh-101525 and replaces it with a mechanism that saves a copy of the pre-bolt binary and restores that copy when necessary. This allows us to perform bolt optimizations without having to manually delete the output binary to force a new bolt run.

We also add a new make target for purging bolt files and hook it up to clean so bolt state is purged when appropriate.

.gitignore rules have been added to ignore files related to bolt.

Before and after this refactor, make will no-op after a previous run. Both versions should also share common make DAG deficiencies where targets fail to trigger as often as they need to or can trigger prematurely in certain scenarios. e.g. after this change you may need to rm profile-bolt-stamp to force a bolt run because there aren't appropriate non-phony targets for bolt's make target to depend on. Fixing this is a non-trivial amount of work that will likely have to wait until the 3.13 window.

To make it easier to iterate on custom BOLT settings, the flags to pass to instrumentation and application are now defined in configure and can be overridden by passing BOLT_INSTRUMENT_FLAGS and BOLT_APPLY_FLAGS.

corona10 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Please update docs for BOLT_INSTRUMENT_FLAGS and BOLT_APPLY_FLAGS : https://docs.python.org/3.12/using/configure.html#performance-options

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

corona10 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Overall LGTM.

(This change is a quick and dirty way to merge some of the build system
improvements I'm proposing in pythongh-101093 before the 3.12 feature freeze.
I wanted to scope bloat myself to fix some longstanding deficiencies in
the build system around profile-guided builds. But I'm getting soft
resistance to the reviews so close to the freeze deadline and it is
obvious that we need a simpler solution to hit the 3.12 deadline. While
this change is quick and dirty, it attempts to not make things worse.)

Before this change, we only applied bolt to the main python binary.
After this change, we apply bolt to libpython if it is configured. In
shared library builds, most of the C code is in libpython so it is
critical to apply bolt to libpython to realize bolt benefits.

This change also reworks how bolt instrumentation is applied. It
effectively removes the readelf based logic added in pythongh-101525 and
replaces it with a mechanism that saves a copy of the pre-bolt binary
and restores that copy when necessary. This allows us to perform
bolt optimizations without having to manually delete the output binary
to force a new bolt run.

We also add a new make target for purging bolt files and hook it up
to `clean` so bolt state is purged when appropriate.

`.gitignore` rules have been added to ignore files related to bolt.

Before and after this refactor, `make` will no-op after a previous run.
Both versions should also share common make DAG deficiencies where
targets fail to trigger as often as they need to or can trigger
prematurely in certain scenarios. e.g. after this change you may need
to `rm profile-bolt-stamp` to force a bolt run because there aren't
appropriate non-phony targets for bolt's make target to depend on.
Fixing this is a non-trivial amount of work that will likely have to
wait until the 3.13 window.

To make it easier to iterate on custom BOLT settings, the flags to
pass to instrumentation and application are now defined in configure
and can be overridden by passing `BOLT_INSTRUMENT_FLAGS` and
`BOLT_APPLY_FLAGS`.

Copy link
Copy Markdown
Contributor Author

Please update docs for BOLT_INSTRUMENT_FLAGS and BOLT_APPLY_FLAGS : https://docs.python.org/3.12/using/configure.html#performance-options

Done in latest push.

erlend-aasland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I cleaned up the docs and AC code; hope you don't mind.

I left some questions. Regarding BOLT technical stuff, I lean on Dong-hee's review.

Comment thread .gitignore
Comment thread Makefile.pre.in
Comment thread Makefile.pre.in

erlend-aasland commented May 21, 2023
edited
Loading

Copy link
Copy Markdown
Contributor

Done in latest push.

We appreciate if you don't force-push:

  • It does not play very nice with the GitHub UX (messes up CI runs, commit history, review comments, etc.)
  • We often collaborate on PRs; pulling in new changes using git merge --no-ff is more friendly to our workflow

(This is also mentioned in the devguide.)

Comment thread configure.ac
erlend-aasland requested a review from corona10 May 22, 2023 11:37
erlend-aasland changed the title gh-101282: rework the BOLT build process gh-101282: Apply BOLT optimisations to libpython for shared builds May 22, 2023
erlend-aasland merged commit 5360cb3 into python:main May 22, 2023

Copy link
Copy Markdown
Contributor

Thanks, Greg and Dong-hee!

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants


Back | FazBrowse Home | New Git URL