Even more `ObligationForest` improvements by nnethercote · Pull Request #64627 · rust-lang/rust

nnethercote · 2019-09-20T02:57:26Z

Following on from #64545, more speed and readability improvements.

This gives a slight speed-up.

Optimizing for the common numbers of entries in `stalled_on` wins about 4% on `keccak` and `inflate`.

This is a big speed win for `keccak` and `inflate`.

We normally use `index` for indices to `ObligationForest::nodes`, but this is a `Nodes::dependents` index.

The name `waiting_cache` sounds like it is related to the states `NodeState::Waiting`, but it's not; the cache holds nodes of various states. This commit changes it to `active_state`.

Because the meaning of this `index` variable is quite different to all the other `index` variables in this file.

nnethercote · 2019-09-20T02:57:52Z

@bors try @rust-timer queue

rust-timer · 2019-09-20T02:57:53Z

Awaiting bors try build completion

bors · 2019-09-20T02:58:03Z

⌛ Trying commit aa10abb with merge 281fcd7...

@nikomatsakis

Even more `ObligationForest` improvements Following on from #64545, more speed and readability improvements. r? @nikomatsakis

bors · 2019-09-20T07:13:03Z

💥 Test timed out

nnethercote · 2019-09-20T07:24:12Z

Not sure what happened there. Let's try it the old-fashioned way:
@bors try

bors · 2019-09-20T07:24:23Z

⌛ Trying commit aa10abb with merge 85a4a15...

@nikomatsakis

Even more `ObligationForest` improvements Following on from #64545, more speed and readability improvements. r? @nikomatsakis

nnethercote · 2019-09-20T09:50:32Z

Some local measurements:

inflate-check
avg: -10.3% min: -14.3% max: 0.1%
keccak-check
avg: -7.8% min: -12.0% max: 0.0%
cranelift-codegen-check
avg: -1.2% min: -2.0% max: 0.0%
clap-rs-check
avg: -0.6% min: -1.6% max: -0.0%
serde-check
avg: -0.5% min: -0.8% max: 0.1%
unify-linearly-check
avg: -0.3% min: -0.7% max: 0.0% deeply-nested-check
avg: -0.4% min: -0.6% max: 0.0% style-servo-check
avg: -0.4% min: -0.6% max: 0.0%
wg-grammar-check
avg: -0.3% min: -0.5% max: -0.0%
cargo-check
avg: -0.2% min: -0.3% max: 0.0%
syn-check
avg: -0.1% min: -0.3% max: 0.0%

bors · 2019-09-20T10:14:56Z

☀️ Try build successful - checks-azure
Build commit: 85a4a15

rust-timer · 2019-09-20T10:14:57Z

Queued 85a4a15 with parent ea3ba36, future comparison URL.

rust-timer · 2019-09-20T12:57:06Z

Finished benchmarking try commit 85a4a15, comparison URL.

bjorn3 · 2019-09-22T17:09:01Z

@nnethercote Do you every take a day off of optimizing rustc? 😄

nikomatsakis · 2019-09-23T17:04:58Z

@bors r+

bors · 2019-09-23T17:04:59Z

📌 Commit aa10abb has been approved by nikomatsakis

nnethercote · 2019-09-23T22:04:45Z

@bors rollup=never

bors · 2019-09-25T05:54:07Z

⌛ Testing commit aa10abb with merge c7bc0bf...

@nikomatsakis

Even more `ObligationForest` improvements Following on from #64545, more speed and readability improvements. r? @nikomatsakis

bors · 2019-09-25T09:54:45Z

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing c7bc0bf to master...

@nikomatsakis

… r=nikomatsakis Still more `ObligationForest` improvements. Following on from rust-lang#64627, more readability improvements, but negligible effects on speed. r? @nikomatsakis

nnethercote added 7 commits September 20, 2019 07:22

Reorder the state handling in process_cycles().
aaff05b
This gives a slight speed-up.

Specialize the stalled_on handling in process_obligation().
acf7d4d
Optimizing for the common numbers of entries in `stalled_on` wins about 4% on `keccak` and `inflate`.

Upgrade to ena-0.13.1 and use the new inlined_probe_value function.
3eae7f6
This is a big speed win for `keccak` and `inflate`.

Remove some unnecessary backtrace intermediate variables.
8d73faf

Rename a loop variable.
75fd4f7
We normally use `index` for indices to `ObligationForest::nodes`, but this is a `Nodes::dependents` index.

Rename waiting_cache.
27c7c23
The name `waiting_cache` sounds like it is related to the states `NodeState::Waiting`, but it's not; the cache holds nodes of various states. This commit changes it to `active_state`.

Rename a variable.
aa10abb
Because the meaning of this `index` variable is quite different to all the other `index` variables in this file.

rust-highfive assigned nikomatsakis Sep 20, 2019

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

bors added a commit that referenced this pull request Sep 20, 2019
Auto merge of#64627- nnethercote:ObligForest-even-more, r=<try>
281fcd7
Even more `ObligationForest` improvements Following on from #64545, more speed and readability improvements. r? @nikomatsakis

bors added a commit that referenced this pull request Sep 20, 2019
Auto merge of#64627- nnethercote:ObligForest-even-more, r=<try>
85a4a15
Even more `ObligationForest` improvements Following on from #64545, more speed and readability improvements. r? @nikomatsakis

nikomatsakis approved these changes Sep 23, 2019
View reviewed changes

Comment threadsrc/librustc/traits/fulfill.rs

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 Sep 23, 2019

bors added a commit that referenced this pull request Sep 25, 2019
Auto merge of#64627- nnethercote:ObligForest-even-more, r=nikomatsakis
c7bc0bf
Even more `ObligationForest` improvements Following on from #64545, more speed and readability improvements. r? @nikomatsakis

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 25, 2019

bors merged commit aa10abb into rust-lang:masterSep 25, 2019

nnethercote deleted the ObligForest-even-more branch September 25, 2019 20:11

nnethercote mentioned this pull request Sep 26, 2019
Still more ObligationForest improvements. #64805
Merged

Uh oh!

Uh oh!

Conversation

nnethercote commented Sep 20, 2019

Uh oh!

nnethercote commented Sep 20, 2019

Uh oh!

rust-timer commented Sep 20, 2019

Uh oh!

bors commented Sep 20, 2019

Uh oh!

bors commented Sep 20, 2019

Uh oh!

nnethercote commented Sep 20, 2019

Uh oh!

bors commented Sep 20, 2019

Uh oh!

nnethercote commented Sep 20, 2019

Uh oh!

bors commented Sep 20, 2019

Uh oh!

rust-timer commented Sep 20, 2019

Uh oh!

rust-timer commented Sep 20, 2019

Uh oh!

bjorn3 commented Sep 22, 2019

Uh oh!

Uh oh!

nikomatsakis commented Sep 23, 2019

Uh oh!

bors commented Sep 23, 2019

Uh oh!

nnethercote commented Sep 23, 2019

Uh oh!

bors commented Sep 25, 2019

Uh oh!

bors commented Sep 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants