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

improve AttrTokenStream #115523

Merged
merged 1 commit into from
Sep 5, 2023
Merged

improve AttrTokenStream #115523

merged 1 commit into from
Sep 5, 2023

Conversation

kiscad
Copy link
Contributor

@kiscad kiscad commented Sep 4, 2023

Improve the performance of AttrTokenStream::to_tokenstream method

@rustbot
Copy link
Collaborator

rustbot commented Sep 4, 2023

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added 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 Sep 4, 2023
@kiscad
Copy link
Contributor Author

kiscad commented Sep 4, 2023

r? @petrochenkov

@rustbot
Copy link
Collaborator

rustbot commented Sep 4, 2023

Could not assign reviewer from: petrochenkov.
User(s) petrochenkov are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

@kiscad kiscad force-pushed the improve-tokenstream branch from f079f3f to c5059c5 Compare September 4, 2023 07:24
@kiscad kiscad force-pushed the improve-tokenstream branch from c5059c5 to 894dd3e Compare September 4, 2023 08:41
@petrochenkov petrochenkov 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 Sep 4, 2023
@kiscad kiscad force-pushed the improve-tokenstream branch from 894dd3e to 6eadfd2 Compare September 4, 2023 09:48
@kiscad kiscad closed this Sep 4, 2023
@kiscad kiscad force-pushed the improve-tokenstream branch from 6eadfd2 to abfc6c4 Compare September 4, 2023 11:48
@kiscad kiscad reopened this Sep 4, 2023
@kiscad kiscad force-pushed the improve-tokenstream branch from 8c89af6 to f404990 Compare September 4, 2023 12:09
@petrochenkov
Copy link
Contributor

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 4, 2023
@bors
Copy link
Contributor

bors commented Sep 4, 2023

⌛ Trying commit f404990 with merge 940bc63a1822b2b7dd2068b9a03ee4f749c62f5a...

@bors
Copy link
Contributor

bors commented Sep 4, 2023

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

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (940bc63a1822b2b7dd2068b9a03ee4f749c62f5a): comparison URL.

Overall result: ❌✅ regressions and 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.6% [0.6%, 0.6%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) 0.6% [0.6%, 0.6%] 2

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)		 - - 0
Improvements ✅
(secondary)		 -3.2% [-3.2%, -3.2%] 1
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 627.22s -> 627.867s (0.10%)
Artifact size: 316.03 MiB -> 316.04 MiB (0.00%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 4, 2023
@kiscad
Copy link
Contributor Author

kiscad commented Sep 5, 2023

https://perf.rust-lang.org/compare.html?start=bf1e3f31f95c0f75b9bf51a58e8684f750f919f2&end=940bc63a1822b2b7dd2068b9a03ee4f749c62f5a&stat=instructions%3Au&nonRelevant=true

It looks that the average performance has a minor improvement, about 0.05%.

@petrochenkov
Copy link
Contributor

The perf changes are most likely noise, but the PR doesn't complicate code so we can merge it.
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 5, 2023

📌 Commit f404990 has been approved by petrochenkov

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 5, 2023
klensy
klensy reviewed Sep 5, 2023
View reviewed changes
compiler/rustc_ast/src/tokenstream.rs
Comment on lines +214 to +218
let idx = data
.attrs
.partition_point(|attr| matches!(attr.style, crate::AttrStyle::Outer));
Copy link
Contributor

Choose a reason for hiding this comment

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

How this works? Attributes in AttrVec here contained in unspecified order and partition_point should return some meaningless result. And no test failure.

Copy link
Contributor

Choose a reason for hiding this comment

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

Attributes are supposed to always be partitioned #[outer1] #[outer2] { #![inner1] #![inner2] } because they go in left-to-right order.

@matthiaskrgr matthiaskrgr mentioned this pull request Sep 5, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 5, 2023
@bors
Auto merge of rust-lang#115568 - matthiaskrgr:rollup-2igo8rl, r=matth…
f222a2d 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#113510 (Document soundness of Integer -> Pointer -> Integer conversions in `const` contexts.)
 - rust-lang#114412 (document our assumptions about symbols provided by the libc)
 - rust-lang#114813 (explain why we can mutate the FPU control word)
 - rust-lang#115523 (improve `AttrTokenStream`)
 - rust-lang#115536 (interpret: make MemPlace, Place, Operand types private to the interpreter)
 - rust-lang#115540 (Support debuginfo for custom MIR.)
 - rust-lang#115563 (llvm-wrapper: adapt for LLVM API change)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a9336b6 into rust-lang:master Sep 5, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@klensy klensy klensy left review comments

Assignees

@petrochenkov petrochenkov

Labels
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
Milestone
1.74.0
Development

Successfully merging this pull request may close these issues.
7 participants
@kiscad @rustbot @petrochenkov @rust-timer @bors @klensy @compiler-errors