Skip to content

llvm-wrapper: remove llvm 12 hack #120368

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
Merged
merged 2 commits into from
Feb 6, 2024
Merged

llvm-wrapper: remove llvm 12 hack #120368

merged 2 commits into from
Feb 6, 2024

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jan 26, 2024

effectively reverts 9a8acea

r? @nikic

@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 Jan 26, 2024
@nikic
Copy link
Contributor

nikic commented Jan 26, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 26, 2024

📌 Commit f1b5131 has been approved by nikic

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. labels Jan 26, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 26, 2024
@matthiaskrgr
Rollup merge of rust-lang#120368 - klensy:llvm-fixme, r=nikic
8fe3ffa 
llvm-wrapper: remove llvm 12 hack

effectively reverts rust-lang@9a8acea

r? `@nikic`
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 26, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2024
@bors
Auto merge of rust-lang#120394 - matthiaskrgr:rollup-hq30gxj, r=matth…
fbeb426 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#103522 (stabilise array methods)
 - rust-lang#113489 (impl `From<&[T; N]>` for `Cow<[T]>`)
 - rust-lang#119562 (Rename `pointer` field on `Pin`)
 - rust-lang#119800 (Document `rustc_index::vec::IndexVec`)
 - rust-lang#120368 (llvm-wrapper: remove llvm 12 hack)
 - rust-lang#120378 (always normalize `LoweredTy` in the new solver)
 - rust-lang#120382 (Classify closure arguments in refutable pattern in argument error)
 - rust-lang#120389 (Add fmease to the compiler review rotation)

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

@bors r-
probably caused this llvm test failure? #120394 (comment)

@bors 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 Jan 26, 2024
@nikic
Copy link
Contributor

nikic commented Jan 26, 2024

Yes, that's how failure to run NameAnonGlobals manifests.

nikic
nikic reviewed Jan 26, 2024
View reviewed changes
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
// before the RequiredLTOPreLinkPasses, in which case we can remove these hacks.
if (OptimizerLastEPCallbacks.empty())
NeedThinLTOBufferPasses = false;
NeedThinLTOBufferPasses = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe you also need to drop the OptStage != LLVMRustOptStage::PreLinkThinLTO condition above and drop the manual OptimizerLastEPCallbacks scheduling below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, locally tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs passes for me on x86_64-pc-windows-msvc.

@nikic
Copy link
Contributor

nikic commented Feb 6, 2024

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Feb 6, 2024

📌 Commit ca35cfb has been approved by nikic

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 6, 2024
@bors
Copy link
Collaborator

bors commented Feb 6, 2024

⌛ Testing commit ca35cfb with merge 037f515...

@bors
Copy link
Collaborator

bors commented Feb 6, 2024

☀️ Test successful - checks-actions
Approved by: nikic
Pushing 037f515 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 6, 2024
@bors bors merged commit 037f515 into rust-lang:master Feb 6, 2024
@rustbot rustbot added this to the 1.78.0 milestone Feb 6, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (037f515): 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.4% [-0.4%, -0.4%] 1
All ❌✅ (primary) - - 0

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)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 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: 663.088s -> 661.097s (-0.30%)
Artifact size: 308.10 MiB -> 308.13 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikic nikic nikic left review comments

Assignees

@nikic nikic

Labels
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.78.0
Development

Successfully merging this pull request may close these issues.
6 participants
@klensy @nikic @bors @matthiaskrgr @rust-timer @rustbot