Skip to content

Shrink ObligationCauseCode - #64302

Merged
bors merged 4 commits into
rust-lang:masterfrom
nnethercote:shrink-ObligationCauseCode
Sep 14, 2019
Merged

Shrink ObligationCauseCode#64302
bors merged 4 commits into
rust-lang:masterfrom
nnethercote:shrink-ObligationCauseCode

Conversation

@nnethercote

@nnethercotennethercote commented Sep 9, 2019

Copy link
Copy Markdown
Contributor

These commits reduce the size of ObligationCauseCode from 56 bytes to 32 bytes on 64-bit. This reduces instruction counts on various benchmarks by up to 1%, due to less memcpying.

@nnethercote
Remove two unnecessary clone() calls.
36b37e2
@nnethercote
Add some assertions on obligation type sizes.
c1b9a46
These are types that get memcpy'd a lot.
@nnethercote
Shrink ObligationCauseCode by boxing MatchExpressionArm.
b972ac8
The reduction in `memcpy` calls greatly outweighs the cost of the extra
allocations, for a net performance win.
@nnethercote
Shrink ObligationCauseCode by boxing IfExpression.
2e3b079
The reduction in `memcpy` calls outweighs the cost of the extra
allocations, for a net performance win.
@rust-highfive

rust-highfive commented Sep 9, 2019

Copy link
Copy Markdown
Contributor

r? @zackmdavis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 9, 2019
@nnethercote

nnethercote commented Sep 9, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors try

@bors

bors commented Sep 9, 2019

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 2e3b079 with merge afbe8d9...

bors added a commit that referenced this pull request Sep 9, 2019
@bors
Auto merge of#64302- nnethercote:shrink-ObligationCauseCode, r=<try>
afbe8d9
Shrink `ObligationCauseCode`
These commits reduce the size of `ObligationCauseCode` from 56 bytes to 32 bytes on 64-bit. This reduces instruction counts on various benchmarks by up to 1%, due to less `memcpy`ing.
@nnethercotennethercote mentioned this pull request Sep 9, 2019
Closed
@bors

bors commented Sep 9, 2019

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-azure
Build commit: afbe8d9

@nnethercote

nnethercote commented Sep 9, 2019

Copy link
Copy Markdown
ContributorAuthor

@rust-timer build afbe8d9

@rust-timer

rust-timer commented Sep 9, 2019

Copy link
Copy Markdown
Collaborator

Success: Queued afbe8d9 with parent 7eb65df, comparison URL.

@rust-timer

rust-timer commented Sep 9, 2019

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit afbe8d9, comparison URL.

@nnethercote

nnethercote commented Sep 9, 2019

Copy link
Copy Markdown
ContributorAuthor

BTW, I tried taking things a step further, by boxing the BuiltinDerivedObligation and ImplDerivedObligation variants of ObligationCauseCode. This shrank ObligationCauseCode from 32 bytes to 24 bytes, but ended up slowing things down because the memcpy improvements were outweighed by the cost of the additional allocations.

Also, these results are good, but I might wait a bit before landing. AFAICT, this change causes LLVM to use direct code for PredicateObligation copies instead of memcpy. (The commits reduce the size of that type from 136 bytes to 112 bytes... maybe >128 bytes is the threshold for LLVM using memcpy?) And in doing so, it hides all the remaining PredicateObligation copies from my new profiling tool, which only looks at memcpy calls!

@mati865

mati865 commented Sep 10, 2019

Copy link
Copy Markdown
Member

Indeed 128 is the threshold for using libc instead of memcpy: https://github.com/llvm/llvm-project/blob/127240acf1001b72c0c52863ffe3dc39b7c5fd6d/llvm/lib/Target/X86/X86Subtarget.h#L437

@nnethercote

nnethercote commented Sep 12, 2019

Copy link
Copy Markdown
ContributorAuthor

I might wait a bit before landing

@zackmdavis: I'm ready to land now, review away :)

@zackmdavis

zackmdavis commented Sep 14, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 2e3b079 has been approved by zackmdavis

@borsbors 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 Sep 14, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
@Centril
Rollup merge ofrust-lang#64302- nnethercote:shrink-ObligationCauseC…
234436b
…ode, r=zackmdavis
Shrink `ObligationCauseCode`
These commits reduce the size of `ObligationCauseCode` from 56 bytes to 32 bytes on 64-bit. This reduces instruction counts on various benchmarks by up to 1%, due to less `memcpy`ing.
@CentrilCentril mentioned this pull request Sep 14, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
@Centril
Rollup merge ofrust-lang#64302- nnethercote:shrink-ObligationCauseC…
07d9cd2
…ode, r=zackmdavis
Shrink `ObligationCauseCode`
These commits reduce the size of `ObligationCauseCode` from 56 bytes to 32 bytes on 64-bit. This reduces instruction counts on various benchmarks by up to 1%, due to less `memcpy`ing.
@CentrilCentril mentioned this pull request Sep 14, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
@Centril
Rollup merge ofrust-lang#64302- nnethercote:shrink-ObligationCauseC…
1054158
…ode, r=zackmdavis
Shrink `ObligationCauseCode`
These commits reduce the size of `ObligationCauseCode` from 56 bytes to 32 bytes on 64-bit. This reduces instruction counts on various benchmarks by up to 1%, due to less `memcpy`ing.
@CentrilCentril mentioned this pull request Sep 14, 2019
Merged
bors added a commit that referenced this pull request Sep 14, 2019
@bors
Auto merge of#64456- Centril:rollup-ytqdwaq, r=Centril
ca3766e
Rollup of 17 pull requests
Successful merges:
- #63846 (Added table containing the system calls used by Instant and SystemTime.)
- #64116 (Fix minor typo in docs.)
- #64203 (A few cosmetic improvements to code & comments in liballoc and libcore)
- #64302 (Shrink `ObligationCauseCode`)
- #64372 (use randSecure and randABytes)
- #64374 (Box `DiagnosticBuilder`.)
- #64375 (Fast path for vec.clear/truncate )
- #64378 (Fix inconsistent link formatting.)
- #64384 (Trim rustc-workspace-hack)
- #64393 ( declare EnvKey before use to fix build error)
- #64420 (Inline `mark_neighbours_as_waiting_from`.)
- #64422 (Remove raw string literal quotes from error index descriptions)
- #64423 (Add self to .mailmap)
- #64425 (typo fix)
- #64431 (fn ptr is structural match)
- #64435 (codegen: use "_N" (like for other locals) instead of "argN", for argument names.)
- #64439 (fix#64430, confusing `owned_box` error message in no_std build)
Failed merges:
r? @ghost
@bors
bors merged commit 2e3b079 into rust-lang:masterSep 14, 2019
@nnethercote
nnethercote deleted the shrink-ObligationCauseCode branch September 14, 2019 23:27
@zslaytonzslayton mentioned this pull request Dec 28, 2020
Merged
m-komilov
m-komilov reviewed Feb 24, 2023
View reviewed changes

@m-komilovm-komilov left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

good job

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

Reviewers

1 more reviewer
@m-komilovm-komilovm-komilov left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@zackmdaviszackmdavis

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@nnethercote@rust-highfive@bors@rust-timer@mati865@zackmdavis@m-komilov