Fix tests on LLVM 20 #135764

nikic · 2025-01-20T11:21:22Z

For sparcv8plus.rs, duplicate the test for LLVM 19 and LLVM 20. LLVM 20 resolves one of the FIXME in the test.

For x86_64-bigint-add.rs split the check lines for LLVM 19 and LLVM 20. The difference in codegen here is due to a difference in unroll factor, which I believe is not what the test is interested in.

Fixes #132957.
Fixes #133754.

rustbot · 2025-01-20T11:21:31Z

r? @davidtwco

rustbot has assigned @davidtwco.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

.gitmodules

wesleywiser · 2025-01-22T16:33:48Z

Thanks @nikic!

@bors r+ rollup

bors · 2025-01-22T16:33:52Z

📌 Commit dca888c has been approved by wesleywiser

It is now in the queue for this repository.

…wiser Fix tests on LLVM 20 For sparcv8plus.rs, duplicate the test for LLVM 19 and LLVM 20. LLVM 20 resolves one of the FIXME in the test. For x86_64-bigint-add.rs split the check lines for LLVM 19 and LLVM 20. The difference in codegen here is due to a difference in unroll factor, which I believe is not what the test is interested in. Fixes rust-lang#132957. Fixes rust-lang#133754.

Rollup of 10 pull requests Successful merges: - rust-lang#134746 (Don't ICE in coerce when autoderef fails to structurally normalize non-WF type in new solver) - rust-lang#135552 ([AIX] Lint on structs that have a different alignment in AIX's C ABI) - rust-lang#135764 (Fix tests on LLVM 20) - rust-lang#135779 (CI: free disk on linux arm runner) - rust-lang#135790 (Update windows-gnu targets to set `DebuginfoKind::DWARF`) - rust-lang#135879 (fix outdated file path ref in llvm) - rust-lang#135883 (Remove erroneous `unsafe` in `BTreeSet::upper_bound_mut`) - rust-lang#135884 (remove implied end of slice) - rust-lang#135887 (improvements on `build_steps::test` implementation) - rust-lang#135898 (rustdoc-json-types: Finalize dyn compatibility renaming) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2025-01-23T08:48:55Z

@bors r-
failed in #135915 (comment)

Split this into two tests, one for LLVM 19 and one for LLVM 20.

LLVM 20 choses a different unroll factor for the loop.

nikic · 2025-01-23T09:17:15Z

Sorry about that, I didn't re-bless the llvm19 test variant under LLVM 19.

@bors=wesleywiser

nikic · 2025-01-24T16:35:04Z

Oops, I typo'd the bors syntax...

@bors r=wesleywiser

bors · 2025-01-24T16:35:07Z

📌 Commit 2718710 has been approved by wesleywiser

It is now in the queue for this repository.

scottmcm · 2025-01-25T02:54:24Z

tests/assembly/x86_64-bigint-helpers.rs

+    // llvm-20: adc [[TEMP:r..]], qword ptr [rdx + 8*[[IND:r..]]]
+    // llvm-20: mov qword ptr [rdi + 8*[[IND]]], [[TEMP]]
+    // llvm-20: mov [[TEMP]], qword ptr [rsi + 8*[[IND]] + 8]
+    // llvm-20: adc [[TEMP]], qword ptr [rdx + 8*[[IND]] + 8]


Agreed; the goal here was just to ensure it's still adc. The unroll width whatever is fine.

…wiser Fix tests on LLVM 20 For sparcv8plus.rs, duplicate the test for LLVM 19 and LLVM 20. LLVM 20 resolves one of the FIXME in the test. For x86_64-bigint-add.rs split the check lines for LLVM 19 and LLVM 20. The difference in codegen here is due to a difference in unroll factor, which I believe is not what the test is interested in. Fixes rust-lang#132957. Fixes rust-lang#133754.

Rollup of 7 pull requests Successful merges: - rust-lang#130808 (Fix linking for symbols starting with ? on i686-pc-windows-msvc) - rust-lang#133138 (Target modifiers (special marked options) are recorded in metainfo) - rust-lang#133154 (Reword resolve errors caused by likely missing crate in dep tree) - rust-lang#135707 (Shorten linker output even more when `--verbose` is not present) - rust-lang#135764 (Fix tests on LLVM 20) - rust-lang#135785 (use `PassMode::Direct` for vector types on `s390x`) - rust-lang#135818 (tests: Port `translation` to rmake.rs) Failed merges: - rust-lang#133951 (Make the wasm_c_abi future compat warning a hard error) r? `@ghost` `@rustbot` modify labels: rollup try-job: aarch64-apple try-job: i686-mingw try-job: x86_64-gnu-llvm-19-3

…wiser Fix tests on LLVM 20 For sparcv8plus.rs, duplicate the test for LLVM 19 and LLVM 20. LLVM 20 resolves one of the FIXME in the test. For x86_64-bigint-add.rs split the check lines for LLVM 19 and LLVM 20. The difference in codegen here is due to a difference in unroll factor, which I believe is not what the test is interested in. Fixes rust-lang#132957. Fixes rust-lang#133754.

Rollup of 6 pull requests Successful merges: - rust-lang#130808 (Fix linking for symbols starting with ? on i686-pc-windows-msvc) - rust-lang#133154 (Reword resolve errors caused by likely missing crate in dep tree) - rust-lang#135707 (Shorten linker output even more when `--verbose` is not present) - rust-lang#135764 (Fix tests on LLVM 20) - rust-lang#135785 (use `PassMode::Direct` for vector types on `s390x`) - rust-lang#135818 (tests: Port `translation` to rmake.rs) r? `@ghost` `@rustbot` modify labels: rollup try-job: aarch64-apple try-job: i686-mingw try-job: x86_64-gnu-llvm-19-3

…wiser Fix tests on LLVM 20 For sparcv8plus.rs, duplicate the test for LLVM 19 and LLVM 20. LLVM 20 resolves one of the FIXME in the test. For x86_64-bigint-add.rs split the check lines for LLVM 19 and LLVM 20. The difference in codegen here is due to a difference in unroll factor, which I believe is not what the test is interested in. Fixes rust-lang#132957. Fixes rust-lang#133754.

Rollup of 4 pull requests Successful merges: - rust-lang#135707 (Shorten linker output even more when `--verbose` is not present) - rust-lang#135764 (Fix tests on LLVM 20) - rust-lang#135785 (use `PassMode::Direct` for vector types on `s390x`) - rust-lang#135818 (tests: Port `translation` to rmake.rs) r? `@ghost` `@rustbot` modify labels: rollup try-job: aarch64-apple try-job: i686-mingw try-job: x86_64-gnu-llvm-19-3

…wiser Fix tests on LLVM 20 For sparcv8plus.rs, duplicate the test for LLVM 19 and LLVM 20. LLVM 20 resolves one of the FIXME in the test. For x86_64-bigint-add.rs split the check lines for LLVM 19 and LLVM 20. The difference in codegen here is due to a difference in unroll factor, which I believe is not what the test is interested in. Fixes rust-lang#132957. Fixes rust-lang#133754.

Rollup of 8 pull requests Successful merges: - rust-lang#133631 (Support QNX 7.1 with `io-sock`+libstd and QNX 8.0 (`no_std` only)) - rust-lang#134358 (compiler: Set `target_abi = "ilp32e"` on all riscv32e targets) - rust-lang#135764 (Fix tests on LLVM 20) - rust-lang#135812 (Fix GDB `OsString` provider on Windows ) - rust-lang#135842 (TRPL: more backward-compatible Edition changes) - rust-lang#135946 (Remove extra whitespace from rustdoc breadcrumbs for copypasting) - rust-lang#135953 (ci.py: check the return code in `run-local`) - rust-lang#136019 (Add an `unchecked_div` alias to the `Div<NonZero<_>>` impls) Failed merges: - rust-lang#136037 (Mark all NuttX targets as tier 3 target and support the standard library) r? `@ghost` `@rustbot` modify labels: rollup

jhpratt · 2025-01-26T06:50:08Z

I can't say with certainty, but I think this is the cause of #136084 (comment) given that nothing else touches LLVM.

@bors r- just in case

jieyouxu · 2025-01-26T06:51:57Z

I can't say with certainty, but I think this is the cause of #136084 (comment) given that nothing else touches LLVM.

~~That can't be it, this PR only modifies tests, that failure is when building LLVM in relation to cmake?~~ But this PR might transitively require certain llvm tools to build

nikic · 2025-01-26T08:53:52Z

I don't think the failure is related, but we can test it separately...

@bors r=wesleywiser rollup=never

bors · 2025-01-26T08:53:55Z

📌 Commit 2718710 has been approved by wesleywiser

It is now in the queue for this repository.

jhpratt · 2025-01-26T09:26:51Z

While waiting for it to hit the top of the queue, let's see if it was in fact spurious

@bors try

bors · 2025-01-26T09:26:53Z

🙅 Please do not try after a pull request has been r+ed. If you need to try, unapprove (r-) it first.

bors · 2025-01-26T14:54:05Z

⌛ Testing commit 2718710 with merge 01a26c0...

bors · 2025-01-26T17:34:54Z

☀️ Test successful - checks-actions
Approved by: wesleywiser
Pushing 01a26c0 to master...

rust-timer · 2025-01-26T18:51:51Z

Finished benchmarking commit (01a26c0): comparison URL.

Overall result: ✅ 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
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	2
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -0.8%, secondary -1.0%)

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)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-0.8%	[-0.8%, -0.8%]	1
Improvements ✅ (secondary)	-4.1%	[-4.1%, -4.1%]	1
All ❌✅ (primary)	-0.8%	[-0.8%, -0.8%]	1

