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

Rollup of 4 pull requests #112420

Merged
merged 9 commits into from
Jun 8, 2023
Merged

Rollup of 4 pull requests #112420

merged 9 commits into from
Jun 8, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

thomcc and others added 9 commits June 4, 2023 08:34
@thomcc
Use 128 bits for TypeId hash
9e5573a 
- Switch TypeId to 128 bits
- Hack around the fact that tracing-subscriber dislikes how TypeId is hashed
- Remove lowering of type_id128 from rustc_codegen_llvm
- Remove unnecessary `type_id128` intrinsic (just change return type of `type_id`)
- Only hash the lower 64 bits of the TypeId
- Reword comment
@Zoxc
Don't hold the active queries lock while calling make_query
fd3d2d4
@lnicola
Fix rust-analyzer proc macro server
a3cc503
@compiler-errors
Do fix_*_builtin_expr hacks on the writeback results
8efcb28
@thomcc @bjorn3
Fix typo
b512004 
Co-authored-by: bjorn3 <[email protected]>
@matthiaskrgr
Rollup merge of rust-lang#109953 - thomcc:thomcc/typeid128, r=WaffleL…
8747c0e 
…apkin

Use 128 bits for TypeId hash

Preliminary/Draft impl of rust-lang/compiler-team#608

Prior art (probably incomplete list)
- rust-lang#75923
- rust-lang#95845
@matthiaskrgr
Rollup merge of rust-lang#112333 - Zoxc:try_collect_active_jobs-deadl…
4f2e1df 
…ock, r=cjgillot

Don't hold the active queries lock while calling `make_query`

This moves the call to `make_query` outside the parts that holds the active queries lock in `try_collect_active_jobs`. This should help removed the deadlock and borrow panic that has been observed when printing the query stack during an ICE.

cc `@SparrowLii`
r? `@cjgillot`
@matthiaskrgr
Rollup merge of rust-lang#112339 - lnicola:proc-macro-srv-feature, r=…
c71daaa 
…Veykril

Fix rust-analyzer proc macro server

The feature now exists on `proc-macro-srv-cli`, and without it the proc macro server will bail rigth out.

CC rust-lang/rust-analyzer#14991
@matthiaskrgr
Rollup merge of rust-lang#112410 - compiler-errors:writeback, r=lcnr
909bfa3 
Do `fix_*_builtin_expr` hacks on the writeback results

During writeback, we do `fix_{scalar,index}_builtin_expr` so that during MIR build we generate built-in MIR instructions instead of method calls for certain built-in arithmetic operations. We do this by checking the types of these built-in operations are scalar types, and remove the method def-id to essentially mark the operation as built-in and not "overloaded".

For lazy norm and the new trait solver, this is a problem, because we don't actually normalize all the types we end up seeing in the typeck results until they're copied over writeback's copy of the typeck results. To fix this, delay these fixup calls until after this normalization has been done.

This doesn't affect the old trait solver, but does simplify the code a bit IMO, since we can remove a few sets of calls to `resolve_vars_if_possible` and some `borrow_mut`s.

r? `@lcnr`
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 8, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Jun 8, 2023

📌 Commit 909bfa3 has been approved by matthiaskrgr

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 Jun 8, 2023
@bors
Copy link
Contributor

bors commented Jun 8, 2023

⌛ Testing commit 909bfa3 with merge a77659a...

@bors
Copy link
Contributor

bors commented Jun 8, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing a77659a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2023
@bors bors merged commit a77659a into rust-lang:master Jun 8, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 8, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#112410 d36b876128470fd45a5c372b971df4b36e7c2ce2
#112339 249d497c1cc1d6ed0c3a0b786ad09afa73ec8f0f
#112333 fe67490a31ea5d1d4899921a4b9e9aa05a7473dc
#109953 a48c593de7f2b57969574d8790eb54a3446cf622

previous master: e7409258db

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a77659a): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.3% [0.2%, 0.6%] 5
Regressions ❌
(secondary)		 0.4% [0.2%, 0.6%] 7
Improvements ✅
(primary)		 -0.3% [-0.3%, -0.3%] 2
Improvements ✅
(secondary)		 -0.3% [-0.3%, -0.2%] 2
All ❌✅ (primary) 0.2% [-0.3%, 0.6%] 7

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)		 4.2% [1.9%, 6.1%] 5
Regressions ❌
(secondary)		 2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 4.2% [1.9%, 6.1%] 5

Cycles

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

Binary size

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.0% [0.0%, 0.0%] 11
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.2% [-0.6%, -0.0%] 5
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.0% [-0.6%, 0.0%] 16

Bootstrap: 648.715s -> 648.127s (-0.09%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 8, 2023
@pnkfelix
Copy link
Member

@rust-timer build a48c593de7f2b57969574d8790eb54a3446cf622

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a48c593de7f2b57969574d8790eb54a3446cf622): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

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.4% [0.2%, 0.6%] 5
Regressions ❌
(secondary)		 0.5% [0.3%, 0.7%] 8
Improvements ✅
(primary)		 -0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.2% [-0.4%, 0.6%] 6

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)		 2.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.8% [-2.8%, -2.8%] 1
Improvements ✅
(secondary)		 -1.5% [-1.6%, -1.5%] 2
All ❌✅ (primary) -0.2% [-2.8%, 2.5%] 2

Cycles

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

Binary size

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.0% [0.0%, 0.0%] 11
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.2% [-0.6%, -0.0%] 5
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.0% [-0.6%, 0.0%] 16

Bootstrap: 648.715s -> 648.296s (-0.06%)

@matthiaskrgr matthiaskrgr deleted the rollup-spiavw5 branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.
9 participants
@matthiaskrgr @bors @rust-timer @pnkfelix @rustbot @thomcc @Zoxc @lnicola @compiler-errors