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.

Sign up for GitHub

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

Jump to bottom

Run some stuff in parallel #51383

Merged
merged 6 commits into from
Jun 19, 2018
Merged

Run some stuff in parallel #51383

merged 6 commits into from
Jun 19, 2018

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Jun 5, 2018

Requires #50699 to actually work correctly.

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 5, 2018
@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 6, 2018

@bors try

@bors
Copy link
Contributor

bors commented Jun 6, 2018

⌛ Trying commit 98a2688 with merge e8c5b81...

bors added a commit that referenced this pull request Jun 6, 2018
@bors
Auto merge of #51383 - Zoxc:parallel-stuff, r=<try>
e8c5b81 
Run some stuff in parallel

Requires #50699 to actually work correctly.

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Jun 6, 2018

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

@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 6, 2018

@Mark-Simulacrum Can I get a perf run?

@Mark-Simulacrum
Copy link
Member

Perf queued.

@nikomatsakis
Copy link
Contributor

What exactly are you testing, given that #50699 didn't land yet?

@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 6, 2018

This adds Locks to mono item collection so I want to make sure this doesn't add overhead for single-threaded rustc.

@nikomatsakis
Copy link
Contributor

Ah, of course. Sounds good!

@nikomatsakis
Copy link
Contributor

r=me modulo perf results

@nikomatsakis nikomatsakis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 8, 2018
@Mark-Simulacrum
Copy link
Member

Perf looks mostly unchanged: https://perf.rust-lang.org/compare.html?start=685faa2c3ee062aaf30ddf6d3daf4ef3b576979b&end=e8c5b810fdf5ce9b0078599111416241bb14773b&stat=instructions%3Au.

@Zoxc Zoxc force-pushed the parallel-stuff branch from 98a2688 to a0b871b Compare June 8, 2018 15:50
@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 8, 2018

I got rid of the RefCell which should avoid the performance regression without cfg(parallel_queries). MTRef<'a, MTLock<T> maps to &'a Lock<T> with parallel queries and &'a mut T without.

@bors
Copy link
Contributor

bors commented Jun 16, 2018

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

@nikomatsakis
Copy link
Contributor

@Zoxc r=me once rebased

@Zoxc Zoxc force-pushed the parallel-stuff branch from a0b871b to fe1cb88 Compare June 19, 2018 01:21
@Zoxc
Copy link
Contributor Author

Zoxc commented Jun 19, 2018

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Jun 19, 2018

📌 Commit fe1cb88 has been approved by nikomatsakis

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 19, 2018
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 19, 2018
@bors
Copy link
Contributor

bors commented Jun 19, 2018

⌛ Testing commit fe1cb88 with merge 1cfb628...

bors added a commit that referenced this pull request Jun 19, 2018
@bors
Auto merge of #51383 - Zoxc:parallel-stuff, r=nikomatsakis
1cfb628 
Run some stuff in parallel

Requires #50699 to actually work correctly.

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Jun 19, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 1cfb628 to master...

@bors bors merged commit fe1cb88 into rust-lang:master Jun 19, 2018
@Zoxc Zoxc deleted the parallel-stuff branch December 18, 2018 09:19
@aturon aturon mentioned this pull request Aug 16, 2019
Open
37 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: 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.
5 participants
@Zoxc @bors @Mark-Simulacrum @nikomatsakis @rust-highfive