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.

Sign up for GitHub

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

Jump to bottom

ci: Enable opt-dist for dist-aarch64-linux builds #133807

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ci: Enable opt-dist for dist-aarch64-linux builds #133807

wants to merge 1 commit into from
+153 −56

Conversation

mrkajetanp
Copy link
Contributor

@mrkajetanp mrkajetanp commented Dec 3, 2024 •
edited by Kobzol
Loading

Move the CI dist-aarch64-linux job to an aarch64 runner and enable optimised dist builds with the opt-dist pipeline.

For the time being, disable bolt on aarch64 due to upstream bolt bugs.

r? @Kobzol
cc @lqd

try-job: dist-aarch64-linux

@mrkajetanp
ci: Enable opt-dist for dist-aarch64-linux builds
02b958d 
Move the CI dist-aarch64-linux job to an aarch64 runner and enable
optimised dist builds with the opt-dist pipeline.

For the time being, disable bolt on aarch64 due to upstream bolt bugs.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 3, 2024

Some changes occurred in src/tools/opt-dist

cc @Kobzol

@Kobzol
Copy link
Contributor

Kobzol commented Dec 3, 2024

Hi! Could you please split the part that moves the job to the aarch64 runner and the PGO/LTO part? So that we can evaluate the CI cost of these two actions separately. Thanks!

mrkajetanp
mrkajetanp commented Dec 3, 2024
View reviewed changes
src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile
Comment on lines +48 to +50
ENV SCRIPT python3 ../x.py build --set rust.debug=true opt-dist && \
./build/$HOSTS/stage0-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
--host $HOSTS --target $HOSTS --include-default-paths build-manifest bootstrap
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Either way this is a completely new dockerfile, so do you mean just replace this with a simple ./x dist call and then wrap it with opt-dist separately? Just in separate commits or separate PRs altogether?

Copy link
Contributor

Choose a reason for hiding this comment

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

I meant a separate PR, so that we can land these two changes (move to aarch64 host first, and then enable optimizations) separately :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense, just wanted to make sure - no problem :)

@lqd
Copy link
Member

lqd commented Dec 3, 2024

What improvements are you seeing with this PR, over the current artifacts?

@mrkajetanp
Copy link
Contributor Author

I've not yet benchmarked the changes, and I'm not sure how they compare to the artifacts from cross-compilation because I was only doing aarch64 runs but specifically adding opt-dist with LTO and PGO seems to increase the binary sizes of the main artifacts as follows:

librustc_driver-8c547d00f2ea16d5.so - 84M -> 94M
libLLVM.so.19.1-rust-1.85.0-nightly - 106M -> 108M
rustc -> 2.7M for both, +100 bytes

@Kobzol
Copy link
Contributor

Kobzol commented Dec 3, 2024

@bors try

Let's also see how long it takes with the optimizations.

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 3, 2024
@bors
Auto merge of rust-lang#133807 - mrkajetanp:ci-aarch64-opt-dist, r=<try>
b828608 
ci: Enable opt-dist for dist-aarch64-linux builds

Move the CI dist-aarch64-linux job to an aarch64 runner and enable optimised dist builds with the opt-dist pipeline.

For the time being, disable bolt on aarch64 due to upstream bolt bugs.

r? `@Kobzol`
cc `@lqd`
@bors
Copy link
Contributor

bors commented Dec 3, 2024

⌛ Trying commit 02b958d with merge b828608...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 3, 2024
@bors
Auto merge of rust-lang#133807 - mrkajetanp:ci-aarch64-opt-dist, r=<try>
945b9be 
ci: Enable opt-dist for dist-aarch64-linux builds

Move the CI dist-aarch64-linux job to an aarch64 runner and enable optimised dist builds with the opt-dist pipeline.

For the time being, disable bolt on aarch64 due to upstream bolt bugs.

r? `@Kobzol`
cc `@lqd`
@bors
Copy link
Contributor

bors commented Dec 3, 2024

⌛ Trying commit 02b958d with merge 945b9bea01ea3ae6cedcd3a28de69d560054a333...

@lqd
Copy link
Member

lqd commented Dec 3, 2024

That’s not going to be the good try job Jakub :3

@bors
Copy link
Contributor

bors commented Dec 3, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 3, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Dec 3, 2024

Ah, crap. Thanks!

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 3, 2024
@bors
Auto merge of rust-lang#133807 - mrkajetanp:ci-aarch64-opt-dist, r=<try>
d156b32 
ci: Enable opt-dist for dist-aarch64-linux builds

Move the CI dist-aarch64-linux job to an aarch64 runner and enable optimised dist builds with the opt-dist pipeline.

For the time being, disable bolt on aarch64 due to upstream bolt bugs.

r? `@Kobzol`
cc `@lqd`

try-job: dist-aarch64-linux
@bors
Copy link
Contributor

bors commented Dec 3, 2024

⌛ Trying commit 02b958d with merge d156b32c73dd32916f0ca83fb0104e600fbad49d...

@bors
Copy link
Contributor

bors commented Dec 4, 2024

☀️ Try build successful - checks-actions
Build commit: d156b32 (d156b32c73dd32916f0ca83fb0104e600fbad49d)

@mrkajetanp
Copy link
Contributor Author

So that's an extra hour for LTO+PGO without the cache. 2h22 vs 3h22.

@lqd
Copy link
Member

lqd commented Dec 4, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 4, 2024
@bors
Auto merge of rust-lang#133807 - mrkajetanp:ci-aarch64-opt-dist, r=<try>
ef33f24 
ci: Enable opt-dist for dist-aarch64-linux builds

Move the CI dist-aarch64-linux job to an aarch64 runner and enable optimised dist builds with the opt-dist pipeline.

For the time being, disable bolt on aarch64 due to upstream bolt bugs.

r? `@Kobzol`
cc `@lqd`

try-job: dist-aarch64-linux
@bors
Copy link
Contributor

bors commented Dec 4, 2024

⌛ Trying commit 02b958d with merge ef33f24...

@bors
Copy link
Contributor

bors commented Dec 4, 2024

☀️ Try build successful - checks-actions
Build commit: ef33f24 (ef33f249830d94b7afdb529458aae4052f14ca98)

@mrkajetanp
Copy link
Contributor Author

1h54 cached, not so bad. Back to roughly the same time as the x86 cross build then.
Completely outside of the CI costs conversations, these changes not making the overall turnaround time for bors longer than it is already is probably a nice bonus.

@lqd
Copy link
Member

lqd commented Dec 4, 2024

I assume good benchmark results can also help with the cost discussion.

@Kobzol
Copy link
Contributor

Kobzol commented Dec 4, 2024

Indeed! You can download the CI artifacts e.g. using rustup-toolchain-install-master and benchmark it locally using rustc-perf. It would be nice to see the perf. diff. Let me know on Zulip if you want help with that.

@mrkajetanp
Copy link
Contributor Author

rustup-toolchain-install-master

Huh TIL that this is a thing - very neat, thanks for the suggestion!

@mrkajetanp
Copy link
Contributor Author

mrkajetanp commented Dec 4, 2024 •
edited
Loading

Between these two builds, downloaded from the CI with rustup-toolchain-install-master, rustc-perf gives me:
Screenshot 2024-12-04 at 12 58 33 pm
Screenshot 2024-12-04 at 1 00 06 pm
All metrics with a mean improvement of 10-20%, the only thing that's worse is the artifact sizes, I already put the numbers for those in a previous comment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mrkajetanp @rustbot @Kobzol @lqd @bors