Rollup of 4 pull requests #112420

matthiaskrgr · 2023-06-08T10:36:19Z

Successful merges:

Use 128 bits for TypeId hash #109953 (Use 128 bits for TypeId hash)
Don't hold the active queries lock while calling make_query #112333 (Don't hold the active queries lock while calling make_query)
Fix rust-analyzer proc macro server #112339 (Fix rust-analyzer proc macro server)
Do fix_*_builtin_expr hacks on the writeback results #112410 (Do fix_*_builtin_expr hacks on the writeback results)

r? @ghost
@rustbot modify labels: rollup

- 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

Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>

…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

…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`

…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

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`

matthiaskrgr · 2023-06-08T10:36:37Z

@bors r+ rollup=never p=4

bors · 2023-06-08T10:36:39Z

📌 Commit 909bfa3 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-06-08T13:30:55Z

⌛ Testing commit 909bfa3 with merge a77659a...

bors · 2023-06-08T16:33:45Z

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

rust-timer · 2023-06-08T16:34:56Z

📌 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 · 2023-06-08T17:48:12Z

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%)

pnkfelix · 2023-06-13T21:05:25Z

@rust-timer build a48c593de7f2b57969574d8790eb54a3446cf622

rust-timer · 2023-06-13T22:20:18Z

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%)

thomcc and others added 9 commits June 4, 2023 08:34

Don't hold the active queries lock while calling make_query

fd3d2d4

Fix rust-analyzer proc macro server

a3cc503

Do fix_*_builtin_expr hacks on the writeback results

8efcb28

Fix typo

b512004

Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>

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

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

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 added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2023

bors merged commit a77659a into rust-lang:master Jun 8, 2023
12 checks passed

rustbot added this to the 1.72.0 milestone Jun 8, 2023

rustbot added the perf-regression Performance regression. label Jun 8, 2023

This comment has been minimized.

Sign in to view

matthiaskrgr deleted the rollup-spiavw5 branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #112420

Rollup of 4 pull requests #112420

matthiaskrgr commented Jun 8, 2023

matthiaskrgr commented Jun 8, 2023

bors commented Jun 8, 2023

bors commented Jun 8, 2023

bors commented Jun 8, 2023

rust-timer commented Jun 8, 2023

rust-timer commented Jun 8, 2023

pnkfelix commented Jun 13, 2023

This comment has been minimized.

rust-timer commented Jun 13, 2023

Rollup of 4 pull requests #112420

Rollup of 4 pull requests #112420

Conversation

matthiaskrgr commented Jun 8, 2023

matthiaskrgr commented Jun 8, 2023

bors commented Jun 8, 2023

bors commented Jun 8, 2023

bors commented Jun 8, 2023

rust-timer commented Jun 8, 2023

rust-timer commented Jun 8, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

pnkfelix commented Jun 13, 2023

This comment has been minimized.

rust-timer commented Jun 13, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED