Skip to content

Optimize try_mark_green and eliminate the lock on dep node colors - #57065

Merged
bors merged 2 commits into
rust-lang:masterfrom
Zoxc:graph-tweaks
Jan 18, 2019
Merged

Optimize try_mark_green and eliminate the lock on dep node colors#57065
bors merged 2 commits into
rust-lang:masterfrom
Zoxc:graph-tweaks

Conversation

@Zoxc

@ZoxcZoxc commented Dec 22, 2018

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 22, 2018
@Zoxc

Zoxc commented Dec 22, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors try

@bors

bors commented Dec 22, 2018

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 84aa34d621f10826957bb64c08699307a3f69fc3 with merge 2897f68c5b419b38ac5e1a32910abe9112ea8a3c...

@bors

bors commented Dec 22, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-travis
State: approved= try=True

@michaelwoerister

Copy link
Copy Markdown
Member

Nice :) This is something I wanted to try out for a while. (I haven't looked at the specific implementation here yet though).

@rust-timer build 2897f68c5b419b38ac5e1a32910abe9112ea8a3c

@Zoxc

Zoxc commented Dec 23, 2018

Copy link
Copy Markdown
ContributorAuthor

@rust-timer build 2897f68c5b419b38ac5e1a32910abe9112ea8a3c

@rust-timer

Copy link
Copy Markdown
Collaborator

Success: Queued 2897f68c5b419b38ac5e1a32910abe9112ea8a3c with parent fa922ab, comparison URL.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit 2897f68c5b419b38ac5e1a32910abe9112ea8a3c

@michaelwoerister

Copy link
Copy Markdown
Member

This is another case where measuring with parallel queries would be useful...

@Zoxc

Zoxc commented Jan 7, 2019

Copy link
Copy Markdown
ContributorAuthor

@michaelwoerister Benchmarks on x86 won't be useful, since the atomic operations lowers to regular load/stores, so this literally just removes the lock on dep node colors.

@michaelwoerister

Copy link
Copy Markdown
Member

I know but that lock can only be really expensive with parallel queries because of contention, right?

@bors

bors commented Jan 15, 2019

Copy link
Copy Markdown
Collaborator

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

@michaelwoeristermichaelwoerister left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It would have been nice to have a performance comparison for the multi-threaded case but that's complicated and not really worth the effort. The changes already show a small win in single-threaded mode and it can only improve the situation with parallel queries, so let's go ahead and merge.

r=me with the nits addressed.

Great work, @Zoxc!

Comment threadsrc/librustc/dep_graph/graph.rs Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could you add a doc comment here? Something like "Try to mark a dep-node green for which we already know that it existed in the previous compilation session".

Comment threadsrc/librustc/dep_graph/graph.rs Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already do the debug assertion a few lines above. You can just remove this one (and move the comment up).

Comment threadsrc/librustc/dep_graph/graph.rs Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could you move this comment into the None branch of the match below?

@Zoxc

Zoxc commented Jan 15, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=michaelwoerister

@bors

bors commented Jan 15, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 1313678 has been approved by michaelwoerister

@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 Jan 15, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 15, 2019
Optimize try_mark_green and eliminate the lock on dep node colors
Blocked on rust-lang#56614
r? @michaelwoerister
@CentrilCentril mentioned this pull request Jan 15, 2019
bors added a commit that referenced this pull request Jan 16, 2019
Rollup of 6 pull requests
Successful merges:
- #56884 (rustdoc: overhaul code block lexing errors)
- #57065 (Optimize try_mark_green and eliminate the lock on dep node colors)
- #57107 (Add a regression test for mutating a non-mut #[thread_local])
- #57268 (Add a target option "merge-functions", and a corresponding -Z flag (works around #57356))
- #57551 (resolve: Add a test for issue #57539)
- #57598 (Add missing unpretty option help message)
Failed merges:
r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
Optimize try_mark_green and eliminate the lock on dep node colors
Blocked on rust-lang#56614
r? @michaelwoerister
@CentrilCentril mentioned this pull request Jan 17, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
Optimize try_mark_green and eliminate the lock on dep node colors
Blocked on rust-lang#56614
r? @michaelwoerister
@CentrilCentril mentioned this pull request Jan 17, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 17, 2019
Optimize try_mark_green and eliminate the lock on dep node colors
Blocked on rust-lang#56614
r? @michaelwoerister
@CentrilCentril mentioned this pull request Jan 17, 2019
@bors

bors commented Jan 18, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1313678 with merge 527b8d4...

bors added a commit that referenced this pull request Jan 18, 2019
Optimize try_mark_green and eliminate the lock on dep node colors
Blocked on #56614
r? @michaelwoerister
@bors

bors commented Jan 18, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: michaelwoerister
Pushing 527b8d4 to master...

@bors
bors merged commit 1313678 into rust-lang:masterJan 18, 2019
@Zoxc
Zoxc deleted the graph-tweaks branch January 28, 2019 18:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@Zoxc@bors@michaelwoerister@rust-timer@rust-highfive