Various local trait item iteration cleanups #139018

oli-obk · 2025-03-27T11:58:25Z

Adding a trait impl for Foo unconditionally affected all queries that are interested in a completely independent trait Bar. Perf has no effect on this. We probably don't have a good perf test for this tho.

r? @compiler-errors

I am unsure about 9d05efb as it doesn't improve anything wrt incremental, because we still do all the checks for valid Drop impls, which subsequently will still invoke many queries and basically keep the depgraph the same.

I want to do

rust/compiler/rustc_middle/src/ty/trait_def.rs

Line 141 in 9549077

// FIXME: This depends on the set of all impls for the trait. That is

but would leave that to a follow-up PR, this one changes enough things as it is

oli-obk · 2025-03-27T12:00:13Z

@bors try @rust-timer queue

…try> Decouple trait impls of different traits wrt incremental Adding a trait impl for `Foo` unconditionally affected all queries that are interested in a completely independent trait `Bar`. Let's see if perf has any effect on this. If not, we can land it and I poke further at it to see if we can decouple things further. We probably don't have a good perf test for it tho. r? `@ghost`

bors · 2025-03-27T12:01:26Z

⌛ Trying commit f391497 with merge 6e1b141...

bors · 2025-03-27T14:08:57Z

☀️ Try build successful - checks-actions
Build commit: 6e1b141 (6e1b1415674df8a0a976d5a0804159b129f3868b)

rust-timer · 2025-03-27T15:25:03Z

Finished benchmarking commit (6e1b141): comparison URL.

