add `visit_operand` to const prop #74507

lcnr · 2020-07-19T10:32:53Z

oli-obk · 2020-07-19T10:43:00Z

src/test/mir-opt/const_prop/array_index/32bit/rustc.main.ConstProp.diff

+                                          // + val: Value(Scalar(0x00000002))
+                                          // mir::Constant
+                                          // + span: $DIR/array_index.rs:5:18: 5:33
+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }


oh god these comments are really annoying 😆

i really wish there rwas a way to suppress all the comments in MIR dumps

oli-obk · 2020-07-19T11:18:51Z

src/test/mir-opt/const_prop/discriminant/32bit/rustc.main.ConstProp.diff

@@ -56,7 +56,14 @@
      }

      bb2: {
-          switchInt(((_3 as Some).0: bool)) -> [false: bb1, otherwise: bb3]; // scope 0 at $DIR/discriminant.rs:11:26: 11:30
+-         switchInt(((_3 as Some).0: bool)) -> [false: bb1, otherwise: bb3]; // scope 0 at $DIR/discriminant.rs:11:26: 11:30
+         switchInt(const true) -> [false: bb1, otherwise: bb3]; // scope 0 at $DIR/discriminant.rs:11:26: 11:30


awesome! later passes will replace this with a goto now

oli-obk · 2020-07-19T11:22:36Z

@bors try @rust-timer build

let's do a perf run so we know whether we can let it get rolled up or not

bors · 2020-07-19T11:22:47Z

⌛ Trying commit 9ea645fc8ea275b1a5b868258fe6021c6ac36578 with merge 23214cf1fdf15e1a92e0d297e6de7123d713c9ff...

bors · 2020-07-19T13:31:43Z

☀️ Try build successful - checks-actions, checks-azure
Build commit: 23214cf1fdf15e1a92e0d297e6de7123d713c9ff (23214cf1fdf15e1a92e0d297e6de7123d713c9ff)

rust-timer · 2020-07-19T13:31:45Z

Queued 23214cf1fdf15e1a92e0d297e6de7123d713c9ff with parent 47ea6d9, future comparison URL.

rust-timer · 2020-07-19T18:10:54Z

Finished benchmarking try commit (23214cf1fdf15e1a92e0d297e6de7123d713c9ff): comparison url.

src/librustc_mir/transform/const_prop.rs

xldenis · 2020-07-22T09:39:03Z

src/librustc_mir/transform/const_prop.rs

-                }
+            TerminatorKind::SwitchInt { ref mut discr, .. } => {
+                // FIXME: This is currently redundant with `visit_operand`, but sadly
+                // always visiting operands currently causes a perf regression, so


could be worth mentioning the perf regression is not due to the cost of actually visiting the operands but the changes it causes to MIR code

oli-obk · 2020-07-22T10:08:36Z

r=me with more info on the perf regression on that comment

lcnr · 2020-07-22T10:33:05Z

referenced LLVM in the fixme, not sure if you want anything else mentioned.

oli-obk · 2020-07-22T13:20:59Z

@bors r+

bors · 2020-07-22T13:21:01Z

📌 Commit d257bac has been approved by oli-obk

bors · 2020-07-22T13:21:02Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@oli-obk

add `visit_operand` to const prop r? @oli-obk

@oli-obk

add `visit_operand` to const prop r? @oli-obk

@oli-obk

add `visit_operand` to const prop r? @oli-obk

Manishearth · 2020-07-22T19:22:58Z

Should this be rollup=never?

lcnr · 2020-07-22T19:25:22Z

Not sure, this shouldn't change anything for mir-opt-level < 2 which is the default so I would be surprised if this has a perf impact

src/librustc_mir/transform/const_prop.rs

bors · 2020-07-23T15:42:41Z

⌛ Testing commit d257bac with merge 88172d158a88b12df391690503ba19bcb7b18e19...

lcnr · 2020-07-23T15:46:32Z

@bors r-

bors · 2020-07-23T15:49:18Z

💔 Test failed - checks-actions

RalfJung · 2020-07-24T07:41:02Z

LGTM; let's see what @oli-obk says.

oli-obk · 2020-07-24T08:06:37Z

this visits unevaluated constants and potentially evaluates them again, so that change is definitely an improvement

@bors r+

bors · 2020-07-24T08:06:38Z

📌 Commit 61a9ab8 has been approved by oli-obk

@oli-obk

add `visit_operand` to const prop r? @oli-obk

Manishearth · 2020-07-24T20:10:30Z

@bors treeclosed-

bors · 2020-07-24T20:10:40Z

⌛ Testing commit 61a9ab8 with merge d8cf749...

bors · 2020-07-24T22:00:17Z

☀️ Test successful - checks-actions, checks-azure
Approved by: oli-obk
Pushing d8cf749 to master...

rust-highfive assigned oli-obk Jul 19, 2020

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

oli-obk reviewed Jul 19, 2020

View reviewed changes

lcnr force-pushed the const-prop-into-op branch from 2205e4c to 1f0b9c3 Compare July 21, 2020 21:48

oli-obk reviewed Jul 22, 2020

View reviewed changes

src/librustc_mir/transform/const_prop.rs Outdated Show resolved Hide resolved

const prop into operands

c74c648

lcnr force-pushed the const-prop-into-op branch from 1f0b9c3 to c74c648 Compare July 22, 2020 09:32

xldenis reviewed Jul 22, 2020

View reviewed changes

note LLVM in fixme

d257bac

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 Jul 22, 2020

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020

Rollup merge of rust-lang#74507 - lcnr:const-prop-into-op, r=oli-obk

6690992

add `visit_operand` to const prop r? @oli-obk

Manishearth mentioned this pull request Jul 22, 2020

Rollup of 8 pull requests #74646

Closed

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020

Rollup merge of rust-lang#74507 - lcnr:const-prop-into-op, r=oli-obk

894a76c

add `visit_operand` to const prop r? @oli-obk

Manishearth mentioned this pull request Jul 22, 2020

Rollup of 10 pull requests #74647

Closed

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020

Rollup merge of rust-lang#74507 - lcnr:const-prop-into-op, r=oli-obk

792d485

add `visit_operand` to const prop r? @oli-obk

RalfJung reviewed Jul 23, 2020

View reviewed changes

src/librustc_mir/transform/const_prop.rs Outdated Show resolved Hide resolved

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 Jul 23, 2020

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 23, 2020

slightly adapt const prop

61a9ab8

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 Jul 24, 2020

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jul 24, 2020

Rollup merge of rust-lang#74507 - lcnr:const-prop-into-op, r=oli-obk

1279137

add `visit_operand` to const prop r? @oli-obk

Dylan-DPC-zz mentioned this pull request Jul 24, 2020

Rollup of 10 pull requests #74719

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 24, 2020

bors merged commit d8cf749 into rust-lang:master Jul 24, 2020

lcnr deleted the const-prop-into-op branch July 24, 2020 23:13

bugadani mentioned this pull request Sep 23, 2020

Enable const propagation into operands at mir_opt_level=2 #77107

Merged

cuviper added this to the 1.47.0 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add `visit_operand` to const prop #74507

add `visit_operand` to const prop #74507

lcnr commented Jul 19, 2020

oli-obk Jul 19, 2020

xldenis Jul 22, 2020

oli-obk Jul 22, 2020

oli-obk Jul 19, 2020

oli-obk commented Jul 19, 2020

bors commented Jul 19, 2020

bors commented Jul 19, 2020

rust-timer commented Jul 19, 2020

rust-timer commented Jul 19, 2020

xldenis Jul 22, 2020

oli-obk commented Jul 22, 2020

lcnr commented Jul 22, 2020

oli-obk commented Jul 22, 2020

bors commented Jul 22, 2020

bors commented Jul 22, 2020

Manishearth commented Jul 22, 2020

lcnr commented Jul 22, 2020 •

edited

Loading

bors commented Jul 23, 2020

lcnr commented Jul 23, 2020

This comment has been minimized.

bors commented Jul 23, 2020

RalfJung commented Jul 24, 2020

oli-obk commented Jul 24, 2020

bors commented Jul 24, 2020

Manishearth commented Jul 24, 2020

bors commented Jul 24, 2020

bors commented Jul 24, 2020

add visit_operand to const prop #74507

add visit_operand to const prop #74507

Conversation

lcnr commented Jul 19, 2020

oli-obk Jul 19, 2020

Choose a reason for hiding this comment

xldenis Jul 22, 2020

Choose a reason for hiding this comment

oli-obk Jul 22, 2020

Choose a reason for hiding this comment

oli-obk Jul 19, 2020

Choose a reason for hiding this comment

oli-obk commented Jul 19, 2020

bors commented Jul 19, 2020

bors commented Jul 19, 2020

rust-timer commented Jul 19, 2020

rust-timer commented Jul 19, 2020

xldenis Jul 22, 2020

Choose a reason for hiding this comment

oli-obk commented Jul 22, 2020

lcnr commented Jul 22, 2020

oli-obk commented Jul 22, 2020

bors commented Jul 22, 2020

bors commented Jul 22, 2020

Manishearth commented Jul 22, 2020

lcnr commented Jul 22, 2020 • edited Loading

bors commented Jul 23, 2020

lcnr commented Jul 23, 2020

This comment has been minimized.

bors commented Jul 23, 2020

RalfJung commented Jul 24, 2020

oli-obk commented Jul 24, 2020

bors commented Jul 24, 2020

Manishearth commented Jul 24, 2020

bors commented Jul 24, 2020

bors commented Jul 24, 2020

add `visit_operand` to const prop #74507

add `visit_operand` to const prop #74507

lcnr commented Jul 22, 2020 •

edited

Loading