Cycles

Results (secondary 4.3%)

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)	4.3%	[4.3%, 4.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 774.799s -> 773.224s (-0.20%)
Artifact size: 328.16 MiB -> 328.21 MiB (0.02%)

Update to LLVM 20 LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd. * [x] rust-lang#135764 * [x] rust-lang#136134 * [x] rust-lang/compiler-builtins#752 * [ ] Update compiler-builtins Tested: arm-android, test-various, x86_64-rust-for-linux, x86_64-fuchsia, dist-various-1, dist-various-2, dist-s390x-linux, dist-riscv64-linux, dist-loongarch64-musl try-job: aarch64-gnu try-job: aarch64-gnu-debug try-job: dist-aarch64-linux

Update to LLVM 20 LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd. * [x] rust-lang#135764 * [x] rust-lang#136134 * [x] rust-lang/compiler-builtins#752 * [ ] Update compiler-builtins Tested: arm-android, test-various, x86_64-rust-for-linux, x86_64-fuchsia, dist-various-1, dist-various-2, dist-s390x-linux, dist-riscv64-linux, dist-loongarch64-musl try-job: dist-x86_64-apple try-job: dist-apple-various try-job: x86_64-apple-1 try-job: x86_64-apple-2 try-job: dist-aarch64-apple try-job: aarch64-apple

rustbot assigned davidtwco Jan 20, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 20, 2025

nikic mentioned this pull request Jan 20, 2025

Update to LLVM 20 #135763

Open

4 tasks

wesleywiser reviewed Jan 22, 2025

View reviewed changes

.gitmodules Outdated Show resolved Hide resolved

nikic force-pushed the llvm-20-test-fixes branch from fdf861c to dca888c Compare January 22, 2025 08:01

wesleywiser approved these changes Jan 22, 2025

View reviewed changes

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 Jan 22, 2025

jhpratt mentioned this pull request Jan 23, 2025

Rollup of 10 pull requests #135915

Closed

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 23, 2025

nikic added 2 commits January 23, 2025 10:15

Fix sparcv8plus test on LLVM 20

aaccb71

Split this into two tests, one for LLVM 19 and one for LLVM 20.

Fix x86_64-bigint-helpers test on LLVM 20

2718710

LLVM 20 choses a different unroll factor for the loop.

nikic force-pushed the llvm-20-test-fixes branch from dca888c to 2718710 Compare January 23, 2025 09:15

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 Jan 24, 2025

scottmcm reviewed Jan 25, 2025

View reviewed changes

matthiaskrgr mentioned this pull request Jan 25, 2025

Rollup of 7 pull requests #136045

Closed

matthiaskrgr mentioned this pull request Jan 25, 2025

Rollup of 6 pull requests #136049

Closed

matthiaskrgr mentioned this pull request Jan 25, 2025

Rollup of 4 pull requests #136051

Closed

jhpratt mentioned this pull request Jan 26, 2025

Rollup of 8 pull requests #136084

Closed

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 26, 2025

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 Jan 26, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 26, 2025

bors merged commit 01a26c0 into rust-lang:master Jan 26, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Jan 26, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix tests on LLVM 20 #135764

Fix tests on LLVM 20 #135764

nikic commented Jan 20, 2025

rustbot commented Jan 20, 2025

wesleywiser commented Jan 22, 2025

bors commented Jan 22, 2025

matthiaskrgr commented Jan 23, 2025

nikic commented Jan 23, 2025

nikic commented Jan 24, 2025

bors commented Jan 24, 2025

scottmcm Jan 25, 2025

jhpratt commented Jan 26, 2025

jieyouxu commented Jan 26, 2025 •

edited

Loading

nikic commented Jan 26, 2025

bors commented Jan 26, 2025

jhpratt commented Jan 26, 2025

bors commented Jan 26, 2025

bors commented Jan 26, 2025

bors commented Jan 26, 2025

rust-timer commented Jan 26, 2025

Fix tests on LLVM 20 #135764

Fix tests on LLVM 20 #135764

Conversation

nikic commented Jan 20, 2025

rustbot commented Jan 20, 2025

wesleywiser commented Jan 22, 2025

bors commented Jan 22, 2025

matthiaskrgr commented Jan 23, 2025

nikic commented Jan 23, 2025

nikic commented Jan 24, 2025

bors commented Jan 24, 2025

scottmcm Jan 25, 2025

Choose a reason for hiding this comment

jhpratt commented Jan 26, 2025

jieyouxu commented Jan 26, 2025 • edited Loading

nikic commented Jan 26, 2025

bors commented Jan 26, 2025

jhpratt commented Jan 26, 2025

bors commented Jan 26, 2025

bors commented Jan 26, 2025

bors commented Jan 26, 2025

rust-timer commented Jan 26, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

jieyouxu commented Jan 26, 2025 •

edited

Loading