Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[perf experiment] Disable UninhabitedEnumBranching #111787

Closed

Conversation

saethlin
Copy link
Member

r? @ghost

@rustbot 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 May 20, 2023
@saethlin
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 20, 2023
@bors
Copy link
Contributor

bors commented May 20, 2023

⌛ Trying commit 2896ab4 with merge 1e44b6aab02f601806e4733b6529ba7c57d9e4ea...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-14 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
........................................................................................   440/15027
........................................................................................   528/15027
........................................................................................   616/15027
........................................................................................   704/15027
.......................................F.F..............................................   792/15027
........................................................................................   968/15027
....................................i...................................................  1056/15027
........................................................i...............................  1144/15027
........................................................................................  1232/15027
---

---- [ui] tests/ui/async-await/future-sizes/large-arg.rs stdout ----
diff of stdout:

53 print-type-size     variant `MaybeUninit`: 1025 bytes
54 print-type-size         field `.uninit`: 0 bytes
55 print-type-size         field `.value`: 1025 bytes
- print-type-size type: `std::task::Poll<[u8; 1024]>`: 1025 bytes, alignment: 1 bytes
- print-type-size     discriminant: 1 bytes
- print-type-size     variant `Ready`: 1024 bytes
- print-type-size         field `.0`: 1024 bytes
- print-type-size     variant `Pending`: 0 bytes


The actual stdout differed from the expected stdout.
Actual stdout saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/future-sizes/large-arg/large-arg.stdout
Actual stdout saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/future-sizes/large-arg/large-arg.stdout
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args async-await/future-sizes/large-arg.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/async-await/future-sizes/large-arg.rs" "-Zthreads=1" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/future-sizes/large-arg" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/future-sizes/large-arg/auxiliary" "-Z" "print-type-sizes" "--crate-type=lib" "--edition=2021"
--- stdout -------------------------------
print-type-size type: `[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:6:21: 8:2]`: 3076 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 0 bytes
print-type-size     variant `Suspend0`: 3075 bytes
print-type-size         local `.__awaitee`: 3075 bytes
print-type-size     variant `Returned`: 0 bytes
print-type-size     variant `Panicked`: 0 bytes
print-type-size type: `[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:10:30: 12:2]`: 3075 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size     variant `Suspend0`: 3074 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size         local `.__awaitee`: 2050 bytes
print-type-size     variant `Returned`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size     variant `Panicked`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size type: `std::mem::ManuallyDrop<[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:10:30: 12:2]>`: 3075 bytes, alignment: 1 bytes
print-type-size     field `.value`: 3075 bytes
print-type-size type: `std::mem::MaybeUninit<[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:10:30: 12:2]>`: 3075 bytes, alignment: 1 bytes
print-type-size     variant `MaybeUninit`: 3075 bytes
print-type-size         field `.uninit`: 0 bytes
print-type-size         field `.value`: 3075 bytes
print-type-size type: `[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:13:26: 15:2]`: 2050 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size     variant `Suspend0`: 2049 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size         local `.__awaitee`: 1025 bytes
print-type-size     variant `Returned`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size     variant `Panicked`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size type: `std::mem::ManuallyDrop<[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:13:26: 15:2]>`: 2050 bytes, alignment: 1 bytes
print-type-size     field `.value`: 2050 bytes
print-type-size type: `std::mem::MaybeUninit<[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:13:26: 15:2]>`: 2050 bytes, alignment: 1 bytes
print-type-size     variant `MaybeUninit`: 2050 bytes
print-type-size         field `.uninit`: 0 bytes
print-type-size         field `.value`: 2050 bytes
print-type-size type: `[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:16:26: 18:2]`: 1025 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size     variant `Returned`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size     variant `Panicked`: 1024 bytes
print-type-size         upvar `.t`: 1024 bytes
print-type-size type: `std::mem::ManuallyDrop<[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:16:26: 18:2]>`: 1025 bytes, alignment: 1 bytes
print-type-size     field `.value`: 1025 bytes
print-type-size type: `std::mem::MaybeUninit<[async fn body@fake-test-src-base/async-await/future-sizes/large-arg.rs:16:26: 18:2]>`: 1025 bytes, alignment: 1 bytes
print-type-size     variant `MaybeUninit`: 1025 bytes
print-type-size         field `.uninit`: 0 bytes
print-type-size         field `.value`: 1025 bytes
stderr: none


---- [ui] tests/ui/async-await/future-sizes/async-awaiting-fut.rs stdout ----
---- [ui] tests/ui/async-await/future-sizes/async-awaiting-fut.rs stdout ----
diff of stdout:

61 print-type-size     variant `MaybeUninit`: 1 bytes
62 print-type-size         field `.uninit`: 0 bytes
63 print-type-size         field `.value`: 1 bytes
- print-type-size type: `std::task::Poll<()>`: 1 bytes, alignment: 1 bytes
- print-type-size     discriminant: 1 bytes
- print-type-size     variant `Ready`: 0 bytes
- print-type-size         field `.0`: 0 bytes
- print-type-size     variant `Pending`: 0 bytes


The actual stdout differed from the expected stdout.
Actual stdout saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/future-sizes/async-awaiting-fut/async-awaiting-fut.stdout
Actual stdout saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/future-sizes/async-awaiting-fut/async-awaiting-fut.stdout
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args async-await/future-sizes/async-awaiting-fut.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/async-await/future-sizes/async-awaiting-fut.rs" "-Zthreads=1" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/future-sizes/async-awaiting-fut" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/async-await/future-sizes/async-awaiting-fut/auxiliary" "-Z" "print-type-sizes" "--crate-type" "lib" "--edition=2021"
--- stdout -------------------------------
print-type-size type: `[async fn body@fake-test-src-base/async-await/future-sizes/async-awaiting-fut.rs:21:21: 24:2]`: 3078 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 0 bytes
print-type-size     variant `Suspend0`: 3077 bytes
print-type-size         local `.__awaitee`: 3077 bytes
print-type-size     variant `Returned`: 0 bytes
print-type-size     variant `Panicked`: 0 bytes
print-type-size type: `[async fn body@fake-test-src-base/async-await/future-sizes/async-awaiting-fut.rs:10:64: 19:2]`: 3077 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 1025 bytes
print-type-size         upvar `.fut`: 1025 bytes, offset: 0 bytes, alignment: 1 bytes
print-type-size     variant `Suspend0`: 2052 bytes
print-type-size         upvar `.fut`: 1025 bytes, offset: 0 bytes, alignment: 1 bytes
print-type-size         padding: 1 bytes
print-type-size         local `.fut`: 1025 bytes, alignment: 1 bytes
print-type-size         local `..generator_field4`: 1 bytes
print-type-size         local `.__awaitee`: 1 bytes
print-type-size     variant `Suspend1`: 3076 bytes
print-type-size         upvar `.fut`: 1025 bytes, offset: 0 bytes, alignment: 1 bytes
print-type-size         padding: 1026 bytes
print-type-size         local `..generator_field4`: 1 bytes, alignment: 1 bytes
print-type-size         local `.__awaitee`: 1025 bytes
print-type-size     variant `Suspend2`: 2052 bytes
print-type-size         upvar `.fut`: 1025 bytes, offset: 0 bytes, alignment: 1 bytes
print-type-size         padding: 1 bytes
print-type-size         local `.fut`: 1025 bytes, alignment: 1 bytes
print-type-size         local `..generator_field4`: 1 bytes
print-type-size         local `.__awaitee`: 1 bytes
print-type-size     variant `Returned`: 1025 bytes
print-type-size         upvar `.fut`: 1025 bytes, offset: 0 bytes, alignment: 1 bytes
print-type-size     variant `Panicked`: 1025 bytes
print-type-size         upvar `.fut`: 1025 bytes, offset: 0 bytes, alignment: 1 bytes
print-type-size type: `std::mem::ManuallyDrop<[async fn body@fake-test-src-base/async-await/future-sizes/async-awaiting-fut.rs:10:64: 19:2]>`: 3077 bytes, alignment: 1 bytes
print-type-size     field `.value`: 3077 bytes
print-type-size type: `std::mem::MaybeUninit<[async fn body@fake-test-src-base/async-await/future-sizes/async-awaiting-fut.rs:10:64: 19:2]>`: 3077 bytes, alignment: 1 bytes
print-type-size     variant `MaybeUninit`: 3077 bytes
print-type-size         field `.uninit`: 0 bytes
print-type-size         field `.value`: 3077 bytes
print-type-size type: `[async fn body@fake-test-src-base/async-await/future-sizes/async-awaiting-fut.rs:8:35: 8:37]`: 1025 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 1024 bytes
print-type-size         upvar `.arg`: 1024 bytes
print-type-size     variant `Returned`: 1024 bytes
print-type-size         upvar `.arg`: 1024 bytes
print-type-size     variant `Panicked`: 1024 bytes
print-type-size         upvar `.arg`: 1024 bytes
print-type-size type: `std::mem::ManuallyDrop<[async fn body@fake-test-src-base/async-await/future-sizes/async-awaiting-fut.rs:8:35: 8:37]>`: 1025 bytes, alignment: 1 bytes
print-type-size     field `.value`: 1025 bytes
print-type-size type: `std::mem::MaybeUninit<[async fn body@fake-test-src-base/async-await/future-sizes/async-awaiting-fut.rs:8:35: 8:37]>`: 1025 bytes, alignment: 1 bytes
print-type-size     variant `MaybeUninit`: 1025 bytes
print-type-size         field `.uninit`: 0 bytes
print-type-size         field `.value`: 1025 bytes
print-type-size type: `[async fn body@fake-test-src-base/async-await/future-sizes/async-awaiting-fut.rs:6:17: 6:19]`: 1 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 0 bytes
print-type-size     variant `Returned`: 0 bytes
print-type-size     variant `Panicked`: 0 bytes
print-type-size type: `std::mem::ManuallyDrop<bool>`: 1 bytes, alignment: 1 bytes
print-type-size     field `.value`: 1 bytes
print-type-size type: `std::mem::MaybeUninit<bool>`: 1 bytes, alignment: 1 bytes
print-type-size     variant `MaybeUninit`: 1 bytes
print-type-size         field `.uninit`: 0 bytes
print-type-size         field `.value`: 1 bytes
stderr: none


---- [ui] tests/ui/print_type_sizes/async.rs stdout ----
---- [ui] tests/ui/print_type_sizes/async.rs stdout ----
diff of stdout:

27 print-type-size     variant `MaybeUninit`: 1 bytes
28 print-type-size         field `.uninit`: 0 bytes
29 print-type-size         field `.value`: 1 bytes
- print-type-size type: `std::task::Poll<()>`: 1 bytes, alignment: 1 bytes
- print-type-size     discriminant: 1 bytes
- print-type-size     variant `Ready`: 0 bytes
- print-type-size         field `.0`: 0 bytes
- print-type-size     variant `Pending`: 0 bytes


The actual stdout differed from the expected stdout.
Actual stdout saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/print_type_sizes/async/async.stdout
Actual stdout saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/print_type_sizes/async/async.stdout
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args print_type_sizes/async.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/print_type_sizes/async.rs" "-Zthreads=1" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/print_type_sizes/async" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/print_type_sizes/async/auxiliary" "-Z" "print-type-sizes" "--crate-type" "lib" "--edition=2021"
--- stdout -------------------------------
print-type-size type: `[async fn body@fake-test-src-base/print_type_sizes/async.rs:10:36: 13:2]`: 16386 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 8192 bytes
print-type-size         upvar `.arg`: 8192 bytes
print-type-size     variant `Suspend0`: 16385 bytes
print-type-size         upvar `.arg`: 8192 bytes
print-type-size         local `.arg`: 8192 bytes
print-type-size         local `.__awaitee`: 1 bytes
print-type-size     variant `Returned`: 8192 bytes
print-type-size         upvar `.arg`: 8192 bytes
print-type-size     variant `Panicked`: 8192 bytes
print-type-size         upvar `.arg`: 8192 bytes
print-type-size type: `std::mem::ManuallyDrop<[u8; 8192]>`: 8192 bytes, alignment: 1 bytes
print-type-size     field `.value`: 8192 bytes
print-type-size type: `std::mem::MaybeUninit<[u8; 8192]>`: 8192 bytes, alignment: 1 bytes
print-type-size     variant `MaybeUninit`: 8192 bytes
print-type-size         field `.uninit`: 0 bytes
print-type-size         field `.value`: 8192 bytes
print-type-size type: `[async fn body@fake-test-src-base/print_type_sizes/async.rs:8:17: 8:19]`: 1 bytes, alignment: 1 bytes
print-type-size     discriminant: 1 bytes
print-type-size     variant `Unresumed`: 0 bytes
print-type-size     variant `Returned`: 0 bytes
print-type-size     variant `Panicked`: 0 bytes
print-type-size type: `std::mem::ManuallyDrop<[async fn body@fake-test-src-base/print_type_sizes/async.rs:8:17: 8:19]>`: 1 bytes, alignment: 1 bytes
print-type-size     field `.value`: 1 bytes
print-type-size type: `std::mem::MaybeUninit<[async fn body@fake-test-src-base/print_type_sizes/async.rs:8:17: 8:19]>`: 1 bytes, alignment: 1 bytes
print-type-size     variant `MaybeUninit`: 1 bytes
print-type-size         field `.uninit`: 0 bytes
print-type-size         field `.value`: 1 bytes
stderr: none



@Noratrieb Noratrieb 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 20, 2023
@bors
Copy link
Contributor

bors commented May 20, 2023

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

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1e44b6aab02f601806e4733b6529ba7c57d9e4ea): 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

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

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

Binary size

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.0% [0.0%, 0.0%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.1%, -0.1%] 3
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.0% [-0.1%, 0.0%] 7

Bootstrap: 642.768s -> 641.538s (-0.19%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 20, 2023
@saethlin saethlin closed this May 26, 2023
@saethlin saethlin deleted the disable-uninhabitedenumbranching branch June 14, 2023 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants