Run mir-opt panic=abort tests on CI by Kobzol · Pull Request #160200 · rust-lang/rust

Kobzol · 2026-07-30T07:54:21Z

Context: https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Blessing.20mir-opt.20on.20a.20clean.20checkout.20produces.20a.20diff/near/613465816

It looks like we didn't run them on CI (ever? lol).

r? @RalfJung

rustbot · 2026-07-30T07:54:27Z

RalfJung is not on the review rotation at the moment.
They may take a while to respond.

jieyouxu · 2026-07-30T08:20:56Z

cf. #154607

RalfJung · 2026-07-30T08:33:37Z

I don't know nearly enough about bootstrap to review this.^^
@rustbot reroll

RalfJung · 2026-07-30T08:34:28Z

+        // Now also run the tests for the host with panic=abort
+        let panic_abort_target = builder
+            .ensure(MirOptPanicAbortSyntheticTarget { compiler: self.compiler, base: self.target });
+        run(panic_abort_target);


This will be redundant with --bless I think?
mir-opt --bless already takes very long due to all the sysroots it is building, I'd prefer it not to become even slower.

View changes since the review

It is only redundant if the host target matches the hardcoded targets we have below. I can add an if condition to skip them if they match the host target.

That being said, if the stdlib it built, re-running the tests again should be very fast, they will just be ignored.

It is always redundant. There are only 4 actually distinct configurations, so running more than 4 targets on --bless is redundant.

I see, so the target doesn't really matter, the only thing that matters is bitwidth and the panic strategy? Yeah, in that case I will try to optimize it to always run 2 targets when not blessing, and 4 targets when blessing.

Yeah.

When checking it's good to check the actual self.target to ensure CI covers them all. But in principle only the bitwidth and panic strategy should matter.

RalfJung · 2026-07-30T08:38:24Z

Cc @saethlin

RalfJung · 2026-07-30T08:42:18Z

