Remove storage markers if they won't be used during code generation by tmiasko · Pull Request #78360 · rust-lang/rust

tmiasko · 2020-10-25T15:47:03Z

The storage markers constitute a substantial portion of all MIR
statements. At the same time, for builds without any optimizations,
the storage markers have no further use during and after MIR
optimization phase.

If storage markers are not necessary for code generation, remove them.

rust-highfive · 2020-10-25T15:47:07Z

r? @estebank

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

jonas-schievink · 2020-10-25T15:49:59Z

@bors try @rust-timer queue

rust-timer · 2020-10-25T15:50:01Z

Awaiting bors try build completion

bors · 2020-10-25T15:50:11Z

⌛ Trying commit 638ae965adce2470ddf9937dc0674af9b490622e with merge 2cb5cb2ebd84701a032939c589afbc536d832a40...

tmiasko · 2020-10-25T15:51:21Z

Thanks for perf-run. At this point it is mostly an experiment.

r? @ghost

bors · 2020-10-25T16:33:55Z

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

rust-timer · 2020-10-25T16:33:56Z

Queued 2cb5cb2ebd84701a032939c589afbc536d832a40 with parent f392479, future comparison URL.

rust-timer · 2020-10-25T18:09:00Z

Finished benchmarking try commit (2cb5cb2ebd84701a032939c589afbc536d832a40): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never

tmiasko · 2020-10-26T12:39:32Z

An improvement for full and incremental builds of larger benchmarks. A minor regression for very small benchmarks.

full: style-servo-debug -1.2%, cranelift-codegen-debug -1.0%, cargo-debug -0.4%.
incr-unchanged: style-servo-debug -1.4%, cranelift-codegen-debug -2.5%, cargo-debug: -1.5%
a big regression in incr-patched for clap-rs-debug +33.9% as a result of an additional codegen unit (size estimates used for partitioning are based on the total number of statements, which are changed by this PR).

tmiasko · 2021-01-12T22:41:54Z

This a simple transformation removing storage markers at opt-level=0 where they won't have any further use. The CTFE having its own dedicated MIR will be unaffected.

r? @wesleywiser

estebank · 2021-01-12T23:59:37Z

Should do a perf run for the new code then?

tmiasko · 2021-01-13T00:06:06Z

A new perf run would be nice to have. Thanks.

estebank · 2021-01-13T01:17:16Z

@bors try @rust-timer queue

rust-timer · 2021-01-13T01:17:18Z

Awaiting bors try build completion.

bors · 2021-01-13T01:17:26Z

⌛ Trying commit 5bc26c8ece9b697078c730fff254e297afacba6b with merge 07d546cab150e55802417ec8b182be1a5522ad45...

bors · 2021-01-13T02:04:26Z

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

bors · 2021-02-24T21:26:06Z

⌛ Testing commit 31c01be3f262afb19a28fe79d0889905171f3e9f with merge 01bf843c8bba585821820c45b7605889f914a9e5...

bors · 2021-02-24T21:54:47Z

💔 Test failed - checks-actions

The storage markers constitute a substantial portion of all MIR statements. At the same time, for builds without any optimizations, the storage markers have no further use during and after MIR optimization phase. If storage markers are not necessary for code generation, remove them.

The storage markers are removed at -C opt-level=0 and as a result output of mir opt tests vary based on used optimization level. Use opt-level=1 for mir-opt tests to avoid the issue.

tmiasko · 2021-02-28T21:22:01Z

Rebased and added -O flag to a try_identity codegen test that requires storage markers so that MIR optimization applies.

oli-obk · 2021-03-01T10:39:23Z

@bors r=wesleywiser,oli-obk

bors · 2021-03-01T10:39:24Z

📌 Commit 57de468 has been approved by wesleywiser,oli-obk

bors · 2021-03-01T11:53:30Z

⌛ Testing commit 57de468 with merge 09db057...

bors · 2021-03-01T14:34:14Z

☀️ Test successful - checks-actions
Approved by: wesleywiser,oli-obk
Pushing 09db057 to master...

RalfJung · 2021-03-02T09:33:52Z

Storage markers are also used by Miri, and this caused some really strange test failures where we fail to detect some UB with optimizations enabled. I am not sure what is going on...

FWIW, would be good to ping @rust-lang/miri for MIR optimization changes that could affect UB detection. This is the second time in a week that I had to dig through rustc PR history to figure out why a test suddenly fails.^^

rustup; fix tests for new MIR optimization Somehow rust-lang/rust#78360 manages to mask UB. This would make sense if there were loops or things like that, but there are not, so really this is just very confusing...

rust-highfive assigned estebank Oct 25, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 25, 2020

tmiasko closed this Oct 26, 2020

tmiasko deleted the storage-markers branch October 26, 2020 12:39

tmiasko mentioned this pull request Dec 7, 2020
Make CTFE able to check for UB... #78407
Merged

tmiasko restored the storage-markers branch January 12, 2021 21:56

tmiasko reopened this Jan 12, 2021

tmiasko force-pushed the storage-markers branch from 638ae96 to fd13f5eCompare January 12, 2021 22:40

rust-highfive assigned wesleywiser and unassigned estebank Jan 12, 2021

This comment has been minimized.
Sign in to view

tmiasko force-pushed the storage-markers branch from fd13f5e to 5bc26c8Compare January 12, 2021 23:39

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 Feb 24, 2021

tmiasko added 3 commits February 28, 2021 20:10

compiletest: run mir-opt tests with -C opt-level=1
7076050
The storage markers are removed at -C opt-level=0 and as a result output of mir opt tests vary based on used optimization level. Use opt-level=1 for mir-opt tests to avoid the issue.

Use -O in try_identity test that requires storage markers
57de468

tmiasko force-pushed the storage-markers branch from 31c01be to 57de468Compare February 28, 2021 19:57

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 Mar 1, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 1, 2021

bors merged commit 09db057 into rust-lang:masterMar 1, 2021

rustbot added this to the 1.52.0 milestone Mar 1, 2021

tmiasko deleted the storage-markers branch March 1, 2021 18:58

matthiaskrgr mentioned this pull request Mar 1, 2021
broken mir after removal of storage markers #82678
Closed

RalfJung mentioned this pull request Mar 2, 2021
rustup; fix tests for new MIR optimization rust-lang/miri#1729
Merged

Alexendoo mentioned this pull request Mar 2, 2021
ICE: broken mir with -Zunsound-mir-opts: simplify arm identity #78628
Closed

matthiaskrgr mentioned this pull request Mar 4, 2021
Disable destination propagation on all mir-opt-levels #82684
Merged

ptersilie mentioned this pull request Mar 24, 2021
StorageLive/StorageDead not always emmitted in Debug mode in lastest upsteam. ykjit/yk#301
Closed

dtolnay mentioned this pull request Aug 17, 2021
LLVM crash: Basic Block does not have terminator! #88043
Closed

Uh oh!

Uh oh!

Conversation

tmiasko commented Oct 25, 2020

Uh oh!

rust-highfive commented Oct 25, 2020

Uh oh!

jonas-schievink commented Oct 25, 2020

Uh oh!

rust-timer commented Oct 25, 2020

Uh oh!

bors commented Oct 25, 2020

Uh oh!

tmiasko commented Oct 25, 2020

Uh oh!

bors commented Oct 25, 2020

Uh oh!

rust-timer commented Oct 25, 2020

Uh oh!

rust-timer commented Oct 25, 2020

Uh oh!

tmiasko commented Oct 26, 2020

Uh oh!

tmiasko commented Jan 12, 2021

Uh oh!

This comment has been minimized.

estebank commented Jan 12, 2021

Uh oh!

tmiasko commented Jan 13, 2021

Uh oh!

estebank commented Jan 13, 2021

Uh oh!

rust-timer commented Jan 13, 2021

Uh oh!

bors commented Jan 13, 2021

Uh oh!

bors commented Jan 13, 2021

Uh oh!

bors commented Feb 24, 2021

Uh oh!

This comment has been minimized.

bors commented Feb 24, 2021

Uh oh!

tmiasko commented Feb 28, 2021

Uh oh!

oli-obk commented Mar 1, 2021

Uh oh!

bors commented Mar 1, 2021

Uh oh!

bors commented Mar 1, 2021

Uh oh!

bors commented Mar 1, 2021

Uh oh!

RalfJung commented Mar 2, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants