Skip to content

Use a lock-free datastructure for source_span#108300

Merged
bors merged 3 commits into
rust-lang:masterfrom
oli-obk:elsa
Feb 22, 2023
Merged

Use a lock-free datastructure for source_span#108300
bors merged 3 commits into
rust-lang:masterfrom
oli-obk:elsa

Conversation

@oli-obk

@oli-obk oli-obk commented Feb 21, 2023

Copy link
Copy Markdown
Contributor

follow up to the perf regression in #105462

The main regression is likely the CStore, but let's evaluate the perf impact of this on its own

@rustbot

rustbot commented Feb 21, 2023

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eholk (or someone else) soon.

Please see the contribution instructions for more information.

@oli-obk

oli-obk commented Feb 21, 2023

Copy link
Copy Markdown
Contributor Author

@bors try @rust-timer queue

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 21, 2023
@rust-timer

This comment has been minimized.

@rustbot

rustbot commented Feb 21, 2023

Copy link
Copy Markdown
Collaborator

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@bors

bors commented Feb 21, 2023

Copy link
Copy Markdown
Collaborator

⌛ Trying commit decfb4d with merge d9f8ba9ac6c5b66fa889991d907f5612d562cac7...

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 21, 2023
@bors

bors commented Feb 21, 2023

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: d9f8ba9ac6c5b66fa889991d907f5612d562cac7 (d9f8ba9ac6c5b66fa889991d907f5612d562cac7)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (d9f8ba9ac6c5b66fa889991d907f5612d562cac7): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.2% [-0.3%, -0.2%] 9
Improvements ✅
(secondary)
-0.4% [-0.5%, -0.3%] 5
All ❌✅ (primary) -0.2% [-0.3%, -0.2%] 9

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
3.4% [3.0%, 3.9%] 2
Regressions ❌
(secondary)
1.3% [1.3%, 1.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.2% [-2.4%, -2.0%] 3
All ❌✅ (primary) 3.4% [3.0%, 3.9%] 2

Cycles

This benchmark run did not return any relevant results for this metric.

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 21, 2023
Comment thread compiler/rustc_data_structures/src/sync/vec.rs
@eholk

eholk commented Feb 21, 2023

Copy link
Copy Markdown
Contributor

@oli-obk Did you want to merge this or was it just to do a perf run?

If you want to merge, it looks good to me so feel free to r=me.

@oli-obk

oli-obk commented Feb 21, 2023

Copy link
Copy Markdown
Contributor Author

yes, I wanted to land this.

@bors r=eholk

@bors

bors commented Feb 21, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit decfb4d has been approved by eholk

It is now in the queue for this repository.

@bors 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 Feb 21, 2023
@bors

bors commented Feb 22, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit decfb4d with merge bd4a96a...

@bors

bors commented Feb 22, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: eholk
Pushing bd4a96a to master...

1 similar comment
@bors

bors commented Feb 22, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: eholk
Pushing bd4a96a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 22, 2023
@bors bors merged commit bd4a96a into rust-lang:master Feb 22, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (bd4a96a): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.6% [-2.6%, -2.6%] 1
Improvements ✅
(secondary)
-2.9% [-5.2%, -2.0%] 15
All ❌✅ (primary) -2.6% [-2.6%, -2.6%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

@oli-obk

oli-obk commented Feb 22, 2023

Copy link
Copy Markdown
Contributor Author

Hmm looks like that was noise but I guess it becomes easier to use the lockfree data structures for CStore

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

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants