Simplify CI LLVM checks in bootstrap by Kobzol · Pull Request #138704 · rust-lang/rust

Kobzol · 2025-03-19T13:45:28Z

Extracted out of #138591. Apart from simplifying the checks, it will make it easier to run E2E tests of bootstrap on a mostly empty directory without checking out LLVM on CI :)

The commits should be mostly self-explanatory.

r? @onur-ozkan

rustbot · 2025-03-19T13:45:34Z

This PR changes how GCC is built. Consider updating src/bootstrap/download-ci-gcc-stamp.

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Kobzol · 2025-03-19T14:38:32Z

Uhh, crap, this breaks the check-default-config-profiles.sh smoke test, because it tries to check each profile on CI, and the library profile uses download-ci-llvm...

Kobzol · 2025-03-19T16:26:19Z

Hmm, a lot of bootstrap tests parse flags to create a config, and the default value for download-ci-llvm is true. I'm not necessarily sure if that's a good default - shouldn't it be if-unchanged?

onur-ozkan · 2025-03-20T07:45:10Z

"if-unchanged" syncs llvm submodule, that's why true is the default value.

Kobzol · 2025-03-20T12:58:32Z

Rebased on top of #138743.

@rustbot blocked #138743

Before it was using a different set of paths in different call-sites.

…ci-llvm=true` on CI

To avoid working around some code being unused in tests due to it being stubbed out with `#[cfg(test)]`.

…e're on CI.

onur-ozkan · 2025-03-21T13:43:49Z

Changes look good but this is one of those PRs where it's hard to find issues without merging it... So let's try that now.

@bors r+ rollup=never

bors · 2025-03-21T13:43:52Z

📌 Commit f5c59a4 has been approved by onur-ozkan

It is now in the queue for this repository.

bors · 2025-03-21T14:47:28Z

⌛ Testing commit f5c59a4 with merge a4a11ac...

bors · 2025-03-21T17:54:33Z

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing a4a11ac to master...

github-actions · 2025-03-21T17:56:22Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 4ac032f (parent) -> a4a11ac (this PR)

Test differences

No test diffs found

rust-timer · 2025-03-21T19:28:24Z

Finished benchmarking commit (a4a11ac): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.3%	[0.3%, 0.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.1%	[-1.1%, -1.1%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary 3.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.7%	[3.5%, 4.0%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

Results (primary -0.8%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.8%	[-0.8%, -0.8%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.8%	[-0.8%, -0.8%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 775.474s -> 775.351s (-0.02%)
Artifact size: 365.53 MiB -> 365.55 MiB (0.00%)

…ozkan Remove unneeded LLVM CI test assertions The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated. I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens). I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states. I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want. Fixes [this](rust-lang#138784 (comment)). r? `@ghost`

Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan Remove unneeded LLVM CI test assertions The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated. I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens). I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states. I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want. Fixes [this](rust-lang#138784 (comment)). r? `@ghost`

Remove the blanket `#![cfg_attr(test, allow(unused))]` from bootstrap - Originally added by rust-lang#138704 --- This blanket allow was hiding several unused imports and items in test-only code. It has been replaced with a number of narrower ensures. We can also drop the `pretty_assertions` dev-dependency, which turns out to have been unused.

Rollup merge of #159657 - Zalathar:allow-unused, r=jieyouxu Remove the blanket `#![cfg_attr(test, allow(unused))]` from bootstrap - Originally added by #138704 --- This blanket allow was hiding several unused imports and items in test-only code. It has been replaced with a number of narrower ensures. We can also drop the `pretty_assertions` dev-dependency, which turns out to have been unused.

Remove the blanket `#![cfg_attr(test, allow(unused))]` from bootstrap - Originally added by rust-lang/rust#138704 --- This blanket allow was hiding several unused imports and items in test-only code. It has been replaced with a number of narrower ensures. We can also drop the `pretty_assertions` dev-dependency, which turns out to have been unused.

rustbot assigned onur-ozkan Mar 19, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 19, 2025

This comment has been minimized.
Sign in to view

Kobzol force-pushed the ci-llvm-checks branch 2 times, most recently from c349e6b to 59c3417Compare March 20, 2025 12:58

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 20, 2025

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 20, 2025

This comment has been minimized.
Sign in to view

Kobzol added 5 commits March 21, 2025 12:18

Unify LLVM invalidation path handling
80a5adf
Before it was using a different set of paths in different call-sites.

Remove duplicated check for LLVM modifications and disable `download-…
9c05758
…ci-llvm=true` on CI

Allow unused code in tests
68aaa8d
To avoid working around some code being unused in tests due to it being stubbed out with `#[cfg(test)]`.

Set if-unchanged as the default value for download-ci-llvm when w…
f53acd1
…e're on CI.

Disable CI mode when checking default bootstrap profiles
e288faa

Kobzol removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 21, 2025

Fix test using download-ci-llvm=true on CI
f5c59a4

Kobzol force-pushed the ci-llvm-checks branch from 59c3417 to f5c59a4Compare March 21, 2025 11:24

onur-ozkan reviewed Mar 21, 2025
View reviewed changes

Comment threadsrc/ci/docker/host-x86_64/mingw-check/check-default-config-profiles.sh

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 21, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 21, 2025

bors merged commit a4a11ac into rust-lang:masterMar 21, 2025

rustbot added this to the 1.87.0 milestone Mar 21, 2025

Kobzol deleted the ci-llvm-checks branch March 21, 2025 18:17

jieyouxu mentioned this pull request Mar 25, 2025
Bump boostrap cc to 1.2.17 and cmake to 0.1.54 #138784
Merged

Kobzol mentioned this pull request Mar 27, 2025
Remove unneeded LLVM CI test assertions #139015
Merged

clubby789 mentioned this pull request Apr 1, 2025
Re-enable download-ci-llvm = true for CI rust-lang/backtrace-rs#706
Closed

Zalathar mentioned this pull request Jul 21, 2026
Remove the blanket #![cfg_attr(test, allow(unused))] from bootstrap #159657
Merged

Uh oh!

Uh oh!

Conversation

Kobzol commented Mar 19, 2025

Uh oh!

rustbot commented Mar 19, 2025

Uh oh!

This comment has been minimized.

Kobzol commented Mar 19, 2025

Uh oh!

This comment has been minimized.

Kobzol commented Mar 19, 2025

Uh oh!

onur-ozkan commented Mar 20, 2025

Uh oh!

Kobzol commented Mar 20, 2025

Uh oh!

This comment has been minimized.

Uh oh!

onur-ozkan commented Mar 21, 2025

Uh oh!

bors commented Mar 21, 2025

Uh oh!

bors commented Mar 21, 2025

Uh oh!

bors commented Mar 21, 2025

Uh oh!

github-actionsBot commented Mar 21, 2025

Test differences

Uh oh!

rust-timer commented Mar 21, 2025

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants