Remove fold code and add `Const::internal()` to StableMIR #117113

celinval · 2023-10-24T03:53:47Z

We are not planning to support user generated constant in the foreseeable future, so we are cleaning up the fold logic and user created type for now. Users should use Instance::resolve in order to trigger monomorphization.

The Instance::resolve was however incomplete, since we weren't handling internalizing constants yet. Thus, I added that.

I decided to keep the Const fields private in case we decide to translate them lazily.

rustbot · 2023-10-24T03:53:54Z

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-10-24T03:53:57Z

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

celinval · 2023-10-24T03:53:59Z

r? @oli-obk

oli-obk · 2023-10-24T06:47:28Z

compiler/rustc_smir/src/rustc_smir/mod.rs

 pub struct Tables<'tcx> {
    pub tcx: TyCtxt<'tcx>,
    pub def_ids: IndexMap<DefId, stable_mir::DefId>,
    pub alloc_ids: IndexMap<AllocId, stable_mir::AllocId>,
    pub spans: IndexMap<rustc_span::Span, Span>,
-    pub types: Vec<MaybeStable<TyKind, Ty<'tcx>>>,
+    pub types: Vec<Ty<'tcx>>,


This can now be an IndexMap, too

oli-obk · 2023-10-24T07:39:29Z

@bors delegate+

r=me with types made an IndexMap

bors · 2023-10-24T07:39:32Z

✌️ @celinval, you can now approve this pull request!

If @oli-obk told you to "r=me" after making some further change, please make that change, then do @bors r=@oli-obk

celinval · 2023-10-24T19:12:11Z

@bors r=@oli-obk

bors · 2023-10-24T19:12:13Z

📌 Commit cf6a04e has been approved by oli-obk

It is now in the queue for this repository.

We are not planning to support user generated constant in the foreseeable future, so we are removing the Fold logic for now in favor of the Instance::resolve logic. The Instance::resolve was however incomplete, since we weren't handling internalizing constants yet. Thus, I added that. I decided to keep the Const fields private in case we decide to translate them lazily.

bors · 2023-10-24T22:26:01Z

☔ The latest upstream changes (presumably #117135) made this pull request unmergeable. Please resolve the merge conflicts.

celinval · 2023-10-24T23:35:38Z

@bors r=@oli-obk

bors · 2023-10-24T23:35:40Z

📌 Commit 17f6df9 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2023-10-25T13:19:57Z

⌛ Testing commit 17f6df9 with merge b66fe58...

bors · 2023-10-25T15:33:03Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing b66fe58 to master...

rust-timer · 2023-10-25T16:44:42Z

Finished benchmarking commit (b66fe58): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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.6%	[-0.6%, -0.6%]	1
Improvements ✅ (secondary)	-3.4%	[-3.4%, -3.4%]	1
All ❌✅ (primary)	-0.6%	[-0.6%, -0.6%]	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)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: missing data
Artifact size: 304.40 MiB -> 304.42 MiB (0.01%)

rustbot assigned davidtwco Oct 24, 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. labels Oct 24, 2023

rustbot assigned oli-obk and unassigned davidtwco Oct 24, 2023

oli-obk reviewed Oct 24, 2023

View reviewed changes

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 Oct 24, 2023

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2023

Use IndexMap for handling stable Ty

17f6df9

celinval force-pushed the smir-stable-ty branch from cf6a04e to 17f6df9 Compare October 24, 2023 22:38

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 Oct 24, 2023

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

bors merged commit b66fe58 into rust-lang:master Oct 25, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 25, 2023

celinval mentioned this pull request Oct 25, 2023

Add a conversion method for going from smir::Ty to rustc::Ty rust-lang/project-stable-mir#46

Closed

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove fold code and add `Const::internal()` to StableMIR #117113

Remove fold code and add `Const::internal()` to StableMIR #117113

celinval commented Oct 24, 2023

rustbot commented Oct 24, 2023

rustbot commented Oct 24, 2023

celinval commented Oct 24, 2023

oli-obk Oct 24, 2023

oli-obk commented Oct 24, 2023

bors commented Oct 24, 2023

celinval commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

celinval commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

rust-timer commented Oct 25, 2023

Remove fold code and add Const::internal() to StableMIR #117113

Remove fold code and add Const::internal() to StableMIR #117113

Conversation

celinval commented Oct 24, 2023

rustbot commented Oct 24, 2023

rustbot commented Oct 24, 2023

celinval commented Oct 24, 2023

oli-obk Oct 24, 2023

Choose a reason for hiding this comment

oli-obk commented Oct 24, 2023

bors commented Oct 24, 2023

celinval commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

celinval commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

rust-timer commented Oct 25, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Remove fold code and add `Const::internal()` to StableMIR #117113

Remove fold code and add `Const::internal()` to StableMIR #117113