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

Clean up and optimize OpenTask / read_index #57114

Merged
merged 1 commit into from Jan 8, 2019

Conversation

Projects
None yet
7 participants
@Zoxc
Copy link
Contributor

Zoxc commented Dec 25, 2018

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

Zoxc commented Dec 25, 2018

@bors try

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 25, 2018

⌛️ Trying commit 8c1fab1 with merge a0a3e1c...

bors added a commit that referenced this pull request Dec 25, 2018

Auto merge of #57114 - Zoxc:query-perf11, r=<try>
Clean up and optimize OpenTask / read_index

r? @michaelwoerister
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 25, 2018

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

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

Zoxc commented Dec 25, 2018

@rust-timer build a0a3e1c

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 25, 2018

Success: Queued a0a3e1c with parent ad781a0, comparison URL.

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 25, 2018

Finished benchmarking try commit a0a3e1c

@Zoxc Zoxc force-pushed the Zoxc:query-perf11 branch from 8c1fab1 to 50d80ce Dec 25, 2018

@@ -409,7 +418,7 @@ impl DepGraph {
#[inline]
pub fn read_index(&self, dep_node_index: DepNodeIndex) {
if let Some(ref data) = self.data {
data.current.borrow_mut().read_index(dep_node_index);
data.read_index(dep_node_index);

This comment has been minimized.

@Zoxc

Zoxc Dec 25, 2018

Author Contributor

Note: We no longer need the global dep graph lock here for parallel queries.

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 31, 2018

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

@Zoxc Zoxc force-pushed the Zoxc:query-perf11 branch from 50d80ce to 584a520 Dec 31, 2018

@michaelwoerister
Copy link
Contributor

michaelwoerister left a comment

Looks great, thanks @Zoxc!

I wonder if we can get rid of the lock around the read-set too at some point. Maybe collect reads per thread, without locking, and merge them during task completion. But correctness is a concern here. We rely on the order of reads during try_mark_green. Anyway, no need to solve this now.

@bors r+

@phansch

This comment has been minimized.

Copy link
Contributor

phansch commented Jan 7, 2019

@michaelwoerister I think bors doesn't work with commands in review comments

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

Mark-Simulacrum commented Jan 7, 2019

@bors r=michaelwoerister

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 7, 2019

📌 Commit 584a520 has been approved by michaelwoerister

@michaelwoerister

This comment has been minimized.

Copy link
Contributor

michaelwoerister commented Jan 7, 2019

Thanks for the heads up!

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 8, 2019

⌛️ Testing commit 584a520 with merge b8c8f0b...

bors added a commit that referenced this pull request Jan 8, 2019

Auto merge of #57114 - Zoxc:query-perf11, r=michaelwoerister
Clean up and optimize OpenTask / read_index

r? @michaelwoerister
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 8, 2019

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

@bors bors merged commit 584a520 into rust-lang:master Jan 8, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@Zoxc Zoxc deleted the Zoxc:query-perf11 branch Jan 8, 2019

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