Rename interner funcs #108250

nnethercote · 2023-02-20T00:32:48Z

This PR cleans up some inconsistencies in interner naming.

Best reviewed one commit at a time.

r? @compiler-errors

rustbot · 2023-02-20T00:32:56Z

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

The Miri subtree was changed

cc @rust-lang/miri

Some changes occured in rustc_ty_utils::consts.rs

cc @BoxyUwU

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rust-analyzer

cc @rust-lang/wg-rls-2

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

nnethercote · 2023-02-20T00:33:11Z

I'm not expecting perf changes, but let's check.

@bors try @rust-timer queue

bors · 2023-02-20T00:33:20Z

⌛ Trying commit 5bd40e576311fc2aba937c11c00fda332233bb8d with merge 424f380de9b55b49897023b94fb8dc2a55e2454e...

compiler-errors

One nit, mk_substs(&[]) can just be List::empty(), right?

compiler/rustc_middle/src/ty/context.rs

compiler/rustc_codegen_llvm/src/context.rs

compiler-errors

r=me, nits or not.

src/tools/rust-analyzer/crates/hir-ty/src/layout.rs

src/tools/clippy/clippy_lints/src/redundant_slicing.rs

bors · 2023-02-20T03:18:38Z

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

rust-timer · 2023-02-20T06:09:05Z

Finished benchmarking commit (424f380de9b55b49897023b94fb8dc2a55e2454e): comparison URL.

Overall result: ❌ regressions - 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.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@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.4%	[0.3%, 0.5%]	17
Regressions ❌ (secondary)	0.5%	[0.4%, 0.5%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.4%	[0.3%, 0.5%]	17

Max RSS (memory usage)

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

Cycles

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

bjorn3 · 2023-02-20T12:42:29Z

#108112 renamed a bunch of mk_* to intern_*. Why rename them back again?

nnethercote · 2023-02-21T03:12:22Z

#108112 renamed a bunch of mk_* to intern_*. Why rename them back again?

Currently, for many cases there is a mk_foo function that takes an iterator and an intern_foo function that takes a slice.

#108112 changed a number of mk_foo calls to intern_foo, because the slice version is simpler and faster. But it didn't rename any of those functions.

This PR renames the functions as mk_foo_from_iter and mk_foo. This makes the difference between the two cases clearer, and also makes it harder to use the iterator version by mistake when the slice version is appropriate.

nnethercote · 2023-02-21T04:20:59Z

Lots of small regression in incremental builds is annoying. No obvious reason why, and I did some local analysis and it just seems to be due to minor variations in codegen triggered by nothing in particular. Let's try another perf run:

@bors try @rust-timer queue

bors · 2023-02-21T04:21:09Z

⌛ Trying commit a5181d821f665c20a71003d4310e3d93ba055901 with merge 33a46a28002e0a45db67472e697d8ad77d84914f...

bors · 2023-02-21T07:06:58Z

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

rust-timer · 2023-02-21T09:13:58Z

Finished benchmarking commit (33a46a28002e0a45db67472e697d8ad77d84914f): comparison URL.

Overall result: ❌ regressions - 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.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@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.3%	[0.2%, 0.5%]	18
Regressions ❌ (secondary)	0.4%	[0.3%, 0.5%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[0.2%, 0.5%]	18

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

Cycles

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

All the slice interners have a wrapper that handles the empty slice case. We can instead handle this in the `slice_interners!` macro, avoiding the need for most of the wrappers, and allowing the interner functions to be renamed from `_intern_foos` to `intern_foos`. The two exceptions: - intern_predicates: I kept this wrapper because there's a FIXME comment about a possible future change. - intern_poly_existential_predicates: I kept this wrapper because it asserts that the slice is empty and sorted.

(This is a large commit. The changes to `compiler/rustc_middle/src/ty/context.rs` are the most important ones.) The current naming scheme is a mess, with a mix of `_intern_`, `intern_` and `mk_` prefixes, with little consistency. In particular, in many cases it's easy to use an iterator interner when a (preferable) slice interner is available. The guiding principles of the new naming system: - No `_intern_` prefixes. - The `intern_` prefix is for internal operations. - The `mk_` prefix is for external operations. - For cases where there is a slice interner and an iterator interner, the former is `mk_foo` and the latter is `mk_foo_from_iter`. Also, `slice_interners!` and `direct_interners!` can now be `pub` or non-`pub`, which helps enforce the internal/external operations division. It's not perfect, but I think it's a clear improvement. The following lists show everything that was renamed. slice_interners - const_list - mk_const_list -> mk_const_list_from_iter - intern_const_list -> mk_const_list - substs - mk_substs -> mk_substs_from_iter - intern_substs -> mk_substs - check_substs -> check_and_mk_substs (this is a weird one) - canonical_var_infos - intern_canonical_var_infos -> mk_canonical_var_infos - poly_existential_predicates - mk_poly_existential_predicates -> mk_poly_existential_predicates_from_iter - intern_poly_existential_predicates -> mk_poly_existential_predicates - _intern_poly_existential_predicates -> intern_poly_existential_predicates - predicates - mk_predicates -> mk_predicates_from_iter - intern_predicates -> mk_predicates - _intern_predicates -> intern_predicates - projs - intern_projs -> mk_projs - place_elems - mk_place_elems -> mk_place_elems_from_iter - intern_place_elems -> mk_place_elems - bound_variable_kinds - mk_bound_variable_kinds -> mk_bound_variable_kinds_from_iter - intern_bound_variable_kinds -> mk_bound_variable_kinds direct_interners - region - intern_region (unchanged) - const - mk_const_internal -> intern_const - const_allocation - intern_const_alloc -> mk_const_alloc - layout - intern_layout -> mk_layout - adt_def - intern_adt_def -> mk_adt_def_from_data (unusual case, hard to avoid) - alloc_adt_def(!) -> mk_adt_def - external_constraints - intern_external_constraints -> mk_external_constraints Other - type_list - mk_type_list -> mk_type_list_from_iter - intern_type_list -> mk_type_list - tup - mk_tup -> mk_tup_from_iter - intern_tup -> mk_tup

To discourage accidental use -- there are more specific `mk_*` functions for all `Ty` and `Region` kinds.

It's missing, and is useful in two places.

nnethercote · 2023-02-23T20:34:37Z

I rebased again.

@bors r=compiler-errors

bors · 2023-02-23T20:34:38Z

📌 Commit 08f28f9 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-02-25T13:55:29Z

⌛ Testing commit 08f28f9 with merge dcca6a3...

bors · 2023-02-25T16:47:58Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing dcca6a3 to master...

rust-timer · 2023-02-25T19:08:39Z

Finished benchmarking commit (dcca6a3): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -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.3%	[0.3%, 0.3%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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

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.0%	[-2.1%, -1.9%]	6
All ❌✅ (primary)	-	-	0

Remove some superfluous type parameters from layout.rs rust-lang/rust#107163 Introduce -Zterminal-urls to use OSC8 for error codes rust-lang/rust#107838 Unify validity checks into a single query rust-lang/rust#108364 s/eval_usize/eval_target_usize/ for clarity rust-lang/rust#108029 Use target instead of machine for mir interpreter integer handling rust-lang/rust#108047 Switch to EarlyBinder for type_of query rust-lang/rust#107753 Rename interner funcs rust-lang/rust#108250 Optimize mk_region rust-lang/rust#108020 Clarify iterator interners rust-lang/rust#108112

- Remove some superfluous type parameters from layout.rs rust-lang/rust#107163 - Introduce -Zterminal-urls to use OSC8 for error codes rust-lang/rust#107838 - Unify validity checks into a single query rust-lang/rust#108364 - s/eval_usize/eval_target_usize/ for clarity rust-lang/rust#108029 - Use target instead of machine for mir interpreter integer handling rust-lang/rust#108047 - Switch to EarlyBinder for type_of query rust-lang/rust#107753 - Rename interner funcs rust-lang/rust#108250 - Optimize mk_region rust-lang/rust#108020 - Clarify iterator interners rust-lang/rust#108112

- Introduce -Zterminal-urls to use OSC8 for error codes rust-lang/rust#107838 - Unify validity checks into a single query rust-lang/rust#108364 - Rename interner funcs rust-lang/rust#108250 - Optimize mk_region rust-lang/rust#108020 - Clarify iterator interners rust-lang/rust#108112

rustbot assigned compiler-errors Feb 20, 2023

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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative labels Feb 20, 2023

This comment has been minimized.

Sign in to view

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

compiler-errors reviewed Feb 20, 2023

View reviewed changes

compiler/rustc_middle/src/ty/context.rs Show resolved Hide resolved

compiler/rustc_codegen_llvm/src/context.rs Outdated Show resolved Hide resolved

compiler-errors approved these changes Feb 20, 2023

View reviewed changes

src/tools/rust-analyzer/crates/hir-ty/src/layout.rs Show resolved Hide resolved

src/tools/clippy/clippy_lints/src/redundant_slicing.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Feb 20, 2023

nnethercote force-pushed the rename-interner-funcs branch from 5bd40e5 to a5181d8 Compare February 21, 2023 04:05

This comment has been minimized.

Sign in to view

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

This comment has been minimized.

Sign in to view

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

nnethercote mentioned this pull request Feb 21, 2023

[EXPERIMENT] Determine cause of perf regression in #108250 #108327

Closed

nnethercote added 6 commits February 24, 2023 07:08

Replace a mk_ty call with mk_bound.

a980683

Rename mk_{ty,region} as mk_{ty,region}_from_kind.

11c2c59

To discourage accidental use -- there are more specific `mk_*` functions for all `Ty` and `Region` kinds.

Add mk_canonical_var_infos_from_iter.

c09f5b6

It's missing, and is useful in two places.

Use List::empty() instead of mk_substs(&[]).

08f28f9

nnethercote force-pushed the rename-interner-funcs branch from da815d9 to 08f28f9 Compare February 23, 2023 20:34

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 Feb 23, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 25, 2023

bors merged commit dcca6a3 into rust-lang:master Feb 25, 2023

rustbot added this to the 1.69.0 milestone Feb 25, 2023

This was referenced Feb 25, 2023

Implement jump threading MIR opt #107009

Merged

Dedup elaborated predicates with const generic parameter in AutoTrait #108397

Closed

Tweak name of delay_*_bug functions #108408

Closed

rustbot removed the perf-regression Performance regression. label Feb 25, 2023

nnethercote deleted the rename-interner-funcs branch February 26, 2023 20:08

qinheping mentioned this pull request Mar 10, 2023

Upgrade toolchain to nightly-2023-03-09 model-checking/kani#2293

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename interner funcs #108250

Rename interner funcs #108250

nnethercote commented Feb 20, 2023

rustbot commented Feb 20, 2023

nnethercote commented Feb 20, 2023

This comment has been minimized.

bors commented Feb 20, 2023

compiler-errors left a comment

compiler-errors left a comment

bors commented Feb 20, 2023

This comment has been minimized.

rust-timer commented Feb 20, 2023

bjorn3 commented Feb 20, 2023

nnethercote commented Feb 21, 2023

nnethercote commented Feb 21, 2023

This comment has been minimized.

bors commented Feb 21, 2023

bors commented Feb 21, 2023

This comment has been minimized.

rust-timer commented Feb 21, 2023

nnethercote commented Feb 23, 2023

bors commented Feb 23, 2023

bors commented Feb 25, 2023

bors commented Feb 25, 2023

rust-timer commented Feb 25, 2023

Rename interner funcs #108250

Rename interner funcs #108250

Conversation

nnethercote commented Feb 20, 2023

rustbot commented Feb 20, 2023

nnethercote commented Feb 20, 2023

This comment has been minimized.

bors commented Feb 20, 2023

compiler-errors left a comment

Choose a reason for hiding this comment

compiler-errors left a comment

Choose a reason for hiding this comment

bors commented Feb 20, 2023

This comment has been minimized.

rust-timer commented Feb 20, 2023

Overall result: ❌ regressions - ACTION NEEDED

bjorn3 commented Feb 20, 2023

nnethercote commented Feb 21, 2023

nnethercote commented Feb 21, 2023

This comment has been minimized.

bors commented Feb 21, 2023

bors commented Feb 21, 2023

This comment has been minimized.

rust-timer commented Feb 21, 2023

Overall result: ❌ regressions - ACTION NEEDED

nnethercote commented Feb 23, 2023

bors commented Feb 23, 2023

bors commented Feb 25, 2023

bors commented Feb 25, 2023

rust-timer commented Feb 25, 2023

Overall result: ❌ regressions - no action needed