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

Mark-Simulacrum · 2022-07-30T21:19:18Z

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.

bors · 2022-07-31T11:33:55Z

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

jyn514 · 2022-07-31T15:49:37Z

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 · 2022-07-31T16:10:29Z

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 · 2022-08-01T01:47:33Z

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.

jyn514

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 :)

src/bootstrap/config.rs

src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile

src/ci/run.sh

jyn514 · 2022-08-01T02:14:14Z

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 · 2022-08-01T12:56:32Z

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 · 2022-08-01T13:02:46Z

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

Mark-Simulacrum · 2022-08-01T13:08:11Z

@bors r+ rollup=never

bors · 2022-08-01T13:08:13Z

📌 Commit 197218b10d2d87c902d83623ed05f29f4011b23f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

Mark-Simulacrum · 2022-08-01T13:08:21Z

@bors r- r=jyn514

bors · 2022-08-01T13:08:23Z

📌 Commit 197218b10d2d87c902d83623ed05f29f4011b23f has been approved by jyn514

It is now in the queue for this repository.

bors · 2022-08-19T15:23:06Z

⌛ Testing commit ec09f02e221cb57d8f35a49cb11c5bacb9c619d0 with merge bc26f7fb5b85c73b6a523859d101320571d72a9b...

bors · 2022-08-19T15:31:19Z

💔 Test failed - checks-actions

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 · 2022-08-20T13:56:58Z

@bors r=jyn514 rollup=never

bors · 2022-08-20T13:56:59Z

📌 Commit d7b91c3 has been approved by jyn514

It is now in the queue for this repository.

bors · 2022-08-20T22:49:39Z

⌛ Testing commit d7b91c3 with merge fb80d2b...

bors · 2022-08-21T01:33:59Z

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

rust-timer · 2022-08-21T02:50:16Z

Finished benchmarking commit (fb80d2b): comparison url.

Instruction count

Primary benchmarks: ❌ relevant regression found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
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

	mean¹	max	count²
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

	mean¹	max	count²
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

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

jyn514 · 2022-08-21T15:43:05Z

🎉 🎉

…k-Simulacrum Fix git safe-directory path for docker images This fixes the path for configuring the git safe.directory setting inside docker images. AFAIK, `~/gitconfig` without a dot is not something that git uses ([ref](https://git-scm.com/docs/git-config)). This was needed in my environment to avoid the ` fatal: detected dubious ownership in repository at '/checkout'` error. For context, this was added in rust-lang#99967.

Rollup merge of rust-lang#127839 - ehuss:safe-directory-docker, r=Mark-Simulacrum Fix git safe-directory path for docker images This fixes the path for configuring the git safe.directory setting inside docker images. AFAIK, `~/gitconfig` without a dot is not something that git uses ([ref](https://git-scm.com/docs/git-config)). This was needed in my environment to avoid the ` fatal: detected dubious ownership in repository at '/checkout'` error. For context, this was added in rust-lang#99967.

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

Mark-Simulacrum force-pushed the download-llvm-ci branch from ba64590 to 00cd775 Compare July 30, 2022 21:56

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

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

This comment has been minimized.

Sign in to view

Mark-Simulacrum force-pushed the download-llvm-ci branch from 0dac895 to bfd544a Compare July 31, 2022 21:57

rust-highfive assigned jyn514 Aug 1, 2022

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 approved these changes Aug 1, 2022

View reviewed changes

src/bootstrap/config.rs Outdated Show resolved Hide resolved

src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile Outdated Show resolved Hide resolved

src/ci/run.sh Outdated Show resolved Hide resolved

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

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 force-pushed the download-llvm-ci branch from 28e70ad to 197218b Compare August 1, 2022 13:07

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

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 19, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 19, 2022

This comment has been minimized.

Sign in to view

Mark-Simulacrum added 2 commits August 20, 2022 09:47

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.

Add global safe.directory for CI

d7b91c3

Mark-Simulacrum force-pushed the download-llvm-ci branch from ec09f02 to d7b91c3 Compare August 20, 2022 13:48

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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 21, 2022

bors merged commit fb80d2b into rust-lang:master Aug 21, 2022

rustbot added this to the 1.65.0 milestone Aug 21, 2022

This was referenced Aug 21, 2022

Distribute bootstrap in CI #98483

Merged

Upgrade mingw-w64 on CI #100178

Merged

fix: use git-commit-info for version information #100557

Merged

ci: Upgrade non-dist Linux testers from ubuntu:16.04 to 22.04 #100606

Merged

Mark-Simulacrum mentioned this pull request Oct 29, 2022

Bump to 1.67.0 #103731

Merged

ehuss mentioned this pull request Jul 17, 2024

Fix git safe-directory path for docker images #127839

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

Mark-Simulacrum commented Jul 30, 2022 •

edited

Loading

bors commented Jul 31, 2022

jyn514 commented Jul 31, 2022

Mark-Simulacrum commented Jul 31, 2022

This comment has been minimized.

Mark-Simulacrum commented Aug 1, 2022

jyn514 left a comment

jyn514 commented Aug 1, 2022 •

edited

Loading

Mark-Simulacrum commented Aug 1, 2022

jyn514 commented Aug 1, 2022

Mark-Simulacrum commented Aug 1, 2022

bors commented Aug 1, 2022

Mark-Simulacrum commented Aug 1, 2022

bors commented Aug 1, 2022

bors commented Aug 19, 2022

bors commented Aug 19, 2022

This comment has been minimized.

Mark-Simulacrum commented Aug 20, 2022

bors commented Aug 20, 2022

bors commented Aug 20, 2022

bors commented Aug 21, 2022

rust-timer commented Aug 21, 2022

jyn514 commented Aug 21, 2022

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

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

Conversation

Mark-Simulacrum commented Jul 30, 2022 • edited Loading

bors commented Jul 31, 2022

jyn514 commented Jul 31, 2022

Mark-Simulacrum commented Jul 31, 2022

This comment has been minimized.

Mark-Simulacrum commented Aug 1, 2022

jyn514 left a comment

Choose a reason for hiding this comment

jyn514 commented Aug 1, 2022 • edited Loading

Mark-Simulacrum commented Aug 1, 2022

jyn514 commented Aug 1, 2022

Mark-Simulacrum commented Aug 1, 2022

bors commented Aug 1, 2022

Mark-Simulacrum commented Aug 1, 2022

bors commented Aug 1, 2022

bors commented Aug 19, 2022

bors commented Aug 19, 2022

This comment has been minimized.

Mark-Simulacrum commented Aug 20, 2022

bors commented Aug 20, 2022

bors commented Aug 20, 2022

bors commented Aug 21, 2022

rust-timer commented Aug 21, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

jyn514 commented Aug 21, 2022

Mark-Simulacrum commented Jul 30, 2022 •

edited

Loading

jyn514 commented Aug 1, 2022 •

edited

Loading