Add `ConstKind::Expr` #99798

JulianKnodt · 2022-07-27T07:29:44Z

Starting to implement ty::ConstKind::Abstract, most of the match cases are stubbed out, some I was unsure what to add, others I didn't want to add until a more complete implementation was ready.

r? @lcnr

compiler/rustc_codegen_cranelift/src/constant.rs

compiler/rustc_infer/src/infer/freshen.rs

compiler/rustc_middle/src/mir/syntax.rs

compiler/rustc_middle/src/ty/consts/kind.rs

compiler/rustc_middle/src/ty/fast_reject.rs

compiler/rustc_middle/src/ty/structural_impls.rs

compiler/rustc_trait_selection/src/traits/wf.rs

rustbot · 2022-07-29T07:33:38Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

JulianKnodt · 2022-07-29T07:38:32Z

This will probably require a perf run, considering the size of consts increased, and if there's any alternative way to store consts more efficiently that would also be useful.

oli-obk · 2022-07-29T12:52:46Z

@bors try @rust-timer queue

rust-timer · 2022-07-29T12:52:47Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2022-07-29T12:52:54Z

⌛ Trying commit 55f46fc49a77c65c10117d9b412a0061dc2355e5 with merge e5e10c53062b74626dfbbe444c6526d38982715b...

bors · 2022-07-29T14:19:41Z

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

rust-timer · 2022-07-29T14:19:43Z

Queued e5e10c53062b74626dfbbe444c6526d38982715b with parent 2f847b8, future comparison URL.

compiler/rustc_middle/src/ty/relate.rs

rust-timer · 2022-07-29T16:04:28Z

Finished benchmarking commit (e5e10c53062b74626dfbbe444c6526d38982715b): comparison url.

Instruction count

Primary benchmarks: 🎉 relevant improvements found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	2.5%	3.3%	6
Improvements 🎉 (primary)	-0.4%	-0.9%	18
Improvements 🎉 (secondary)	-0.6%	-0.8%	14
All 😿🎉 (primary)	-0.4%	-0.9%	18

Max RSS (memory usage)

Results

Primary benchmarks: mixed results
Secondary benchmarks: 🎉 relevant improvements found

	mean¹	max	count²
Regressions 😿 (primary)	1.6%	1.6%	1
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	-2.9%	-2.9%	1
Improvements 🎉 (secondary)	-2.1%	-2.4%	2
All 😿🎉 (primary)	-0.6%	-2.9%	2

Cycles

Results

Primary benchmarks: mixed results
Secondary benchmarks: 😿 relevant regressions found

	mean¹	max	count²
Regressions 😿 (primary)	1.6%	1.8%	2
Regressions 😿 (secondary)	2.9%	3.9%	15
Improvements 🎉 (primary)	-2.6%	-3.1%	2
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	-0.5%	-3.1%	4

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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-review -S-waiting-on-perf -perf-regression

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

JulianKnodt · 2022-07-30T09:07:49Z

Since the size of the const is the same, I wonder if the perf changes are caused by an increased number of branches, causing it to switch from a jump table to an explicit search?

BoxyUwU · 2022-11-25T11:06:33Z

@bors r+ rollup=never

bors · 2022-11-25T11:06:35Z

📌 Commit d0209db has been approved by BoxyUwU

It is now in the queue for this repository.

bors · 2022-11-25T22:57:03Z

⌛ Testing commit d0209db with merge aff003b...

bors · 2022-11-26T01:44:07Z

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing aff003b to master...

rust-timer · 2022-11-26T03:49:42Z

Finished benchmarking commit (aff003b): comparison URL.

Overall result: ❌ regressions - 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.5%]	6
Regressions ❌ (secondary)	0.9%	[0.3%, 1.6%]	21
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.2%, -0.2%]	1
All ❌✅ (primary)	0.3%	[0.2%, 0.5%]	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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.4%	[-5.5%, -2.2%]	3
All ❌✅ (primary)	-	-	0

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)	7.7%	[6.4%, 9.1%]	6
Improvements ✅ (primary)	-1.2%	[-1.8%, -0.8%]	21
Improvements ✅ (secondary)	-3.1%	[-4.6%, -1.3%]	14
All ❌✅ (primary)	-1.2%	[-1.8%, -0.8%]	21

nnethercote · 2022-11-27T22:25:59Z

Previous perf runs showed slight improvements, but the post-merge one shows regressions. They are mostly among secondary benchmarks.

…i-obk stop using `ty::UnevaluatedConst` directly best reviewed commit by commit. simplifies rust-lang#99798 because we now don't have to expand `ty::UnevaluatedConst` to `ty::Const`. I also remember some other places where using `ty::UnevaluatedConst` directly was annoying and caused issues, though I don't quite remember what they were rn '^^ r? `@oli-obk` cc `@JulianKnodt`

