Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Subtree sync for rustc_codegen_cranelift #132526

Merged
merged 55 commits into from
Nov 3, 2024
Merged

Subtree sync for rustc_codegen_cranelift #132526

merged 55 commits into from
Nov 3, 2024

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Nov 2, 2024

The highlight this time is an update to Cranelift 0.113,

r? @ghost

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

bjorn3 and others added 30 commits September 23, 2024 11:20
@bjorn3
Merge commit '6d35b4c9a04580366fd800692a5b5db79d766530' into sync_cg_…
32b608a 
…clif-2024-09-22
@bjorn3
Revert change to apply_patches to fix panic
f3ae423
@bjorn3
Rustfmt
9d8572d
@bjorn3
Merge branch 'sync_from_rust'
3a3a634
@compiler-errors
Check vtable projections for validity in miri
631ab21
unify dyn* coercions with other pointer coercions
1efad22
be even more precise about "cast" vs "coercion"
25b66d8
@compiler-errors
Add a debug assertion in codegen that unsize casts of the same princi…
6fdc133 
…pal trait def id are truly NOPs
@bjorn3
Sync from rust 9e394f5
39440c5
@bjorn3
Rustup to rustc 1.83.0-nightly (9e394f5 2024-09-25)
eccda69
@bjorn3
Fix running rustc tests
764f1ba
@RalfJung
fix cranelift CI
9b31c68
@compiler-errors
Relax a debug assertion in codegen
d10a16a
@bjorn3
Update to Cranelift 0.112.0
743a2e4
@bjorn3
Remove pulley-interpreter dependency
9a48c44
@bjorn3
Validate dir checksum during testing too
0a9ce96 
Fixes rust-lang/rustc_codegen_cranelift#1394
@bjorn3
Fix ./y.sh prepare when the download dir is clobbered
0f1284c
@bjorn3
Also enable Cranelift optimizations with -Copt-level=1/2
0ba0845
@bjorn3
Couple of clif ir printing improvements around abi handling
a146874
@Urgau
Use wide pointers consistenly across the compiler
0bd0b99
@folkertdev
various fixes for naked_asm! implementation
2811ce7 
- fix for divergence
- fix error message
- fix another cranelift test
- fix some cranelift things
- don't set the NORETURN option for naked asm
- fix use of naked_asm! in doc comment
- fix use of naked_asm! in run-make test
- use `span_bug` in unreachable branch
@workingjubilee
cg_clif: Factor out rustc_target::abi
4850441
@bjorn3
Compile all abi-cafe tests with debuginfo enabled
14f656e
@bjorn3
Sync from rust eb4e234
3cf701c
@bjorn3
Rustup to rustc 1.83.0-nightly (eb4e234 2024-10-09)
5d7d251
@bjorn3
Fix rustc test suite
76dfce7
@jedbrown
intrinsics.fmuladdf{16,32,64,128}: expose llvm.fmuladd.* semantics
270fb21 
Add intrinsics `fmuladd{f16,f32,f64,f128}`. This computes `(a * b) +
c`, to be fused if the code generator determines that (i) the target
instruction set has support for a fused operation, and (ii) that the
fused operation is more efficient than the equivalent, separate pair
of `mul` and `add` instructions.

https://llvm.org/docs/LangRef.html#llvm-fmuladd-intrinsic

MIRI support is included for f32 and f64.

The codegen_cranelift uses the `fma` function from libc, which is a
correct implementation, but without the desired performance semantic. I
think this requires an update to cranelift to expose a suitable
instruction in its IR.

I have not tested with codegen_gcc, but it should behave the same
way (using `fma` from libc).
@bjorn3
Sync from rust 798fb83
bf2da67
@bjorn3
Rustup to rustc 1.84.0-nightly (798fb83 2024-10-16)
47a7e99
@bjorn3
Mark blocks as cold in a couple more places
16067fd
@rustbot 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 Nov 2, 2024
@rustbot
Copy link
Collaborator

rustbot commented Nov 2, 2024

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:

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend labels Nov 2, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Nov 2, 2024

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 2, 2024
@bjorn3
Copy link
Member Author

bjorn3 commented Nov 2, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Nov 2, 2024

📌 Commit c959f6e has been approved by bjorn3

It is now in the queue for this repository.

@bors 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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 2, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Nov 2, 2024
@workingjubilee
Rollup merge of rust-lang#132526 - bjorn3:sync_cg_clif-2024-11-02, r=…
13fecf5 
…bjorn3

Subtree sync for rustc_codegen_cranelift

The highlight this time is an update to Cranelift 0.113,

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
@workingjubilee workingjubilee mentioned this pull request Nov 2, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 3, 2024
@bors
Auto merge of rust-lang#132546 - workingjubilee:rollup-r9mkkhd, r=wor…
728065d 
…kingjubilee

Rollup of 12 pull requests

Successful merges:

 - rust-lang#132393 (Docs: added brief colon explanation)
 - rust-lang#132419 (PassWrapper: adapt for llvm/llvm-project@b01e2a8b5620466c3b)
 - rust-lang#132437 (coverage: Regression test for inlining into an uninstrumented crate)
 - rust-lang#132458 (get rid of a whole bunch of unnecessary rustc_const_unstable attributes)
 - rust-lang#132499 (unicode_data.rs: show command for generating file)
 - rust-lang#132503 (better test for const HashMap; remove const_hash leftovers)
 - rust-lang#132514 (Port most of `--print=target-cpus` to Rust)
 - rust-lang#132520 (NFC add known bug nr to test)
 - rust-lang#132522 (make codegen help output more consistent)
 - rust-lang#132523 (Added regression test for generics index out of bounds)
 - rust-lang#132526 (Subtree sync for rustc_codegen_cranelift)
 - rust-lang#132528 (Use `*_opt` typeck results fns to not ICE in fallback suggestion)
 - rust-lang#132540 (Do not format generic consts)

Failed merges:

 - rust-lang#132511 (stabilize const_arguments_as_str)

r? `@ghost`
`@rustbot` modify labels: rollup
@workingjubilee
Copy link
Member

@bors p=1

@bors
Copy link
Contributor

bors commented Nov 3, 2024

⌛ Testing commit c959f6e with merge 89ab655...

@bors
Copy link
Contributor

bors commented Nov 3, 2024

☀️ Test successful - checks-actions
Approved by: bjorn3
Pushing 89ab655 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 3, 2024
@bors bors merged commit 89ab655 into rust-lang:master Nov 3, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 3, 2024
@bors bors mentioned this pull request Nov 3, 2024
Draft
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (89ab655): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results (primary 1.9%)

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

Binary size

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

Bootstrap: 780.354s -> 780.951s (0.08%)
Artifact size: 335.40 MiB -> 335.37 MiB (-0.01%)

@bjorn3 bjorn3 deleted the sync_cg_clif-2024-11-02 branch November 3, 2024 09:56
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Nov 9, 2024
@bors
Auto merge of rust-lang#132526 - bjorn3:sync_cg_clif-2024-11-02, r=bj…
12677fd 
…orn3

Subtree sync for rustc_codegen_cranelift

The highlight this time is an update to Cranelift 0.113,

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend A-testsuite Area: The testsuite used to check the correctness of rustc has-merge-commits PR has merge commits, merge with caution. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.