Subtree sync for rustc_codegen_cranelift #130716

bjorn3 · 2024-09-22T18:17:33Z

The main highlight this time is a fix for a miscompilation of RwLock on macOS. Also a Cranelift update and a couple of extra vendor intrinsics on arm64.

r? @ghost

@rustbot label +A-codegen +A-cranelift +T-compiler

By splitting the `FnSig` within `TyKind::FnPtr` into `FnSigTys` and `FnHeader`, which can be packed more efficiently. This reduces the size of the hot `TyKind` type from 32 bytes to 24 bytes on 64-bit platforms. This reduces peak memory usage by a few percent on some benchmarks. It also reduces cache misses and page faults similarly, though this doesn't translate to clear cycles or wall-time improvements on CI.

…clif-2024-08-09

I rarely need a debug build of cg_clif, and even if I actually need one, using package overrides in Cargo.toml to only do a debug build for the rustc_codegen_cranelift crate works much better.

To avoid overriding the source for coretests every time.

…ouxu,Amanieu,Jubilee nontemporal_store: make sure that the intrinsic is truly just a hint The `!nontemporal` flag for stores in LLVM *sounds* like it is just a hint, but actually, it is not -- at least on x86, non-temporal stores need very special treatment by the programmer or else the Rust memory model breaks down. LLVM still treats these stores as-if they were normal stores for optimizations, which is [highly dubious](llvm/llvm-project#64521). Let's avoid all that dubiousness by making our own non-temporal stores be truly just a hint, which is possible on some targets (e.g. ARM). On all other targets, non-temporal stores become regular stores. ~~Blocked on rust-lang/stdarch#1541 propagating to the rustc repo, to make sure the `_mm_stream` intrinsics are unaffected by this change.~~ Fixes rust-lang#114582 Cc `@Amanieu` `@workingjubilee`

…st as array)

…ompiler-errors Shrink `TyKind::FnPtr`. By splitting the `FnSig` within `TyKind::FnPtr` into `FnSigTys` and `FnHeader`, which can be packed more efficiently. This reduces the size of the hot `TyKind` type from 32 bytes to 24 bytes on 64-bit platforms. This reduces peak memory usage by a few percent on some benchmarks. It also reduces cache misses and page faults similarly, though this doesn't translate to clear cycles or wall-time improvements on CI. r? `@compiler-errors`

workingjubilee · 2024-09-22T23:41:55Z

Yes, we've been getting frequent spurious failures on that test.

…bjorn3 Subtree sync for rustc_codegen_cranelift The main highlight this time is a fix for a miscompilation of RwLock on macOS. Also a Cranelift update and a couple of extra vendor intrinsics on arm64. r? `@ghost` `@rustbot` label +A-codegen +A-cranelift +T-compiler

bors · 2024-09-23T04:31:43Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout sync_cg_clif-2024-09-22 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self sync_cg_clif-2024-09-22 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_codegen_cranelift/src/intrinsics/simd.rs
Auto-merging compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs
Auto-merging compiler/rustc_codegen_cranelift/src/constant.rs
Auto-merging compiler/rustc_codegen_cranelift/src/abi/mod.rs
Auto-merging compiler/rustc_codegen_cranelift/example/std_example.rs
Auto-merging compiler/rustc_codegen_cranelift/build_system/tests.rs
Auto-merging compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs
CONFLICT (content): Merge conflict in compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs
Auto-merging compiler/rustc_codegen_cranelift/build_system/bench.rs
CONFLICT (content): Merge conflict in compiler/rustc_codegen_cranelift/build_system/bench.rs
Auto-merging compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-09-23T05:26:59Z

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

…clif-2024-09-22

rustbot · 2024-09-23T11:21:21Z

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease

The following commits are merge commits (since this message was last posted):

bjorn3 · 2024-09-23T11:26:53Z

@bors r+ p=1 subtree sync

bors · 2024-09-23T11:26:56Z

📌 Commit 9456ff1 has been approved by bjorn3

It is now in the queue for this repository.

bjorn3 · 2024-09-23T11:29:57Z

@bors r+ p=1 subtree sync

bors · 2024-09-23T11:29:59Z

📌 Commit 6b042f5 has been approved by bjorn3

It is now in the queue for this repository.

bors · 2024-09-23T13:39:11Z

⌛ Testing commit 6b042f5 with merge 648d024...

bors · 2024-09-23T16:39:32Z

☀️ Test successful - checks-actions
Approved by: bjorn3
Pushing 648d024 to master...

rust-timer · 2024-09-23T18:13:13Z

Finished benchmarking commit (648d024): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

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

Cycles

Results (primary 0.5%, secondary 8.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.5%	[0.5%, 0.5%]	1
Regressions ❌ (secondary)	8.0%	[7.0%, 9.0%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[0.5%, 0.5%]	1

Binary size

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

Bootstrap: 767.469s -> 767.841s (0.05%)
Artifact size: 341.52 MiB -> 341.50 MiB (-0.00%)

RalfJung and others added 30 commits August 5, 2024 10:57

nontemporal_store: make sure that the intrinsic is truly just a hint

80a7d5f

Rename struct_tail_erasing_lifetimes to struct_tail_for_codegen

e96ece7

Merge commit '69b3f5a426a5c1c05236a45b36f6679d95fbe01b' into sync_cg_…

3ea9313

…clif-2024-08-09

Use ar_archive_writer from sysroot for cg_clif

0174cb1

Merge branch 'sync_from_rust'

78abc36

Apply missed change from subtree sync

aec3786

Rustup to rustc 1.82.0-nightly (ca5d25e 2024-08-09)

bb6571f

Fixes in various places

3de829e

Remove --debug argument of y.sh

1b96458

I rarely need a debug build of cg_clif, and even if I actually need one, using package overrides in Cargo.toml to only do a debug build for the rustc_codegen_cranelift crate works much better.

Couple of minor build system changes

a33f731

Add back bench job dependency for the release job

e55c630

Move cleaning of y.bin to the "to be removed" section in clean_all.sh

52aa24e

Stop ignoring some portable-simd tests

aa918f0

Fix source path for portable-simd

ab1da46

To avoid overriding the source for coretests every time.

Distribute rustc_codegen_cranelift for Windows

060811a

Sync from rust 730d5d4

65369af

Rustup to rustc 1.82.0-nightly (730d5d4 2024-08-10)

fabb298

Fix clean_all.sh

918e11d

Fix clif ir text format emission

b4e46de

simd_shuffle intrinsic: allow argument to be passed as vector (not ju…

6906793

…st as array)

Sync from rust 13a5289

c7d43c3

Rustup to rustc 1.82.0-nightly (13a5289 2024-08-14)

69cec6f

Always use ar_archive_writer for import libs

d7198a5

stabilize raw_ref_op

f1fadb8

rename AddressOf -> RawBorrow inside the compiler

8e7b3b5

Sync from rust 6de928d

c1e7b00

Rustup to rustc 1.82.0-nightly (6de928d 2024-08-18)

01f8739

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 22, 2024

workingjubilee mentioned this pull request Sep 23, 2024

Rollup of 13 pull requests #130731

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 Sep 23, 2024

bjorn3 added 4 commits September 23, 2024 11:04

Merge branch 'sync_from_rust'

faeede3

Rustup to rustc 1.83.0-nightly (6c6d210 2024-09-22)

6d35b4c

Merge commit '6d35b4c9a04580366fd800692a5b5db79d766530' into sync_cg_…

b40fe1e

…clif-2024-09-22

Revert change to apply_patches to fix panic

9456ff1

bjorn3 force-pushed the sync_cg_clif-2024-09-22 branch from afad3fb to 9456ff1 Compare September 23, 2024 11:21

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 Sep 23, 2024

This comment has been minimized.

Sign in to view

Rustfmt

6b042f5

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2024

bors merged commit 648d024 into rust-lang:master Sep 23, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Sep 23, 2024

bjorn3 deleted the sync_cg_clif-2024-09-22 branch September 23, 2024 16:47

bors mentioned this pull request Sep 23, 2024

less noisy change-tracker #130368

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Subtree sync for rustc_codegen_cranelift #130716

Subtree sync for rustc_codegen_cranelift #130716

bjorn3 commented Sep 22, 2024

workingjubilee commented Sep 22, 2024 •

edited

Loading

bors commented Sep 23, 2024

bors commented Sep 23, 2024

rustbot commented Sep 23, 2024

bjorn3 commented Sep 23, 2024

bors commented Sep 23, 2024

This comment has been minimized.

bjorn3 commented Sep 23, 2024

bors commented Sep 23, 2024

bors commented Sep 23, 2024

bors commented Sep 23, 2024

rust-timer commented Sep 23, 2024

Subtree sync for rustc_codegen_cranelift #130716

Subtree sync for rustc_codegen_cranelift #130716

Conversation

bjorn3 commented Sep 22, 2024

workingjubilee commented Sep 22, 2024 • edited Loading

bors commented Sep 23, 2024

bors commented Sep 23, 2024

rustbot commented Sep 23, 2024

bjorn3 commented Sep 23, 2024

bors commented Sep 23, 2024

This comment has been minimized.

bjorn3 commented Sep 23, 2024

bors commented Sep 23, 2024

bors commented Sep 23, 2024

bors commented Sep 23, 2024

rust-timer commented Sep 23, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

workingjubilee commented Sep 22, 2024 •

edited

Loading