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

Update llvm-project #98567

Merged
merged 1 commit into from
Jul 6, 2022
Merged

Update llvm-project #98567

merged 1 commit into from
Jul 6, 2022

Conversation

Patryk27
Copy link
Contributor

@Patryk27 Patryk27 commented Jun 27, 2022 •
edited
Loading

Closes #98167 🙂

@rust-highfive
Copy link
Collaborator

r? @cuviper

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 27, 2022
@slanterns
Copy link
Contributor

duplicate with #98285 ?

@Patryk27
Copy link
Contributor Author

Kinda, that one doesn't contain the recent commit from yesterday that fixes the AVR bug I've linked 😅 (since it uses llvm-project from two days ago)

I guess I'll just rebase my PR after #98285 gets merged.

@bors
Copy link
Contributor

bors commented Jun 27, 2022

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

@Patryk27
Copy link
Contributor Author

Ready!

@cuviper
Copy link
Member

cuviper commented Jun 27, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jun 27, 2022

📌 Commit dafe7a17847dfb287430155ab0c6be84da0b556b has been approved by cuviper

@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 Jun 27, 2022
@nikic
Copy link
Contributor

nikic commented Jul 5, 2022

As this hasn't been merged yet, would you mind updating this PR to the latest commit? I've pushed two more backports.

@Patryk27
Copy link
Contributor Author

Patryk27 commented Jul 5, 2022

Sure, I’ll take a look in two hours or so 🙂

@Patryk27
Copy link
Contributor Author

Patryk27 commented Jul 5, 2022

kk, done!

@nikic
Copy link
Contributor

nikic commented Jul 5, 2022

Thanks!

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jul 5, 2022

📌 Commit d61e4a4 has been approved by nikic

@RalfJung RalfJung mentioned this pull request Jul 6, 2022
Merged
@bors
Copy link
Contributor

bors commented Jul 6, 2022

⌛ Testing commit d61e4a4 with merge 0aef720...

@bors
Copy link
Contributor

bors commented Jul 6, 2022

☀️ Test successful - checks-actions
Approved by: nikic
Pushing 0aef720 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 6, 2022
@bors bors merged commit 0aef720 into rust-lang:master Jul 6, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 6, 2022
@Patryk27 Patryk27 deleted the update-llvm branch July 6, 2022 15:18
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0aef720): comparison url.

Instruction count

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 0.7% 0.9% 8
Regressions 😿
(secondary)		 1.5% 2.4% 10
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -1.1% -1.1% 1
All 😿🎉 (primary) 0.7% 0.9% 8

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 😿 relevant regression found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 2.1% 2.1% 1
Improvements 🎉
(primary)		 -1.0% -1.0% 1
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) -1.0% -1.0% 1

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 2.9% 4.0% 9
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) N/A N/A 0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@rustbot rustbot added the perf-regression Performance regression. label Jul 6, 2022
@nikic
Copy link
Contributor

nikic commented Jul 6, 2022

Perf result seems to be noise, it seems to be the opposite of the results on the previous commit: https://perf.rust-lang.org/compare.html?start=f342bea9d19f14616c6559312552e6d0ee529cfd&end=5b8cf49c51833ee5d27ae2e8e179337dbb9f14d7&stat=instructions:u

@nikic nikic added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 6, 2022
@nikic
Copy link
Contributor

nikic commented Jul 6, 2022

Beta nominating as fix for the P-critical miscompile in #98568. The update also includes a fix for an AVR-only miscompile (#98167), as well as an assertion failure (#98076).

Submodule diff: rust-lang/llvm-project@d1ddc34...8b6b501

@workingjubilee
Copy link
Member

Thank you, @Patryk27 and @nikic!

@apiraino apiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 7, 2022
@apiraino
Copy link
Contributor

apiraino commented Jul 7, 2022

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 7, 2022
@Mark-Simulacrum
Copy link
Member

@nikic is it a problem if we backport by rolling forward to the latest commit here on beta? (rust-lang/llvm-project@c9e2e89...8b6b501)

Otherwise can create a targeted backport with a helper branch, but want to make sure there's no accidental mistakes missing a dependency on a previous commit here.

@nikic
Copy link
Contributor

nikic commented Jul 9, 2022

@Mark-Simulacrum I think we need a separate backport branch here, because the LLVM fork has been rebased in the meantime, and I'm not confident that it will build on beta (specifically FreeBSD). And no, I don't think there are any relevant dependency commits.

@Mark-Simulacrum
Copy link
Member

OK, sounds good. I'll look into doing that.

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 9, 2022
@Mark-Simulacrum
Backport "Update llvm-project rust-lang#98567"
b5c6911 
This cherry picks:

* c9676870a8f378940ec446c4184254f361feabe6
* f14a034634ac7ddc314008e39d62af6ceae0166a
* 3317cfea1b72c0861c9e4e9f5eba5713fd19e7f7
* 8b6b5014fdad3a750f7242a6bfdcad83619498d4
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 9, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.64.0, 1.63.0 Jul 9, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 9, 2022
Merged
@Mark-Simulacrum
Copy link
Member

Included in #99098, branch rustc/14.0-2022-07-09.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 10, 2022
@bors
Auto merge of rust-lang#99098 - Mark-Simulacrum:beta-next, r=Mark-Sim…
93ef0cd 
…ulacrum

[beta] backport rollup

*  Return a FxIndexSet in is_late_bound query. rust-lang#98959
*  rustdoc: filter '_ lifetimes from ty::PolyTraitRef rust-lang#98727
* don't succeed evaluate_obligation query if new opaque types were registered rust-lang#98614
*  Update llvm-project rust-lang#98567

There's a few more as-yet-unapproved/unmerged PRs that'll land later, but creating a partial rollup for now so that we can include at least some PRs in the first crater run.

r? `@Mark-Simulacrum`
@Mark-Simulacrum Mark-Simulacrum removed the perf-regression Performance regression. label Jul 12, 2022
@Mark-Simulacrum
Copy link
Member

Dropping regression label, agree that the results are likely noise. See #98925 (comment) for some graphs.

@pnkfelix pnkfelix mentioned this pull request Jul 28, 2022
Closed
Rahix added a commit to Rahix/avr-hal that referenced this pull request Jul 28, 2022
@Rahix
Upgrade toolchain
f6c8b31 
Newest rustc contains an important bugfix to AVR's code generator
(rust-lang/rust#98567).

Ref: Rahix/avr-hal-template#9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.63.0
Development

Successfully merging this pull request may close these issues.

Code generation error on AVR using u16::to_be()