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

Merged
merged 16 commits into from
Jan 10, 2025
Merged

Subtree sync for rustc_codegen_cranelift #135328

merged 16 commits into from
Jan 10, 2025

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jan 10, 2025

This has a couple of changes that will conflict with #134338.

r? @ghost

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

bjorn3 and others added 16 commits January 5, 2025 15:44
@bjorn3
Merge commit '918acafef682d0d0ca30b47de4768210417ff362' into sync_cg_…
a2d78f7 
…clif-2025-01-05
@bjorn3
Merge branch 'sync_from_rust'
adf0f41
@bjorn3
Remove a couple of obsolete tests
a28b986 
mod_bench is basically useless as test and hasn't been used as benchmark
for a long time. alloc_example doesn't test anything that isn't
already tested by std_example.
@bjorn3
Make TimingGuard a little safer
0335dc1
@erickt
Only test proc-macro invalid compile flags with panic=unwind
3998964 
Fuchsia explicitly builds rust and all rust targets with `-C
panic=abort` to minimize code generation size. However, when compiling a
proc-macro with this setting it can cause a warning to be emitted, which
breaks `tests/ui/invalid-compile-flags/crate-type-flag.rs`. This hasn't
been a problem in the past for us since we compile our proc macros on
host, rather than inside Fuchsia.

This attempts to fix the issue by explicitly requiring that we're using
the unwinder when compiling this test to avoid the warning being
emitted.

Fixes rust-lang#135223
@bjorn3
Minor cleanup
916a0b3
@bjorn3
Put rustc_codegen_cranelift.dll in bin rather than lib on Windows
0e8e9b3 
rustc-clif has long been changed from a custom driver linking against
cg_clif to a wrapper around rustc which passes -Zcodegen-backend.
@bjorn3
Make it easier to use unreleased versions of Cranelift
517118e
@bjorn3
Update dependencies
f6d58eb
@bjorn3
Rustup to rustc 1.86.0-nightly (a580b5c 2025-01-08)
c74c817
@bjorn3
Slightly simplify maybe_codegen_checked
ec96e02
@bjorn3
Only handle BinOp::Mul in codegen_i128::maybe_codegen_mul_checked
8fd8b2d
@bjorn3
Couple of cleanups to num.rs
147ac7a
@bjorn3
Sync from rust 8247594
1697935
@bjorn3
Rustup to rustc 1.86.0-nightly (8247594 2025-01-09)
e39eacd
@bjorn3
Merge commit 'e39eacd2d415803ef82de3b6a314e4f2d0fbc4dc' into sync_cg_…
92a664e 
…clif-2025-01-10
@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 Jan 10, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 10, 2025

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 Jan 10, 2025
@bjorn3
Copy link
Member Author

bjorn3 commented Jan 10, 2025

@bors r+ p=1 subtree sync

@bors
Copy link
Contributor

bors commented Jan 10, 2025

📌 Commit 92a664e 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 Jan 10, 2025
@bjorn3 bjorn3 mentioned this pull request Jan 10, 2025
Merged
@bors
Copy link
Contributor

bors commented Jan 10, 2025

⌛ Testing commit 92a664e with merge 336209e...

@bors
Copy link
Contributor

bors commented Jan 10, 2025

☀️ Test successful - checks-actions
Approved by: bjorn3
Pushing 336209e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 10, 2025
@bors bors merged commit 336209e into rust-lang:master Jan 10, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 10, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (336209e): 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 -1.9%, secondary 3.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)		 3.6% [3.6%, 3.6%] 1
Improvements ✅
(primary)		 -1.9% [-1.9%, -1.9%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -1.9% [-1.9%, -1.9%] 1

Cycles

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

Binary size

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

Bootstrap: 763.605s -> 763.192s (-0.05%)
Artifact size: 325.79 MiB -> 325.76 MiB (-0.01%)

@bjorn3 bjorn3 deleted the sync_cg_clif-2025-01-10 branch January 10, 2025 20:37
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.86.0
Development

Successfully merging this pull request may close these issues.
5 participants
@bjorn3 @rustbot @bors @rust-timer @erickt