Rollup of 5 pull requests #132800

matthiaskrgr · 2024-11-09T09:52:06Z

Successful merges:

Add v9, v8plus, and leoncasa target feature to sparc and use v8plus in create_object_file #132552 (Add v9, v8plus, and leoncasa target feature to sparc and use v8plus in create_object_file)
pointee_info_at: fix logic for recursing into enums #132745 (pointee_info_at: fix logic for recursing into enums)
try_question_mark_nop: update test for LLVM 20 #132777 (try_question_mark_nop: update test for LLVM 20)
rustc_target: more target string fixes for LLVM 20 #132785 (rustc_target: more target string fixes for LLVM 20)
Use a separate dir for r-a builds consistently in helix config #132794 (Use a separate dir for r-a builds consistently in helix config)

r? @ghost
@rustbot modify labels: rollup

@nikic

llvm/llvm-project@dd11636 changes the IR of this test in a way that I don't think is bad, but needs adjusting. r? @nikic @rustbot label: +llvm-main

@rustbot

LLVM continues to clean these up, and we continue to make this consistent. This is similar to 9caced7 and e985396. @rustbot label: +llvm-main

…rkingjubilee Add v9, v8plus, and leoncasa target feature to sparc and use v8plus in create_object_file This adds the following three unstable target features: - `v9`: SPARC-V9 instructions ([LLVM definition][sparc-v9]) - Relevant to rust-lang#131222 (comment) - Relevant to rust-lang#132472 (comment) - This is also needed to implement taiki-e/atomic-maybe-uninit#31 (depends on inline assembly support) more robustly. - `v8plus`: SPARC-V8+ ABI ([LLVM definition][sparc-v8plus]) - This is added in LLVM 20. In LLVM 19 and older, it is emulated to work the same way as LLVM in each LLVM version. - See rust-lang#132585 (comment) for more. - `leoncasa`: CASA instruction[^1] of LEON3 and LEON4 processors ([LLVM definition][sparc-leoncasa], LLVM feature name: `hasleoncasa`) - This is needed to implement taiki-e/atomic-maybe-uninit#31 (depends on inline assembly support) more robustly. [^1]: Atomic CAS instruction [sparc-v9]: https://github.com/llvm/llvm-project/blob/f5e4ffaa49254706ad6fa209de8aec28e20f0041/llvm/lib/Target/Sparc/Sparc.td#L37-L39 [sparc-v8plus]: https://github.com/llvm/llvm-project/blob/f5e4ffaa49254706ad6fa209de8aec28e20f0041/llvm/lib/Target/Sparc/Sparc.td#L37-L39 [sparc-leoncasa]: https://github.com/llvm/llvm-project/blob/llvmorg-19.1.0/llvm/lib/Target/Sparc/LeonFeatures.td#L32-L37

… r=DianQK pointee_info_at: fix logic for recursing into enums Fixes rust-lang#131834 The logic in `pointee_info_at` was likely written at a time when the null pointer optimization was the *only* enum layout optimization -- and as `Variant::Multiple` kept getting expanded, nobody noticed that the logic is now unsound. The job of this function is to figure out whether there is a dereferenceable-or-null and aligned pointer at a given offset inside a type. So when we recurse into a multi-variant enum, we better make sure that all the other enum variants must be null! This is the part that was forgotten, and this PR adds it. The reason this didn't explode in many ways so far is that our references only have 1 niche value (null), so it's not possible on stable to have a multi-variant enum with a dereferenceable pointer and other enum variants that are not null. But with `rustc_layout_scalar_valid_range` attributes one can force such a layout, and if `@the8472's` work on alignment niches ever lands, that will make this possible on stable.

try_question_mark_nop: update test for LLVM 20 llvm/llvm-project@dd11636 changes the IR of this test in a way that I don't think is bad, but needs adjusting. r? `@nikic` `@rustbot` label: +llvm-main

…=nikic rustc_target: more target string fixes for LLVM 20 LLVM continues to clean these up, and we continue to make this consistent. This is similar to 9caced7 and e985396. `@rustbot` label: +llvm-main

…, r=jieyouxu Use a separate dir for r-a builds consistently in helix config r? `@jieyouxu` cc `@mrkajetanp` Previously config used `build-rust-analyzer` for rustfmt and proc macros server, while not using it for actual `x check` commands. This PR: - Replaces the build dir with `build/rust-analyzer` - This is just my preference - Although I do think this is the nicest option: the directory is already git-ignored, `rm -fr ./build` removes everything, etc - Uses said directory with the `x check` commands in helix r-a config - Adds instructions on how to build rustfmt and proc macro server to the config As of note, this is not what other configs do (like vscode's), however this _is_ what I would actually suggest to people (and what I'm actually using).

matthiaskrgr · 2024-11-09T09:52:24Z

@bors r+ rollup=never p=5

bors · 2024-11-09T09:52:27Z

📌 Commit 70a59ae has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-11-09T12:23:50Z

⌛ Testing commit 70a59ae with merge 8044557...

