Skip to content

Download, rather than sccache-cache, LLVM in CI#99967

Merged
bors merged 4 commits intorust-lang:masterfrom
Mark-Simulacrum:download-llvm-ci
Aug 21, 2022
Merged

Download, rather than sccache-cache, LLVM in CI#99967
bors merged 4 commits intorust-lang:masterfrom
Mark-Simulacrum:download-llvm-ci

Conversation

@Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jul 30, 2022 •
edited
Loading

My hope/expectation is that we can do better than sccache in CI for cached builds -- currently it looks like on macOS those still take upwards of 10-11 minutes, which is a significant amount of time that we could potentially cut.

This enables this mode for all non-dist builders; this should avoid any problems with the artifacts we distribute, while also providing for faster test builders (since they'll make use of PGO'd LLVM on the platforms we do that on, which is hopefully a nice win). It slightly increases the chance of test builders starting to fail only after a PR is merged (if PGO changes runtime behavior), but that should hopefully never happen, so I think this is worthwhile.

Measurements on the PR for apple-1 don't show any noticeable improvement in CI times, but those can be pretty noisy -- I'm inclined to land this since it should pretty much always be better and we can reconsider if that ever turns out not to be the case.

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jul 30, 2022
@bors
Copy link
Collaborator

bors commented Jul 31, 2022

☔ The latest upstream changes (presumably #99529) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 31, 2022
@jyn514
Copy link
Member

jyn514 commented Jul 31, 2022

Noticed that this changed a bunch of different dockerfiles - I remember @pietroalbini suggesting a while ago that we could use named profiles (like the ones in x.py setup) for CI, maybe that would help reduce the burden here? I'm willing to put some time into that.

@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Jul 31, 2022

Note that this is just changing the CI config (we don't use docker on mac or windows).

Ultimately I think in this case if this works I'll stick it in src/ci/run.sh gated by isMacos or something like that, so I'm not too worried about this being gated on profiles of any kind.

@Mark-Simulacrum Mark-Simulacrum force-pushed the download-llvm-ci branch 2 times, most recently from a6c02e5 to 0dac895 Compare July 31, 2022 21:49
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Aug 1, 2022

r? @jyn514

This shouldn't be r+'d as is but I'll hold off on actually dropping the do not merge commit until we finish with any changes you suggest, so that we can actually test this change seems to work.

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 1, 2022
jyn514
jyn514 approved these changes Aug 1, 2022
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

This is awesome! Would be very curious to see how much time it saves :)

It also makes me wonder if we can do the same for download-rustc - most PRs will modify compiler/, but we already have if-unchanged and I think @rylev has suggested "library only rollups" that would make it a lot more common to be able to reuse the cache. Future work though, llvm is already a great first step :)

@jyn514
Copy link
Member

jyn514 commented Aug 1, 2022 •
edited
Loading

It also makes me wonder if we can do the same for download-rustc

Related: I've been seeing various emails between Joel Marcey and @pietroalbini about how we use a truly enomous amount of S3 credits on static.rlo, I wonder if we could save in costs by redirecting downloads for rustc.tar.gz to the last time the tarball was modified, rather than reuploading it on each nightly. That seems maybe less worth the effort though, since usually some PR will modify compiler/ on any given day. Could maybe do it for other large components though, something to look into.

@Mark-Simulacrum Mark-Simulacrum force-pushed the download-llvm-ci branch 2 times, most recently from bf83297 to 28e70ad Compare August 1, 2022 12:38
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Aug 1, 2022

Presuming CI passes I think this should be good for another review and presuming that looks good, I'll drop the apple-1 commit.

@jyn514
Copy link
Member

jyn514 commented Aug 1, 2022

Looks great! r=me with the last commit dropped :) very excited to see how much time this saves

@jyn514 jyn514 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 Aug 1, 2022
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Aug 1, 2022

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Aug 1, 2022

📌 Commit 197218b10d2d87c902d83623ed05f29f4011b23f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 1, 2022
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Aug 1, 2022

@bors r- r=jyn514

@bors
Copy link
Collaborator

bors commented Aug 1, 2022

📌 Commit 197218b10d2d87c902d83623ed05f29f4011b23f has been approved by jyn514

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 16, 2022

