Skip to content

Optimize select fallthrough values #2220

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.

Sign up for GitHub

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

Merged
kripken merged 14 commits into from
Jul 11, 2019
Merged

Optimize select fallthrough values #2220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1d74f27
wip
kripken Jul 9, 2019
25a271f
style
kripken Jul 9, 2019
33f675e
fix [ci skip]
kripken Jul 9, 2019
1c8bba1
fix
kripken Jul 9, 2019
5cca6bf
fix
kripken Jul 9, 2019
b0a75e6
fix
kripken Jul 9, 2019
483ba89
wip [ci skip]
kripken Jul 9, 2019
eacd940
fix
kripken Jul 10, 2019
4893f81
Merge remote-tracking branch 'origin/master' into ifbrif
kripken Jul 10, 2019
8650c83
fix
kripken Jul 11, 2019
8df7ba5
format
kripken Jul 11, 2019
d815770
FOLLWUP
kripken Jul 11, 2019
ae54a0a
comment
kripken Jul 11, 2019
8fbcd2f
Merge remote-tracking branch 'origin/master' into ifbrif2
kripken Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/passes/OptimizeInstructions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,7 @@ struct OptimizeInstructions

// Optimize given that the expression is flowing into a boolean context
Expression* optimizeBoolean(Expression* boolean) {
// TODO use a general getFallthroughs
if (auto* unary = boolean->dynCast<Unary>()) {
if (unary && unary->op == EqZInt32) {
auto* unary2 = unary->value->dynCast<Unary>();
Expand Down Expand Up @@ -975,6 +976,9 @@ struct OptimizeInstructions
iff->ifTrue = optimizeBoolean(iff->ifTrue);
iff->ifFalse = optimizeBoolean(iff->ifFalse);
}
} else if (auto* select = boolean->dynCast<Select>()) {
select->ifTrue = optimizeBoolean(select->ifTrue);
select->ifFalse = optimizeBoolean(select->ifFalse);
}
// TODO: recurse into br values?
return boolean;
Expand Down
10 changes: 3 additions & 7 deletions test/emcc_hello_world.fromasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10329,13 +10329,9 @@
(block
(br_if $label$break$L279
(select
(i32.eqz
(i32.eqz
(local.tee $3
(i32.load
(i32.const 616)
)
)
(local.tee $3
(i32.load
(i32.const 616)
)
)
(i32.const 0)
Expand Down
10 changes: 3 additions & 7 deletions test/emcc_hello_world.fromasm.clamp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10379,13 +10379,9 @@
(block
(br_if $label$break$L279
(select
(i32.eqz
(i32.eqz
(local.tee $3
(i32.load
(i32.const 616)
)
)
(local.tee $3
(i32.load
(i32.const 616)
)
)
(i32.const 0)
Expand Down
10 changes: 3 additions & 7 deletions test/emcc_hello_world.fromasm.imprecise
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10225,13 +10225,9 @@
(block
(br_if $label$break$L279
(select
(i32.eqz
(i32.eqz
(local.tee $3
(i32.load
(i32.const 616)
)
)
(local.tee $3
(i32.load
(i32.const 616)
)
)
(i32.const 0)
Expand Down
10 changes: 10 additions & 0 deletions test/passes/optimize-instructions_enable-threads.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3293,6 +3293,16 @@
)
)
)
(func $select-into-arms (; 77 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32)
(if
(select
(local.get $x)
(local.get $y)
(local.get $y)
)
(unreachable)
)
)
)
(module
(type $FUNCSIG$v (func))
Expand Down
10 changes: 10 additions & 0 deletions test/passes/optimize-instructions_enable-threads.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,6 +3738,16 @@
))
;; TODO: more stuff here
)
(func $select-into-arms (param $x i32) (param $y i32)
(if
(select
(i32.eqz (i32.eqz (local.get $x)))
(i32.eqz (i32.eqz (local.get $y)))
(local.get $y)
)
(unreachable)
)
)
)
(module
(import "env" "memory" (memory $0 (shared 256 256)))
Expand Down