Overall result: no relevant changes - 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 benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 1.8%, secondary -0.1%)

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)	1.8%	[1.8%, 1.8%]	1
Regressions ❌ (secondary)	2.1%	[1.9%, 2.3%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.3%	[-3.0%, -1.5%]	2
All ❌✅ (primary)	1.8%	[1.8%, 1.8%]	1

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: 779.46s -> 778.12s (-0.17%)
Artifact size: 365.95 MiB -> 365.95 MiB (0.00%)

oli-obk · 2025-03-27T16:58:58Z

@bors try @rust-timer queue

…try> Decouple trait impls of different traits wrt incremental Adding a trait impl for `Foo` unconditionally affected all queries that are interested in a completely independent trait `Bar`. Let's see if perf has any effect on this. If not, we can land it and I poke further at it to see if we can decouple things further. We probably don't have a good perf test for it tho. r? `@ghost`

bors · 2025-03-27T17:00:15Z

⌛ Trying commit 9d05efb with merge b82ca8c...

bors · 2025-03-27T19:06:46Z

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

rust-timer · 2025-03-27T21:23:23Z

Finished benchmarking commit (b82ca8c): 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 the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.2%, -0.2%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 0.7%, secondary -0.3%)

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.7%	[0.6%, 0.7%]	3
Regressions ❌ (secondary)	2.0%	[1.7%, 2.3%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.0%	[-3.1%, -1.0%]	4
All ❌✅ (primary)	0.7%	[0.6%, 0.7%]	3

Cycles

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

Binary size

Results (primary 0.1%, secondary 0.0%)

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.1%	[0.0%, 0.2%]	52
Regressions ❌ (secondary)	0.0%	[0.0%, 0.0%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[0.0%, 0.2%]	52

Bootstrap: 779.46s -> 778.646s (-0.10%)
Artifact size: 365.95 MiB -> 365.95 MiB (0.00%)

…t instead

… impls

oli-obk · 2025-04-01T09:44:11Z

compiler/rustc_mir_transform/src/check_const_item_mutation.rs

-        match self.tcx.adt_destructor(def_id) {
-            Some(_) => None,
-            None => Some(def_id),
+        match self.tcx.type_of(def_id).skip_binder().ty_adt_def().map(|adt| adt.has_dtor(self.tcx))


previously this was using the def_id of the const, which accidentally worked because the query invoked type_of on it internally.

rustbot · 2025-04-01T11:25:23Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

HIR ty lowering was modified

cc @fmease

compiler-errors

r=me after question

compiler-errors · 2025-04-01T22:04:10Z

compiler/rustc_mir_transform/src/check_const_item_mutation.rs

-        match self.tcx.adt_destructor(def_id) {
-            Some(_) => None,
-            None => Some(def_id),
+        match self.tcx.type_of(def_id).skip_binder().ty_adt_def().map(|adt| adt.has_dtor(self.tcx))


This logic seems kinda sketch lol. Do we want to check that the type of the const needs_drop rather than just checking if it has a dtor directly?

I guess it's preexisting.

Maybe fixme here rather than changing it, since it's possibly public facing.

I'll check if we want direct impls explicitly and leave a fixme if that's so or a comment otherwise

rustbot added S-waiting-on-review T-compiler labels Mar 27, 2025

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf label Mar 27, 2025

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf label Mar 27, 2025

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf label Mar 27, 2025

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf label Mar 27, 2025

oli-obk added 9 commits April 1, 2025 09:25

Decouple trait impls of different traits wrt incremental

a7b687c

Remove an unnecessary dtor computation and use the cached query resul…

aec7739

…t instead

Make missing optimized MIR error more informative

c0fe46d

Store adt_destructor in metadata

23f1fb5

Store adt_async_destructor in metadata

2b1c416

Ensure calculcate_dtor is only ever called on local types

51184c7

Only look at trait impls in the current crate when looking for Drop…

60a209b

… impls

Fetch the destructor constness lazily

3a646ff

Directly fetch the impl self type

5495c2c

oli-obk commented Apr 1, 2025

View reviewed changes

oli-obk added 3 commits April 1, 2025 09:48

Remove a hir_* helper that was just forwarding to a query

48bd2ed

Remove a function that has no necessary callers

9549077

Only walk local items instead of filtering for them later

b1402f7

oli-obk force-pushed the incremental-trait-impls branch from 9d05efb to b1402f7 Compare April 1, 2025 11:20

oli-obk changed the title ~~Decouple trait impls of different traits wrt incremental~~ Various local trait item iteration cleanups Apr 1, 2025

rustbot assigned compiler-errors Apr 1, 2025

oli-obk marked this pull request as ready for review April 1, 2025 11:25

compiler-errors approved these changes Apr 1, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various local trait item iteration cleanups #139018

Various local trait item iteration cleanups #139018

oli-obk commented Mar 27, 2025 •

edited

Loading

oli-obk commented Mar 27, 2025

This comment has been minimized.

bors commented Mar 27, 2025

bors commented Mar 27, 2025

This comment has been minimized.

rust-timer commented Mar 27, 2025

oli-obk commented Mar 27, 2025

This comment has been minimized.

bors commented Mar 27, 2025

bors commented Mar 27, 2025

This comment has been minimized.

rust-timer commented Mar 27, 2025

oli-obk Apr 1, 2025

rustbot commented Apr 1, 2025

compiler-errors left a comment

compiler-errors Apr 1, 2025

compiler-errors Apr 1, 2025

compiler-errors Apr 1, 2025

oli-obk Apr 2, 2025

Various local trait item iteration cleanups #139018

Are you sure you want to change the base?

Various local trait item iteration cleanups #139018

Conversation

oli-obk commented Mar 27, 2025 • edited Loading

oli-obk commented Mar 27, 2025

This comment has been minimized.

bors commented Mar 27, 2025

bors commented Mar 27, 2025

This comment has been minimized.

rust-timer commented Mar 27, 2025

Overall result: no relevant changes - no action needed

oli-obk commented Mar 27, 2025

This comment has been minimized.

bors commented Mar 27, 2025

bors commented Mar 27, 2025

This comment has been minimized.

rust-timer commented Mar 27, 2025

Overall result: ✅ improvements - no action needed

Choose a reason for hiding this comment

rustbot commented Apr 1, 2025

compiler-errors left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oli-obk commented Mar 27, 2025 •

edited

Loading