📌 Commit a7abaaa146d457fa8d96dbf12205b679b8f459dd has been approved by jyn514

It is now in the queue for this repository.

@Dylan-DPC
Copy link
Member

Dylan-DPC commented Aug 19, 2022

@bors retry

@Dylan-DPC
Copy link
Member

Dylan-DPC commented Aug 19, 2022

@bors ping

@bors
Copy link
Collaborator

bors commented Aug 19, 2022

😪 I'm awake I'm awake

@Dylan-DPC
Copy link
Member

Dylan-DPC commented Aug 19, 2022

@bors r=jyn514

@bors
Copy link
Collaborator

bors commented Aug 19, 2022

📌 Commit ed5f1baf7ec4e286e52cf497fbb733fbf159cb63 has been approved by jyn514

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 19, 2022

⌛ Testing commit ed5f1baf7ec4e286e52cf497fbb733fbf159cb63 with merge 8c90837f3848727f5bc0e5eb806231bcdd47e301...

@bors
Copy link
Collaborator

bors commented Aug 19, 2022

💔 Test failed - checks-actions

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Minor refactoring
2769d6b
@Mark-Simulacrum
Refactor if-available setting to work in CI
8ca14aa 
This verifies if the HEAD sha matches with the detected LLVM SHA, and if not,
permits usage of the detected LLVM. Otherwise, we fallback on regular
non-downloaded LLVM (currently still cached with sccache, though that's still
10+ minutes on macOS).
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Aug 19, 2022

@bors r=jyn514 rollup=never

@bors
Copy link
Collaborator

bors commented Aug 19, 2022

📌 Commit ec09f02e221cb57d8f35a49cb11c5bacb9c619d0 has been approved by jyn514

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 19, 2022

⌛ Testing commit ec09f02e221cb57d8f35a49cb11c5bacb9c619d0 with merge bc26f7fb5b85c73b6a523859d101320571d72a9b...

@bors
Copy link
Collaborator

bors commented Aug 19, 2022

💔 Test failed - checks-actions

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Enable downloading prebuilt LLVM in test builders
6c7f301 
See comment added for details on the test builder restriction. This is primarily
intended for macOS CI, but is likely to be a slight win on other builders too.
@Mark-Simulacrum
Add global safe.directory for CI
d7b91c3
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Aug 20, 2022

@bors r=jyn514 rollup=never

@bors
Copy link
Collaborator

bors commented Aug 20, 2022

📌 Commit d7b91c3 has been approved by jyn514

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 20, 2022

⌛ Testing commit d7b91c3 with merge fb80d2b...

@bors
Copy link
Collaborator

bors commented Aug 21, 2022

☀️ Test successful - checks-actions
Approved by: jyn514
Pushing fb80d2b to master...

This was referenced Aug 21, 2022
Merged
Merged
Merged
Merged
@rust-timer
Copy link
Collaborator

rust-timer commented Aug 21, 2022

Finished benchmarking commit (fb80d2b): comparison url.

Instruction count

  • Primary benchmarks: ❌ relevant regression found
  • Secondary benchmarks: no relevant changes found
mean1 max count2
Regressions ❌
(primary)		 0.9% 0.9% 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.9% 0.9% 1

Max RSS (memory usage)

Results
  • Primary benchmarks: ✅ relevant improvement found
  • Secondary benchmarks: ✅ relevant improvements found
mean1 max count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.1% -2.1% 1
Improvements ✅
(secondary)		 -2.6% -2.9% 2
All ❌✅ (primary) -2.1% -2.1% 1

Cycles

Results
  • Primary benchmarks: ❌ relevant regression found
  • Secondary benchmarks: no relevant changes found
mean1 max count2
Regressions ❌
(primary)		 2.0% 2.0% 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.0% 2.0% 1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@jyn514
Copy link
Member

jyn514 commented Aug 21, 2022

🎉 🎉

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Oct 29, 2022
Merged
@ehuss ehuss mentioned this pull request Jul 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jyn514 jyn514 jyn514 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jyn514 jyn514

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.65.0

Development

Successfully merging this pull request may close these issues.

7 participants

@Mark-Simulacrum @bors @jyn514 @rust-log-analyzer @Dylan-DPC @rust-timer @rustbot