forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#127087 - cjgillot:small-map, r=<try>
Only track mentioned places for jump threading This PR aims to reduce the state space size in jump threading and dataflow const-prop opts. The current implementation walks the types of all locals, and creates a place for each possible projection. This can easily lead to a large number of places and tracked values, most being useless to the actual pass. With this PR, we instead collect places that appear syntactically in the MIR (first commit). However, this is not sufficient (second commit), and we miss places that we could track in aggregate assignments. The third commit tracks such assignments to mirror place projections, see the inline comment. This is complementary to rust-lang#127036 r? `@oli-obk`
- Loading branch information
Showing
14 changed files
with
615 additions
and
271 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
tests/mir-opt/dataflow-const-prop/aggregate_copy.foo.DataflowConstProp.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| - // MIR for `foo` before DataflowConstProp | ||
| + // MIR for `foo` after DataflowConstProp | ||
|
|
||
| fn foo() -> u32 { | ||
| let mut _0: u32; | ||
| let _1: (u32, u32); | ||
| let mut _4: bool; | ||
| let mut _5: u32; | ||
| scope 1 { | ||
| debug a => _1; | ||
| let _2: (u32, u32); | ||
| scope 2 { | ||
| debug b => _2; | ||
| let _3: u32; | ||
| scope 3 { | ||
| debug c => _3; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| bb0: { | ||
| StorageLive(_1); | ||
| _1 = const Foo; | ||
| StorageLive(_2); | ||
| - _2 = _1; | ||
| + _2 = const (5_u32, 3_u32); | ||
| StorageLive(_3); | ||
| - _3 = (_2.1: u32); | ||
| + _3 = const 3_u32; | ||
| StorageLive(_4); | ||
| StorageLive(_5); | ||
| - _5 = _3; | ||
| - _4 = Ge(move _5, const 2_u32); | ||
| - switchInt(move _4) -> [0: bb2, otherwise: bb1]; | ||
| + _5 = const 3_u32; | ||
| + _4 = const true; | ||
| + switchInt(const true) -> [0: bb2, otherwise: bb1]; | ||
| } | ||
|
|
||
| bb1: { | ||
| StorageDead(_5); | ||
| - _0 = (_2.0: u32); | ||
| + _0 = const 5_u32; | ||
| goto -> bb3; | ||
| } | ||
|
|
||
| bb2: { | ||
| StorageDead(_5); | ||
| _0 = const 13_u32; | ||
| goto -> bb3; | ||
| } | ||
|
|
||
| bb3: { | ||
| StorageDead(_4); | ||
| StorageDead(_3); | ||
| StorageDead(_2); | ||
| StorageDead(_1); | ||
| return; | ||
| } | ||
| + } | ||
| + | ||
| + ALLOC0 (size: 8, align: 4) { | ||
| + 05 00 00 00 03 00 00 00 │ ........ | ||
| } | ||
|
|
Oops, something went wrong.