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 #125074

Merged
merged 44 commits into from
May 13, 2024
Merged

Subtree sync for rustc_codegen_cranelift #125074

merged 44 commits into from
May 13, 2024

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented May 13, 2024

A variety of bug fixes, added support for naked functions, a couple more vendor intrinsics implemented.

r? @ghost

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

WaffleLapkin and others added 30 commits April 19, 2024 18:45
@WaffleLapkin
Do intrinsic changes in rustc_codegen_cranelift
d5273ff
@bjorn3
Merge commit 'de5d6523738fd44a0521b6abf3e73ae1df210741' into sync_cg_…
4ad6c6c 
…clif-2024-04-23
@bjorn3
Fix broken subtree sync
f7627c3
@bjorn3
Merge branch 'sync_from_rust'
1122338
@matthiaskrgr
Rollup merge of rust-lang#124003 - WaffleLapkin:dellvmization, r=scot…
6a2ad55 
…tmcm,RalfJung,antoyo

Dellvmize some intrinsics (use `u32` instead of `Self` in some integer intrinsics)

This implements rust-lang/compiler-team#693 minus what was implemented in rust-lang#123226.

Note: I decided to _not_ change `shl`/... builder methods, as it just doesn't seem worth it.

r? ``@scottmcm``
@matthiaskrgr
Rollup merge of rust-lang#124286 - bjorn3:sync_cg_clif-2024-04-23, r=…
36449f8 
…bjorn3

Subtree sync for rustc_codegen_cranelift

This fixes a crash when compiling the standard library. In addition the Cranelift update fixes all the 128bit int abi incompatibility between cg_clif and cg_llvm.

r? ``@ghost``

``@rustbot`` label +A-codegen +A-cranelift +T-compiler
@oli-obk
Error on using yield without also using #[coroutine] on the closure
dda4709 
And suggest adding the `#[coroutine]` to the closure
@petrochenkov
debuginfo: Stabilize -Z debug-macros, -Z collapse-macro-debuginfo…
9a57c63 
… and `#[collapse_debuginfo]`

`-Z debug-macros` is "stabilized" by enabling it by default and removing.

`-Z collapse-macro-debuginfo` is stabilized as `-C collapse-macro-debuginfo`.
It now supports all typical boolean values (`parse_opt_bool`) in addition to just yes/no.

Default value of `collapse_debuginfo` was changed from `false` to `external` (i.e. collapsed if external, not collapsed if local).
`#[collapse_debuginfo]` attribute without a value is no longer supported to avoid guessing the default.
@bjorn3
Sync from rust aed2187
18a109e
@bjorn3
Rustup to rustc 1.79.0-nightly (aed2187 2024-04-27)
a07fd93
@bjorn3
Fix rustc tests
1e485f1
@bjorn3
Downgrade XCode to workaround a bug in ld prime
05367c5
@bjorn3
Rustup to rustc 1.80.0-nightly (79734f1 2024-05-02)
18d2fb6
@bjorn3
Fix rustc test suite
c41a7db
@bjorn3
Remove special case in maybe_create_entry_wrapper
88d1068
@bjorn3
Correctly handle missing CG_CLIF_JIT_ARGS
b1ebc55
@bjorn3
Add missing arg for the jit.std_example test
4d6ac05
@beetrees
Refactor float Primitives to a separate Float type
617c3f6
@compiler-errors
Make builtin_deref just return a Ty
0a67bf1
@matthiaskrgr
Rollup merge of rust-lang#124957 - compiler-errors:builtin-deref, r=m…
80e2a78 
…ichaelwoerister

Make `Ty::builtin_deref` just return a `Ty`

Nowhere in the compiler are we using the mutability part of the `TyAndMut` that we used to return.
@bjorn3
Sync from rust 6e1d947
6633d66
@bjorn3
Rustup to rustc 1.80.0-nightly (6e1d947 2024-05-10)
250d083
@bjorn3
Fix rustc tests
8fe6e74
@bjorn3
Compile for x86_64 on macOS even with an arm64 host
f437815 
We don't support arm64 on macOS yet.
@bjorn3
Don't attempt to polymorphize statics
8cf40c4 
Fixes rust-lang#124319
@bjorn3
Avoid CValue::const_val for discriminants
906db02
@bjorn3
Avoid ICE on transmuting invalid bools
9e4e805 
Fixes rust-lang/rustc_codegen_cranelift#1433
@bjorn3
Try to workaround gha issue with the caching action
9ee010c
@bjorn3
Split cgus into todo and done before the main module codegen loop
50b3427
@bjorn3
Translate MIR to clif ir in parallel with parallel rustc
a167142 
On dev-desktop the advantage of cg_clif over cg_llvm on simple-raytracer
is 15% when parallel rustc is disabled. With -Zthreads=16 the advantage
goes from 5% to 22% with this change.
folkertdev and others added 9 commits May 11, 2024 22:23
@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. 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. labels May 13, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 13, 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 A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend labels May 13, 2024
@bjorn3
Copy link
Member Author

bjorn3 commented May 13, 2024

@bors r+ p=1

@bors
Copy link
Contributor

bors commented May 13, 2024

📌 Commit 75f8bdb 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 May 13, 2024
@fmease
Copy link
Member

fmease commented May 13, 2024

Prioritizing this over the rollup #125079.
@bors p=6

@bors
Copy link
Contributor

bors commented May 13, 2024

⌛ Testing commit 75f8bdb with merge 030a12c...

@bors
Copy link
Contributor

bors commented May 13, 2024

☀️ Test successful - checks-actions
Approved by: bjorn3
Pushing 030a12c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 13, 2024
@bors bors merged commit 030a12c into rust-lang:master May 13, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 13, 2024
@bors bors mentioned this pull request May 13, 2024
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (030a12c): 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

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)		 2.0% [1.1%, 3.0%] 2
Regressions ❌
(secondary)		 2.8% [2.2%, 3.2%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.0% [1.1%, 3.0%] 2

Cycles

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

Binary size

Results

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

Bootstrap: 677.297s -> 677.739s (0.07%)
Artifact size: 316.12 MiB -> 316.16 MiB (0.01%)

@bjorn3 bjorn3 deleted the sync_cg_clif-2024-05-13 branch May 13, 2024 20:09
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 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.