bors · 2024-11-09T14:52:47Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 8044557 to master...

rust-timer · 2024-11-09T14:54:14Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#132552	Add v9, v8plus, and leoncasa target feature to sparc and us…	`6a14d0604d40e0260f391dfd7191eeecdd81a347` (link)
#132745	pointee_info_at: fix logic for recursing into enums	`9a498f1932b02421baddd52a8f923d6181983094` (link)
#132777	try_question_mark_nop: update test for LLVM 20	`9fc8e66b56207b39e89dfc992255e815321f3b46` (link)
#132785	rustc_target: more target string fixes for LLVM 20	`313f6eff22a332e241b037d1f4692b914bb278bc` (link)
#132794	Use a separate dir for r-a builds consistently in helix con…	`8757b42be1813a7ed1d62e5402b9f58c4243a114` (link)

previous master: 4b198d6871

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2024-11-09T16:27:38Z

Finished benchmarking commit (8044557): 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%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.4%	[-1.4%, -0.2%]	6
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -2.1%, secondary 2.2%)

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)	1.5%	[1.5%, 1.5%]	1
Regressions ❌ (secondary)	2.2%	[2.2%, 2.2%]	1
Improvements ✅ (primary)	-4.0%	[-5.6%, -2.3%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.1%	[-5.6%, 1.5%]	3

Cycles

Results (primary 1.6%)

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)	3.3%	[2.8%, 3.7%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.9%	[-1.9%, -1.9%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.6%	[-1.9%, 3.7%]	3

Binary size

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

Bootstrap: 780.833s -> 781.672s (0.11%)
Artifact size: 335.34 MiB -> 335.35 MiB (0.01%)

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#132552 (Add v9, v8plus, and leoncasa target feature to sparc and use v8plus in create_object_file) - rust-lang#132745 (pointee_info_at: fix logic for recursing into enums) - rust-lang#132777 (try_question_mark_nop: update test for LLVM 20) - rust-lang#132785 (rustc_target: more target string fixes for LLVM 20) - rust-lang#132794 (Use a separate dir for r-a builds consistently in helix config) r? `@ghost` `@rustbot` modify labels: rollup

RalfJung and others added 11 commits November 8, 2024 07:35

pointee_info_at: fix logic for recursing into enums

35a913b

try_question_mark_nop: update test for LLVM 20

8fcc020

llvm/llvm-project@dd11636 changes the IR of this test in a way that I don't think is bad, but needs adjusting. r? @nikic @rustbot label: +llvm-main

Add v9 and leoncasa target feature to sparc

400a690

Add v8plus target feature to sparc and use it in create_object_file

c059eb7

rustc_target: more target string fixes for LLVM 20

a10e744

LLVM continues to clean these up, and we continue to make this consistent. This is similar to 9caced7 and e985396. @rustbot label: +llvm-main

Use a separate dir for r-a builds consistently in helix config

2206968

Rollup merge of rust-lang#132777 - durin42:llvm-20-poison-prop, r=nikic

2829c27

try_question_mark_nop: update test for LLVM 20 llvm/llvm-project@dd11636 changes the IR of this test in a way that I don't think is bad, but needs adjusting. r? `@nikic` `@rustbot` label: +llvm-main

Rollup merge of rust-lang#132785 - durin42:llvm-20-more-alignments, r…

a393566

…=nikic rustc_target: more target string fixes for LLVM 20 LLVM continues to clean these up, and we continue to make this consistent. This is similar to 9caced7 and e985396. `@rustbot` label: +llvm-main

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. rollup A PR which is a rollup labels Nov 9, 2024

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 Nov 9, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 9, 2024

bors merged commit 8044557 into rust-lang:master Nov 9, 2024
7 checks passed

rustbot added this to the 1.84.0 milestone Nov 9, 2024

This was referenced Nov 9, 2024

Stabilize WebAssembly multivalue, reference-types, and tail-call target features #131080

Merged

Add post-mono MIR passes to make mono-reachable analysis more accurate #131650

Draft

Adjust the alignment when passing a niche as a pointer #131739

Closed

matthiaskrgr deleted the rollup-c1kkj56 branch January 25, 2025 09:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #132800

Rollup of 5 pull requests #132800

matthiaskrgr commented Nov 9, 2024

matthiaskrgr commented Nov 9, 2024

bors commented Nov 9, 2024

bors commented Nov 9, 2024

bors commented Nov 9, 2024

rust-timer commented Nov 9, 2024

rust-timer commented Nov 9, 2024

Rollup of 5 pull requests #132800

Rollup of 5 pull requests #132800

Conversation

matthiaskrgr commented Nov 9, 2024

matthiaskrgr commented Nov 9, 2024

bors commented Nov 9, 2024

bors commented Nov 9, 2024

bors commented Nov 9, 2024

rust-timer commented Nov 9, 2024

rust-timer commented Nov 9, 2024

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

Instruction count

Max RSS (memory usage)

Cycles

Binary size