JumpThreading: fix bitwise not on non-booleans #131203

clubby789 · 2024-10-03T14:17:05Z

Alternative to #131201

rustbot · 2024-10-03T14:17:13Z

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-10-03T14:17:15Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

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

tests/mir-opt/jump_threading.rs

compiler-errors · 2024-10-03T15:33:04Z

Thanks!

@bors r+

bors · 2024-10-03T15:33:07Z

📌 Commit fd35e82 has been approved by compiler-errors

It is now in the queue for this repository.

…piler-errors JumpThreading: fix bitwise not on non-booleans Fixes rust-lang#131195 Alternative to rust-lang#131201

compiler-errors · 2024-10-03T19:32:50Z

Ok, well, this definitely causes a crash when building [email protected]

@bors r-

Let's actually land #131201, which is a more conservative fix. Then we can work on improving the jumpthreading optimization :)

Since cjgillot authored the jump threading optimization (I think?) I can pass this off to them.

r? @cjgillot

clubby789 · 2024-10-03T23:34:26Z

Looks like some miscompile in std 🤔 In my local testing I get println hanging on futex forever

compiler-errors · 2024-10-04T02:28:26Z

I am very curious to learn what is wrong with this PR :D

bors · 2024-10-04T07:45:03Z

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

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

compiler/rustc_mir_transform/src/jump_threading.rs

compiler-errors · 2025-04-13T16:35:04Z

@bors r+ rollup=never

bors · 2025-04-13T16:35:07Z

📌 Commit bee9c73 has been approved by compiler-errors

It is now in the queue for this repository.

…ler-errors JumpThreading: fix bitwise not on non-booleans Fixes rust-lang#131195 Alternative to rust-lang#131201

bors · 2025-04-13T19:05:48Z

⌛ Testing commit bee9c73 with merge 07e2b20...

bors · 2025-04-13T20:00:59Z

💔 Test failed - checks-actions

clubby789 · 2025-04-13T20:32:21Z

Rebased and updated a test.

@bors r=compiler-errors rollup=never

bors · 2025-04-13T20:32:23Z

📌 Commit 41a5d8e has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2025-04-13T21:37:01Z

⌛ Testing commit 41a5d8e with merge 6e83046...

bors · 2025-04-14T00:45:53Z

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

github-actions · 2025-04-14T00:48:07Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 092a284 (parent) -> 6e83046 (this PR)

Test differences

No test diffs found

Job duration changes

dist-aarch64-linux: 5318.0s -> 7613.4s (43.2%)
dist-apple-various: 8408.9s -> 6220.8s (-26.0%)
x86_64-apple-2: 4930.6s -> 4184.6s (-15.1%)
x86_64-apple-1: 7984.3s -> 6994.9s (-12.4%)
dist-various-2: 3418.3s -> 3209.9s (-6.1%)
x86_64-msvc-ext1: 7533.8s -> 7085.1s (-6.0%)
i686-gnu-2: 6685.7s -> 6370.4s (-4.7%)
dist-aarch64-msvc: 8201.0s -> 8509.3s (3.8%)
dist-aarch64-apple: 4389.5s -> 4532.4s (3.3%)
aarch64-apple: 3719.8s -> 3603.2s (-3.1%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2025-04-14T02:01:19Z

Finished benchmarking commit (6e83046): 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 (primary -7.5%, secondary -2.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
Regressions ❌ (secondary)	1.5%	[1.5%, 1.5%]	1
Improvements ✅ (primary)	-7.5%	[-7.5%, -7.5%]	1
Improvements ✅ (secondary)	-3.8%	[-4.3%, -3.2%]	2
All ❌✅ (primary)	-7.5%	[-7.5%, -7.5%]	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.607s -> 779.963s (0.05%)
Artifact size: 365.51 MiB -> 365.51 MiB (0.00%)

…ler-errors Remove early exits from JumpThreading. This removes early exits from rust-lang#131203 as I asked during review. The correctness of the backtracking is `mutated_statement` clearing all relevant conditions. If `process_statement` fails to insert a new condition, for instance by const-eval failure, `mutated_statement` still removes the obsolete conditions from the state. r? `@compiler-errors`

Rollup merge of rust-lang#140024 - cjgillot:continue-jumping, r=compiler-errors Remove early exits from JumpThreading. This removes early exits from rust-lang#131203 as I asked during review. The correctness of the backtracking is `mutated_statement` clearing all relevant conditions. If `process_statement` fails to insert a new condition, for instance by const-eval failure, `mutated_statement` still removes the obsolete conditions from the state. r? `@compiler-errors`

Remove early exits from JumpThreading. This removes early exits from rust-lang/rust#131203 as I asked during review. The correctness of the backtracking is `mutated_statement` clearing all relevant conditions. If `process_statement` fails to insert a new condition, for instance by const-eval failure, `mutated_statement` still removes the obsolete conditions from the state. r? `@compiler-errors`

rustbot assigned BoxyUwU Oct 3, 2024

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

compiler-errors reviewed Oct 3, 2024

View reviewed changes

compiler/rustc_middle/src/ty/consts/int.rs Outdated Show resolved Hide resolved

compiler-errors reviewed Oct 3, 2024

View reviewed changes

tests/mir-opt/jump_threading.rs Outdated Show resolved Hide resolved

compiler-errors assigned compiler-errors and unassigned BoxyUwU Oct 3, 2024

compiler-errors mentioned this pull request Oct 3, 2024

Disable jump threading UnOp::Not for non-bool #131201

Merged

compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 3, 2024

rust-cloud-vms bot force-pushed the jumpthreading-not branch from eb99fae to fd35e82 Compare October 3, 2024 15:11

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

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 3, 2024

Rollup merge of rust-lang#131203 - clubby789:jumpthreading-not, r=com…

1ce9d8d

…piler-errors JumpThreading: fix bitwise not on non-booleans Fixes rust-lang#131195 Alternative to rust-lang#131201

matthiaskrgr mentioned this pull request Oct 3, 2024

Rollup of 5 pull requests #131210

Closed

compiler-errors added the stable-nominated Nominated for backporting to the compiler in the stable channel. label Oct 3, 2024

This comment has been minimized.

Sign in to view

rustbot assigned cjgillot Oct 3, 2024

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

rustbot unassigned compiler-errors Oct 3, 2024

dianqk reviewed Oct 4, 2024

View reviewed changes

compiler/rustc_middle/src/ty/consts/int.rs Outdated Show resolved Hide resolved

dianqk reviewed Oct 4, 2024

View reviewed changes

compiler/rustc_mir_transform/src/jump_threading.rs Outdated Show resolved Hide resolved

rustbot assigned compiler-errors Apr 8, 2025

compiler-errors approved these changes Apr 13, 2025

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 Apr 13, 2025

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

Auto merge of rust-lang#131203 - clubby789:jumpthreading-not, r=compi…

07e2b20

…ler-errors JumpThreading: fix bitwise not on non-booleans Fixes rust-lang#131195 Alternative to rust-lang#131201

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 13, 2025

clubby789 added 2 commits April 13, 2025 20:29

JumpThreading: Re-enable and fix Not ops on non-booleans

9f35fe4

JumpThreading: Bail out on interp errors

41a5d8e

rust-cloud-vms bot force-pushed the jumpthreading-not branch from bee9c73 to 41a5d8e Compare April 13, 2025 20:30

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 Apr 13, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 14, 2025

bors merged commit 6e83046 into rust-lang:master Apr 14, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 14, 2025

cjgillot mentioned this pull request Apr 19, 2025

Remove early exits from JumpThreading. #140024

Merged

JumpThreading: fix bitwise not on non-booleans #131203

JumpThreading: fix bitwise not on non-booleans #131203

Uh oh!

Conversation

clubby789 commented Oct 3, 2024

Uh oh!

rustbot commented Oct 3, 2024

Uh oh!

rustbot commented Oct 3, 2024

Uh oh!

Uh oh!

Uh oh!

compiler-errors commented Oct 3, 2024

Uh oh!

bors commented Oct 3, 2024

Uh oh!

This comment has been minimized.

compiler-errors commented Oct 3, 2024

Uh oh!

clubby789 commented Oct 3, 2024

Uh oh!

compiler-errors commented Oct 4, 2024

Uh oh!

bors commented Oct 4, 2024

Uh oh!

Uh oh!

Uh oh!

compiler-errors commented Apr 13, 2025

Uh oh!

bors commented Apr 13, 2025

Uh oh!

bors commented Apr 13, 2025

Uh oh!

This comment has been minimized.

bors commented Apr 13, 2025

Uh oh!

clubby789 commented Apr 13, 2025

Uh oh!

bors commented Apr 13, 2025

Uh oh!

bors commented Apr 13, 2025

Uh oh!

bors commented Apr 14, 2025

Uh oh!

Uh oh!

github-actions bot commented Apr 14, 2025

Test differences

Job duration changes

Uh oh!

rust-timer commented Apr 14, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!