Simplify `IntVarValue`/`FloatVarValue` #123536

compiler-errors · 2024-04-06T05:33:54Z

r? @ghost

rustbot · 2024-04-06T05:33:58Z

changes to the core type system

cc @compiler-errors, @lcnr

compiler-errors · 2024-04-06T05:34:00Z

@bors try @rust-timer queue

…r=<try> Simplify `IntVarValue`/`FloatVarValue` r? `@ghost`

bors · 2024-04-06T05:35:12Z

⌛ Trying commit cc9de3b with merge a7eb620...

bors · 2024-04-06T07:14:08Z

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

lcnr

i think you also have to update nll relate, even if i shouldn't use int and float vars iirc

I remember trying the same thing at some point, don't remember why i didn't land it. r=me after perf

lcnr · 2024-04-06T07:35:43Z

compiler/rustc_infer/src/infer/mod.rs

@@ -1607,15 +1611,15 @@ impl<'tcx> InferCtxt<'tcx> {
                // If `inlined_probe_value` returns a value it's always a
                // `ty::Int(_)` or `ty::UInt(_)`, which never matches a
                // `ty::Infer(_)`.
-                self.inner.borrow_mut().int_unification_table().inlined_probe_value(v).is_some()
+                !self.inner.borrow_mut().int_unification_table().inlined_probe_value(v).is_unknown()


Suggested change

!self.inner.borrow_mut().int_unification_table().inlined_probe_value(v).is_unknown()

self.inner.borrow_mut().int_unification_table().inlined_probe_value(v).is_known()

double negation is confusing esp given the length of the negated condition

lcnr · 2024-04-06T07:35:59Z

compiler/rustc_infer/src/infer/mod.rs

            }

            TyOrConstInferVar::TyFloat(v) => {
                // If `probe_value` returns a value it's always a
                // `ty::Float(_)`, which never matches a `ty::Infer(_)`.
                //
                // Not `inlined_probe_value(v)` because this call site is colder.
-                self.inner.borrow_mut().float_unification_table().probe_value(v).is_some()
+                !self.inner.borrow_mut().float_unification_table().probe_value(v).is_unknown()


Suggested change

!self.inner.borrow_mut().float_unification_table().probe_value(v).is_unknown()

self.inner.borrow_mut().float_unification_table().probe_value(v).is_known()

lcnr · 2024-04-06T07:37:14Z

compiler/rustc_infer/src/infer/mod.rs

+                    ty::IntVarValue::Unknown => None,
+                    ty::IntVarValue::IntType(ty) => Some(Ty::new_int(self.infcx.tcx, ty)),
+                    ty::IntVarValue::UintType(ty) => Some(Ty::new_uint(self.infcx.tcx, ty)),


Suggested change

ty::IntVarValue::Unknown => None,

ty::IntVarValue::IntType(ty) => Some(Ty::new_int(self.infcx.tcx, ty)),

ty::IntVarValue::UintType(ty) => Some(Ty::new_uint(self.infcx.tcx, ty)),

ty::IntVarValue::IntType(ty) => Some(Ty::new_int(self.infcx.tcx, ty)),

ty::IntVarValue::UintType(ty) => Some(Ty::new_uint(self.infcx.tcx, ty)),

ty::IntVarValue::Unknown => None,

the nittiest nit

lcnr · 2024-04-06T07:37:39Z

compiler/rustc_infer/src/infer/mod.rs

+                    ty::FloatVarValue::Unknown => None,
+                    ty::FloatVarValue::Known(ty) => Some(Ty::new_float(self.infcx.tcx, ty)),


Suggested change

ty::FloatVarValue::Unknown => None,

ty::FloatVarValue::Known(ty) => Some(Ty::new_float(self.infcx.tcx, ty)),

ty::FloatVarValue::Known(ty) => Some(Ty::new_float(self.infcx.tcx, ty)),

ty::FloatVarValue::Unknown => None,

part 2

rust-timer · 2024-04-06T08:29:35Z

Finished benchmarking commit (a7eb620): 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
Regressions ❌ (secondary)	1.7%	[1.1%, 2.1%]	12
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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.

Binary size

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

Bootstrap: 668.691s -> 668.286s (-0.06%)
Artifact size: 318.20 MiB -> 318.20 MiB (-0.00%)

lcnr · 2024-04-06T08:34:45Z

i do remember why 😁 because it worsens perf

compiler-errors · 2024-04-17T01:08:40Z

@bors try @rust-timer queue

bors · 2024-04-17T01:10:09Z

⌛ Trying commit 6e5acfb with merge a0e877e...

…r=<try> Simplify `IntVarValue`/`FloatVarValue` r? `@ghost`

bors · 2024-04-17T02:50:22Z

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

rust-timer · 2024-04-17T04:36:17Z

Finished benchmarking commit (a0e877e): comparison URL.

Overall result: ❌✅ regressions and improvements - 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
Regressions ❌ (secondary)	1.7%	[1.1%, 2.1%]	9
Improvements ✅ (primary)	-0.3%	[-0.3%, -0.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.3%	[-0.3%, -0.3%]	1

Max RSS (memory usage)

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

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

Binary size

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

Bootstrap: 676.389s -> 678.316s (0.28%)
Artifact size: 316.13 MiB -> 316.16 MiB (0.01%)

bors · 2024-04-30T16:13:13Z

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

bors · 2024-05-31T17:58:10Z

⌛ Trying commit c623ae1 with merge 14a0335...

compiler-errors · 2024-05-31T17:58:50Z

@bors try @rust-timer queue

bors · 2024-05-31T17:59:59Z

⌛ Trying commit 1eb0a5b with merge cdab356...

…r=<try> Simplify `IntVarValue`/`FloatVarValue` r? `@ghost`

bors · 2024-05-31T19:36:12Z

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

rust-timer · 2024-05-31T20:50:59Z

Finished benchmarking commit (cdab356): 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 2.5%, secondary 3.8%)

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

Cycles

Results (secondary -2.5%)

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

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

Bootstrap: 669.181s -> 665.221s (-0.59%)
Artifact size: 318.82 MiB -> 319.10 MiB (0.09%)

compiler-errors · 2024-06-01T14:27:51Z

Cool lol

lcnr · 2024-06-04T13:18:40Z

nice 👍 gj

@bors r+ rollup=iffy

bors · 2024-06-04T13:18:43Z

📌 Commit 208c316 has been approved by lcnr

It is now in the queue for this repository.

bors · 2024-06-04T17:07:17Z

⌛ Testing commit 208c316 with merge 44701e0...

bors · 2024-06-04T19:13:21Z

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing 44701e0 to master...

rust-timer · 2024-06-04T23:26:09Z

Finished benchmarking commit (44701e0): 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)	1.1%	[1.0%, 1.1%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -2.1%, secondary -3.2%)

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)	-2.1%	[-2.2%, -2.0%]	2
Improvements ✅ (secondary)	-3.2%	[-4.2%, -2.7%]	5
All ❌✅ (primary)	-2.1%	[-2.2%, -2.0%]	2

Cycles

Results (primary -0.9%, secondary 7.9%)

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.9%	[7.0%, 9.1%]	6
Improvements ✅ (primary)	-0.9%	[-0.9%, -0.9%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.9%	[-0.9%, -0.9%]	1

Binary size

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

Bootstrap: 667.768s -> 668.226s (0.07%)
Artifact size: 318.70 MiB -> 319.05 MiB (0.11%)

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 Apr 6, 2024

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 Apr 6, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2024

Auto merge of rust-lang#123536 - compiler-errors:simplify-int-float, …

a7eb620

…r=<try> Simplify `IntVarValue`/`FloatVarValue` r? `@ghost`

This comment has been minimized.

Sign in to view

lcnr reviewed Apr 6, 2024

View reviewed changes

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Apr 6, 2024

compiler-errors force-pushed the simplify-int-float branch from cc9de3b to 6e5acfb Compare April 17, 2024 01:08

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 Apr 17, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2024

Auto merge of rust-lang#123536 - compiler-errors:simplify-int-float, …

a0e877e

…r=<try> Simplify `IntVarValue`/`FloatVarValue` r? `@ghost`

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 Apr 17, 2024

compiler-errors force-pushed the simplify-int-float branch from 6e5acfb to a1e903d Compare April 23, 2024 14:08

Dylan-DPC added S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 8, 2024

compiler-errors closed this May 14, 2024

compiler-errors force-pushed the simplify-int-float branch from c623ae1 to 1eb0a5b Compare May 31, 2024 17:58

This comment has been minimized.

Sign in to view

bors added a commit to rust-lang-ci/rust that referenced this pull request May 31, 2024

Auto merge of rust-lang#123536 - compiler-errors:simplify-int-float, …

cdab356

…r=<try> Simplify `IntVarValue`/`FloatVarValue` r? `@ghost`

This comment has been minimized.

Sign in to view

rustbot removed S-waiting-on-perf Status: Waiting on a perf run to be completed. perf-regression Performance regression. labels May 31, 2024

compiler-errors added 3 commits June 1, 2024 10:31

Simplify IntVarValue/FloatVarValue

0a83764

Inline fold_infer_ty

f14b965

Address nits

208c316

compiler-errors force-pushed the simplify-int-float branch from 1eb0a5b to 208c316 Compare June 1, 2024 14:33

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 4, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 4, 2024

bors merged commit 44701e0 into rust-lang:master Jun 4, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone Jun 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify `IntVarValue`/`FloatVarValue` #123536

Simplify `IntVarValue`/`FloatVarValue` #123536

compiler-errors commented Apr 6, 2024

rustbot commented Apr 6, 2024

compiler-errors commented Apr 6, 2024

This comment has been minimized.

bors commented Apr 6, 2024

bors commented Apr 6, 2024

This comment has been minimized.

lcnr left a comment

lcnr Apr 6, 2024

lcnr Apr 6, 2024

lcnr Apr 6, 2024

lcnr Apr 6, 2024

rust-timer commented Apr 6, 2024

lcnr commented Apr 6, 2024

compiler-errors commented Apr 17, 2024

This comment has been minimized.

bors commented Apr 17, 2024

bors commented Apr 17, 2024

This comment has been minimized.

rust-timer commented Apr 17, 2024

bors commented Apr 30, 2024

bors commented May 31, 2024

compiler-errors commented May 31, 2024

This comment has been minimized.

bors commented May 31, 2024

This comment has been minimized.

bors commented May 31, 2024

This comment has been minimized.

rust-timer commented May 31, 2024

compiler-errors commented Jun 1, 2024

lcnr commented Jun 4, 2024

bors commented Jun 4, 2024

bors commented Jun 4, 2024

bors commented Jun 4, 2024

rust-timer commented Jun 4, 2024

	!self.inner.borrow_mut().int_unification_table().inlined_probe_value(v).is_unknown()
	self.inner.borrow_mut().int_unification_table().inlined_probe_value(v).is_known()

	!self.inner.borrow_mut().float_unification_table().probe_value(v).is_unknown()
	self.inner.borrow_mut().float_unification_table().probe_value(v).is_known()

		ty::FloatVarValue::Unknown => None,
		ty::FloatVarValue::Known(ty) => Some(Ty::new_float(self.infcx.tcx, ty)),

Simplify IntVarValue/FloatVarValue #123536

Simplify IntVarValue/FloatVarValue #123536

Conversation

compiler-errors commented Apr 6, 2024

rustbot commented Apr 6, 2024

compiler-errors commented Apr 6, 2024

This comment has been minimized.

bors commented Apr 6, 2024

bors commented Apr 6, 2024

This comment has been minimized.

lcnr 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

rust-timer commented Apr 6, 2024

Overall result: ❌ regressions - ACTION NEEDED

lcnr commented Apr 6, 2024

compiler-errors commented Apr 17, 2024

This comment has been minimized.

bors commented Apr 17, 2024

bors commented Apr 17, 2024

This comment has been minimized.

rust-timer commented Apr 17, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

bors commented Apr 30, 2024

bors commented May 31, 2024

compiler-errors commented May 31, 2024

This comment has been minimized.

bors commented May 31, 2024

This comment has been minimized.

bors commented May 31, 2024

This comment has been minimized.

rust-timer commented May 31, 2024

Overall result: no relevant changes - no action needed

compiler-errors commented Jun 1, 2024

lcnr commented Jun 4, 2024

bors commented Jun 4, 2024

bors commented Jun 4, 2024

bors commented Jun 4, 2024

rust-timer commented Jun 4, 2024

Overall result: ❌ regressions - no action needed

Simplify `IntVarValue`/`FloatVarValue` #123536

Simplify `IntVarValue`/`FloatVarValue` #123536