summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/passes/OptimizeInstructions.cpp5
-rw-r--r--test/lit/passes/optimize-instructions.wast12
2 files changed, 15 insertions, 2 deletions
diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp
index 2f1b6b6a4..e9cf3baaa 100644
--- a/src/passes/OptimizeInstructions.cpp
+++ b/src/passes/OptimizeInstructions.cpp
@@ -416,8 +416,9 @@ struct OptimizeInstructions
{
// -x + y ==> y - x
// where x, y are floating points
- Expression* x;
- if (matches(curr, binary(Add, unary(Neg, any(&x)), any()))) {
+ Expression *x, *y;
+ if (matches(curr, binary(Add, unary(Neg, any(&x)), any(&y))) &&
+ canReorder(x, y)) {
curr->op = Abstract::getBinary(curr->type, Sub);
curr->left = x;
std::swap(curr->left, curr->right);
diff --git a/test/lit/passes/optimize-instructions.wast b/test/lit/passes/optimize-instructions.wast
index a4c8170a6..06f9f16c0 100644
--- a/test/lit/passes/optimize-instructions.wast
+++ b/test/lit/passes/optimize-instructions.wast
@@ -10571,6 +10571,16 @@
;; CHECK-NEXT: (local.get $y)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (f32.add
+ ;; CHECK-NEXT: (f32.neg
+ ;; CHECK-NEXT: (local.tee $a
+ ;; CHECK-NEXT: (f32.const 1)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (local.get $a)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $simplify-add-sub-with-neg-float (param $a f32) (param $b f32) (param $x f64) (param $y f64)
;; -x + y ==> y - x
@@ -10589,6 +10599,8 @@
;; -x - y -> skip
(drop (f32.sub (f32.neg (local.get $a)) (local.get $b)))
(drop (f64.sub (f64.neg (local.get $x)) (local.get $y)))
+ ;; -x + y -> skip, iff can't reorder
+ (drop (f32.add (f32.neg (local.tee $a (f32.const 1.0))) (local.get $a)))
)
;; CHECK: (func $simplify-add-sub-with-neg-float-zeros (param $a f32) (param $b f32)
;; CHECK-NEXT: (drop