The existing behavior of --bless is kind of annoying since it takes so long to build all these sysroots... and it actually builds 5 sysroots when 4 should be enough. (With this PR as-is it'd become 6 sysroots!) Not sure if there is something we could improve there. Does bootstrap know whether self.target is a 32bit target or 64bit target? If yes, we could bless

current target
current target with panic=abort
target of other bitwidth
target of other bitwidth with panic=abort

And only run the first two steps for non-bless mode. That'd be nice.

Kobzol · 2026-08-07T07:28:14Z

And only run the first two steps for non-bless mode. That'd be nice.

But when we do the check, we should test all 4 combinations, right? Otherwise we could get back into the same problem, where some of the combinations are not checked on CI, and thus bless becomes "dirty".

RalfJung · 2026-08-07T07:30:57Z

We are running mir-opt tests on all tier 1 targets, right? So 32bit and 64bit are both covered.

Kobzol · 2026-08-07T07:32:05Z

Ah, I see, makes sense. Thanks.

Kobzol · 2026-08-07T08:24:41Z

Ok, I refactored the whole thing. Now when checking, we run the current target, and then the current target with the "inverted" panic strategy. And when blessing, we run the current target + four fixed targets, as before (there was a comment saying that running also the current target when blessing is desired).

It is now possible to create synthetic targets with both panic abort/unwind strategies, and the generated miropt test steps are now created as separate step instances, which means that they will be more explicit tin the step trace, and they will also be properly cached.

jieyouxu

Thanks

View changes since this review

And only include the target name when rendering test metadata, to avoid including filenames in it.

…anicStrategy`

… of targets to check

jieyouxu · 2026-09-01T13:53:18Z

I suspect the failure is just it was previously not exercised in CI?

rustbot · 2026-09-01T17:46:22Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Kobzol · 2026-09-01T19:33:17Z

@bors r=jieyouxu

rust-bors · 2026-09-01T19:33:22Z

📌 Commit 5bc30a9 has been approved by jieyouxu

It is now in the queue for this repository.

@RalfJung

…r=jieyouxu Run mir-opt panic=abort tests on CI Context: https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Blessing.20mir-opt.20on.20a.20clean.20checkout.20produces.20a.20diff/near/613465816 It looks like we didn't run them on CI (ever? lol). r? @RalfJung

@RalfJung

…r=jieyouxu Run mir-opt panic=abort tests on CI Context: https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Blessing.20mir-opt.20on.20a.20clean.20checkout.20produces.20a.20diff/near/613465816 It looks like we didn't run them on CI (ever? lol). r? @RalfJung

Zalathar · 2026-09-02T11:11:05Z

Probably failed in rollup due to bootstrap snapshot tests: #162184 (comment)

@bors r-
@bors try jobs=i686-msvc-2

rust-bors · 2026-09-02T11:11:11Z

This pull request was unapproved.

View changes since this unapproval

Run mir-opt panic=abort tests on CI try-job: i686-msvc-2

rust-bors · 2026-09-02T11:28:59Z

💔 Test for 25a5398 failed: CI. Failed job:

try - i686-msvc-2 (web logs, enhanced plaintext logs)

rust-log-analyzer · 2026-09-02T11:29:30Z

The job i686-msvc-2 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

##[group]Building stage1 library artifacts (stage1:i686-unknown-haiku -> stage1:i686-pc-windows-msvc)
##[endgroup]
##[group]Testing stage1 with compiletest suite=mir-opt mode=mir-opt (i686-pc-windows-msvc)
##[endgroup]
##[group]Building stage1 library artifacts (stage1:i686-unknown-haiku -> stage1:x86_64-apple-darwin-synthetic-miropt-abort(C:\Users\RUNNER~1\AppData\Local\Temp\.tmpMIfMGK\build\tmp-dry-run\synthetic-target-specs\x86_64-apple-darwin-synthetic-miropt-abort.json))
##[endgroup]
##[endgroup]
##[group]Testing stage1 with compiletest suite=mir-opt mode=mir-opt (x86_64-apple-darwin-synthetic-miropt-abort(C:\Users\RUNNER~1\AppData\Local\Temp\.tmpMIfMGK\build\tmp-dry-run\synthetic-target-specs\x86_64-apple-darwin-synthetic-miropt-abort.json))
##[endgroup]
##[group]Building LLVM for i686-pc-windows-msvc (continued)
##[endgroup]
##[group]Building stage1 library artifacts (stage1:i686-unknown-haiku -> stage1:i686-unknown-linux-musl-synthetic-miropt-abort(C:\Users\RUNNER~1\AppData\Local\Temp\.tmpMIfMGK\build\tmp-dry-run\synthetic-target-specs\i686-unknown-linux-musl-synthetic-miropt-abort.json))
##[endgroup]
##[group]Building LLVM for i686-pc-windows-msvc (continued)
##[endgroup]
##[group]Testing stage1 with compiletest suite=mir-opt mode=mir-opt (i686-unknown-linux-musl-synthetic-miropt-abort(C:\Users\RUNNER~1\AppData\Local\Temp\.tmpMIfMGK\build\tmp-dry-run\synthetic-target-specs\i686-unknown-linux-musl-synthetic-miropt-abort.json))
##[endgroup]
##[group]Building LLVM for i686-pc-windows-msvc (continued)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ Snapshot Summary ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
Snapshot: mir_opt_bless
Source: D:\a\rust\rust:2417
───────────────────────────────────────────────────────────────────────────────
Expression: prepare_test_config(&ctx).arg("--bless").hosts(&[TEST_TRIPLE_1]).arg("--build").arg(TEST_TRIPLE_1).targets(&[TEST_TRIPLE_1]).path("tests/mir-opt").render_steps()
───────────────────────────────────────────────────────────────────────────────
-old snapshot
+new results
────────────┬──────────────────────────────────────────────────────────────────
    2     2 │ [build] rustc 0 <target1> -> rustc 1 <target1>
    3     3 │ [build] rustc 1 <target1> -> std 1 <target1>
    4     4 │ [build] rustc 0 <target1> -> Compiletest 1 <target1>
    5     5 │ [test] compiletest-mir-opt 1 <target1>
    6       │-[build] rustc 1 <target1> -> std 1 <i686-pc-windows-msvc>
    7       │-[test] compiletest-mir-opt 1 <i686-pc-windows-msvc>
          6 │+[build] rustc 1 <target1> -> std 1 <host>
          7 │+[test] compiletest-mir-opt 1 <host>
    8     8 │ [build] rustc 1 <target1> -> std 1 <x86_64-apple-darwin-synthetic-miropt-abort>
    9     9 │ [test] compiletest-mir-opt 1 <x86_64-apple-darwin-synthetic-miropt-abort>
   10    10 │ [build] rustc 1 <target1> -> std 1 <i686-unknown-linux-musl-synthetic-miropt-abort>
   11    11 │ [test] compiletest-mir-opt 1 <i686-unknown-linux-musl-synthetic-miropt-abort>
────────────┴──────────────────────────────────────────────────────────────────
Stopped on the first failure. Run `cargo insta test` to run all snapshots.

thread 'core::builder::tests::snapshot::test_mir_opt_bless' (3432) panicked at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-1949cf8c6b5b557f\insta-1.47.2\src\runtime.rs:719:13:
snapshot assertion for 'mir_opt_bless' failed in line 2417
---- core::builder::tests::snapshot::test_mir_opt_bless stdout end ----

failures:
    core::builder::tests::snapshot::test_mir_opt_bless

test result: FAILED. 274 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 84.90s

error: test failed, to rerun pass `--lib`
Bootstrap failed while executing `test --stage 2 --skip=tests --skip=library --skip=tidyselftest --skip=src/tools/linkchecker`
Currently active steps:
test::Bootstrap {  } at src\bootstrap\src\core\build_steps\test.rs:4154
Build completed unsuccessfully in 0:07:20
make: *** [Makefile:117: ci-msvc-ps1] Error 1
  local time: Wed Sep  2 11:28:44 CUT 2026
  network time: Wed, 02 Sep 2026 11:28:44 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

rustbot assigned RalfJung Jul 30, 2026

This comment has been minimized.

Sign in to view

jieyouxu self-assigned this Jul 30, 2026

jieyouxu reviewed Jul 30, 2026

View reviewed changes

Comment thread src/bootstrap/src/core/build_steps/test.rs Outdated

rustbot assigned jackh726 and unassigned RalfJung and jieyouxu Jul 30, 2026

RalfJung reviewed Jul 30, 2026

View reviewed changes

jieyouxu assigned jieyouxu and unassigned jackh726 Jul 30, 2026

This comment has been minimized.

Sign in to view

jieyouxu 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 4, 2026

Kobzol force-pushed the mir-opt-panic-abort-on-ci branch from a65622e to b63868d Compare August 7, 2026 08:23

This comment has been minimized.

Sign in to view

jieyouxu approved these changes Sep 1, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

Kobzol added 9 commits September 1, 2026 15:45

Bless bootstrap tests

8e85fcf

And only include the target name when rendering test metadata, to avoid including filenames in it.

Generalize MirOptPanicAbortSyntheticTarget to `SyntheticTargetWithP…

bdc7aee

…anicStrategy`

Create targets for mir-opt tests explicitly and use the minimal set…

1119245

… of targets to check

Fix host normalization

2b971b6

Bless at most four individual targets

0ef414a

Do not call configure_linker for synthetic targets

81c5ef2

Add needs-deterministic-layouts flag

73c955c

Add comments

b1ff4d6

Bless test

5bc30a9

Kobzol force-pushed the mir-opt-panic-abort-on-ci branch from 9ce4dd3 to 5bc30a9 Compare September 1, 2026 17:46

rust-bors Bot 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 Sep 1, 2026

Zalathar mentioned this pull request Sep 2, 2026

Rollup of 16 pull requests #162184

Closed

JonathanBrouwer mentioned this pull request Sep 2, 2026

Rollup of 16 pull requests #162186

Closed

rust-bors Bot 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 2, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Sep 2, 2026

Auto merge of #160200 - Kobzol:mir-opt-panic-abort-on-ci, r=<try>

25a5398

Run mir-opt panic=abort tests on CI try-job: i686-msvc-2

Uh oh!

Uh oh!

Conversation

Kobzol commented Jul 30, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 30, 2026

Uh oh!

This comment has been minimized.

jieyouxu commented Jul 30, 2026

Uh oh!

Uh oh!

RalfJung commented Jul 30, 2026

Uh oh!

RalfJung Jul 30, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kobzol Jul 30, 2026

Choose a reason for hiding this comment

Uh oh!

RalfJung Jul 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kobzol Jul 30, 2026

Choose a reason for hiding this comment

Uh oh!

RalfJung Jul 30, 2026

Choose a reason for hiding this comment

Uh oh!

RalfJung commented Jul 30, 2026

Uh oh!

RalfJung commented Jul 30, 2026

Uh oh!

This comment has been minimized.

Kobzol commented Aug 7, 2026

Uh oh!

RalfJung commented Aug 7, 2026 via email

Uh oh!

Kobzol commented Aug 7, 2026

Uh oh!

This comment has been minimized.

Kobzol commented Aug 7, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

jieyouxu commented Sep 1, 2026

Uh oh!

rustbot commented Sep 1, 2026

Uh oh!

Kobzol commented Sep 1, 2026

Uh oh!

rust-bors Bot commented Sep 1, 2026

Uh oh!

Zalathar commented Sep 2, 2026

Uh oh!

rust-bors Bot commented Sep 2, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Sep 2, 2026

Uh oh!

rust-log-analyzer commented Sep 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Kobzol commented Jul 30, 2026 •

edited by rustbot

Loading

RalfJung Jul 30, 2026 •

edited by rustbot

Loading

RalfJung Jul 30, 2026 •

edited

Loading

jieyouxu left a comment •

edited by rustbot

Loading