rust-highfive assigned lcnr Jul 27, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 27, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 27, 2022

JulianKnodt force-pushed the ac1 branch from 01886e3 to e3c12fa Compare July 27, 2022 07:31

This comment has been minimized.

Sign in to view

lcnr reviewed Jul 27, 2022

View reviewed changes

BoxyUwU self-requested a review July 27, 2022 09:03

JulianKnodt force-pushed the ac1 branch from e3c12fa to 691019e Compare July 28, 2022 06:04

This comment has been minimized.

Sign in to view

JulianKnodt force-pushed the ac1 branch 2 times, most recently from 5a83027 to bc5d4fe Compare July 29, 2022 07:33

JulianKnodt marked this pull request as ready for review July 29, 2022 07:33

JulianKnodt force-pushed the ac1 branch from bc5d4fe to 55f46fc Compare July 29, 2022 07:35

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 29, 2022

lcnr reviewed Jul 29, 2022

View reviewed changes

compiler/rustc_middle/src/ty/relate.rs Outdated Show resolved Hide resolved

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 29, 2022

JulianKnodt force-pushed the ac1 branch 2 times, most recently from a210ed4 to 6cd8f41 Compare July 30, 2022 09:04

fmease mentioned this pull request Jul 30, 2022

Rustdoc: Format constant values as rich-text and visibility-awarely #99688

Closed

BoxyUwU added 4 commits November 25, 2022 09:28

add FIXME's

430f7d1

super_relate_consts do not spurriously fail on assoc consts

4085e94

Make expand_abstract_consts infallible

2ac5d91

only emit "enable gce" error if it would fix compile error

677bdcb

JulianKnodt force-pushed the ac1 branch from b3a1b9d to 677bdcb Compare November 25, 2022 09:29

This comment has been minimized.

Sign in to view

Fix mk_const_list

d0209db

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 Nov 25, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 26, 2022

bors merged commit aff003b into rust-lang:master Nov 26, 2022

rustbot added this to the 1.67.0 milestone Nov 26, 2022

bors mentioned this pull request Nov 26, 2022

Add a note about implicit temporaries on &mut (fn or const) #104857

Closed

rustbot added the perf-regression Performance regression. label Nov 26, 2022

Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Nov 29, 2022

Noratrieb mentioned this pull request Dec 12, 2022

ICE: Missing constant with generic_const_exprs #105608

Closed

adpaco-aws mentioned this pull request Dec 12, 2022

[DRAFT] Update Rust toolchain to 2022-12-04 model-checking/kani#1983

Closed

4 tasks

matthiaskrgr mentioned this pull request Apr 16, 2023

ICE: Missing value for constant, but no error reported? #110378

Open

This was referenced Jul 15, 2023

ICE: expected usize, got Const #113021

Closed

Fix ICE when trying to convert ConstKind::Error to usize #113712

Closed

matthiaskrgr mentioned this pull request Jul 27, 2023

ICE: const evaluatable failed for non-unevaluated const #114151

Closed

matthiaskrgr mentioned this pull request Oct 11, 2023

ICE with generic_const_exprs: expected bits of usize, got (Sub: 2_usize, 1_usize): usize #116637

Open

matthiaskrgr mentioned this pull request Sep 1, 2024

ICE: Invalid 'Const' during codegen: UnevaluatedConst {..} #129857

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `ConstKind::Expr` #99798

Add `ConstKind::Expr` #99798

JulianKnodt commented Jul 27, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Jul 29, 2022

JulianKnodt commented Jul 29, 2022

oli-obk commented Jul 29, 2022

rust-timer commented Jul 29, 2022

bors commented Jul 29, 2022

bors commented Jul 29, 2022

rust-timer commented Jul 29, 2022

rust-timer commented Jul 29, 2022

JulianKnodt commented Jul 30, 2022

This comment has been minimized.

BoxyUwU commented Nov 25, 2022

bors commented Nov 25, 2022

bors commented Nov 25, 2022

bors commented Nov 26, 2022

rust-timer commented Nov 26, 2022

nnethercote commented Nov 27, 2022

Add ConstKind::Expr #99798

Add ConstKind::Expr #99798

Conversation

JulianKnodt commented Jul 27, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Jul 29, 2022

JulianKnodt commented Jul 29, 2022

oli-obk commented Jul 29, 2022

rust-timer commented Jul 29, 2022

bors commented Jul 29, 2022

bors commented Jul 29, 2022

rust-timer commented Jul 29, 2022

rust-timer commented Jul 29, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

JulianKnodt commented Jul 30, 2022

This comment has been minimized.

BoxyUwU commented Nov 25, 2022

bors commented Nov 25, 2022

bors commented Nov 25, 2022

bors commented Nov 26, 2022

rust-timer commented Nov 26, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

nnethercote commented Nov 27, 2022

Add `ConstKind::Expr` #99798

Add `ConstKind::Expr` #99798