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.

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

Inline Poll methods #107987

Merged
merged 1 commit into from
Feb 28, 2023
Merged

Inline Poll methods #107987

merged 1 commit into from
Feb 28, 2023

Conversation

EFanZh
Copy link
Contributor

@EFanZh EFanZh commented Feb 13, 2023

With opt-level="z", the Poll::map* methods are sometimes not inlined (see https://godbolt.org/z/ca5ajKTEK). This PR adds #[inline] to these methods. I have a project that can benefit from this change, but do we want to enable this behavior universally?

Fixes #101080.

@rustbot
Copy link
Collaborator

rustbot commented Feb 13, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Feb 13, 2023
@rustbot
Copy link
Collaborator

rustbot commented Feb 13, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

Copy link
Contributor

@eggyal eggyal left a comment

Choose a reason for hiding this comment

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

Seems reasonable to me: it's consistent with guidance at https://std-dev-guide.rust-lang.org/code-considerations/performance/inline.html (modulo genericness, though the map_* methods on Option and Result are also #[inline] and this isn't really any different, plus it does indeed change the inlining behaviour as per the raised issue).

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 25, 2023

📌 Commit 4bb0a5e has been approved by Mark-Simulacrum

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 Feb 25, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Feb 26, 2023
…-Simulacrum

Inline `Poll` methods

With `opt-level="z"`, the `Poll::map*` methods are sometimes not inlined (see <https://godbolt.org/z/ca5ajKTEK>). This PR adds `#[inline]` to these methods. I have a project that can benefit from this change, but do we want to enable this behavior universally?

Fixes rust-lang#101080.
@bors
Copy link
Contributor

bors commented Feb 28, 2023

⌛ Testing commit 4bb0a5e with merge 31f858d...

@bors
Copy link
Contributor

bors commented Feb 28, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 31f858d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 28, 2023
@bors bors merged commit 31f858d into rust-lang:master Feb 28, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 28, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (31f858d): 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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.1% [-3.2%, -2.9%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -3.1% [-3.2%, -2.9%] 2

Cycles

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

@EFanZh EFanZh deleted the inline-poll-methods branch May 6, 2023 03:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consider inlining Poll::map, Poll::map_ok and Poll::map_err
6 participants