Skip to content

Rollup of 3 pull requests - #90387

Merged
bors merged 9 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-b2x8v0x
Oct 29, 2021
Merged

Rollup of 3 pull requests#90387
bors merged 9 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-b2x8v0x

Conversation

@matthiaskrgr

@matthiaskrgrmatthiaskrgr commented Oct 28, 2021

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

noncombatantand others added 9 commits October 19, 2021 20:23
@noncombatant
Fix minor typos
886f1f8
@mbartlett21
Remove extra lines in examples for Duration::try_from_secs_*
aa48de0
@oli-obk
Remove dead code.
f1a2f20
We don't do member constraint checks in regionck anymore.
All member constraint checks are done in mir borrowck.
@oli-obk
Manually inline a function that is only ever called at the end of ano…
849b73b
…ther function
@oli-obk
Move some functions into rustc_infer.
a8f06b2
They don't depend on trait selection anymore, so there is no need for an extension trait.
@oli-obk
Move instantiate_opaque_types to rustc_infer.
bc552fc
It does not depend on anything from rustc_trait_selection anymore.
@matthiaskrgr
Rollup merge ofrust-lang#90082- noncombatant:patch-1, r=GuillaumeGomez
dbe7141
Fix minor typos
@matthiaskrgr
Rollup merge ofrust-lang#90336- mbartlett21:patch-4, r=Mark-Simulacrum
ae244d8
Remove extra lines in examples for `Duration::try_from_secs_*`
None of the other examples have extra lines below the `#![feature(...)]` statements, so I thought it appropriate that these examples shouldn't either.
@matthiaskrgr
Rollup merge ofrust-lang#90376- oli-obk:🧹, r=spastorino
bcee0a6
Various cleanups around opaque types
Best reviewed commit by commit.
This PR has no functional changes.
Mostly it's moving logic from an extension trait in rustc_trait_selection to inherent impls on rustc_infer.
@rustbotrustbot added the rollup A PR which is a rollup label Oct 28, 2021
@matthiaskrgr

matthiaskrgr commented Oct 28, 2021

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=3 rollup=never

@bors

bors commented Oct 28, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit bcee0a6 has been approved by matthiaskrgr

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 28, 2021
@bors

bors commented Oct 28, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bcee0a6 with merge df76418...

@bors

bors commented Oct 29, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing df76418 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 29, 2021
@bors
bors merged commit df76418 into rust-lang:masterOct 29, 2021
@rustbotrustbot added this to the 1.58.0 milestone Oct 29, 2021
@rust-timer

rust-timer commented Oct 29, 2021

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (df76418): comparison url.

Summary: This change led to large relevant regressions 😿 in compiler performance.

  • Large regression in instruction counts (up to 2.4% on full builds of inflate)

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

@rustbotrustbot added the perf-regression Performance regression. label Oct 29, 2021
@pnkfelix

pnkfelix commented Nov 2, 2021

Copy link
Copy Markdown
Contributor

Given the list of PR's on this rollup, it seems like PR #90376 is the most likely source of the regression detected in previous comment.

@pnkfelix

pnkfelix commented Nov 2, 2021

Copy link
Copy Markdown
Contributor

inflate regressed by 1.2-2.4% in various contexts. All other regressions were less than 1%.

based on manual review of PR #90376, I'm willing to believe that the performance change here is due to code memory alignment artifacts that can be caused by code rearrangement.

@rustbot label: +perf-regression-triaged

@rustbotrustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 2, 2021
@matthiaskrgr
matthiaskrgr deleted the rollup-b2x8v0x branch November 20, 2021 15:03
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

merged-by-borsThis PR was explicitly merged by bors.perf-regressionPerformance regression.perf-regression-triagedThe performance regression has been triaged.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.58.0

Development

Successfully merging this pull request may close these issues.

8 participants

@matthiaskrgr@bors@rust-timer@pnkfelix@rustbot@noncombatant@mbartlett21@oli-obk