diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp index 7c450ac060a..fa52b955f01 100644 --- a/src/passes/OptimizeInstructions.cpp +++ b/src/passes/OptimizeInstructions.cpp @@ -772,17 +772,22 @@ struct OptimizeInstructions return replaceCurrent(ret); } } - // bitwise operations - // for and and or, we can potentially conditionalize if (curr->op == AndInt32 || curr->op == OrInt32) { + // bitwise operations + // for and and or, we can potentially conditionalize if (auto* ret = conditionalizeExpensiveOnBitwise(curr)) { return replaceCurrent(ret); } - } - // for or, we can potentially combine - if (curr->op == OrInt32) { - if (auto* ret = combineOr(curr)) { - return replaceCurrent(ret); + if (curr->op == AndInt32) { + if (auto* ret = combineAnd(curr)) { + return replaceCurrent(ret); + } + } + // for or, we can potentially combine + if (curr->op == OrInt32) { + if (auto* ret = combineOr(curr)) { + return replaceCurrent(ret); + } } } // relation/comparisons allow for math optimizations @@ -2486,12 +2491,83 @@ struct OptimizeInstructions } } + // We can combine `and` operations, e.g. + // (x == 0) & (y == 0) ==> (x | y) == 0 + // (x < 0) & (y < 0) ==> (x & y) < 0 + Expression* combineAnd(Binary* curr) { + using namespace Abstract; + using namespace Match; + { + // (i32(x) == 0) & (i32(y) == 0) ==> i32(x | y) == 0 + // (i64(x) == 0) & (i64(y) == 0) ==> i64(x | y) == 0 + Expression *x, *y; + if (matches(curr, + binary(AndInt32, unary(EqZ, any(&x)), unary(EqZ, any(&y)))) && + x->type == y->type) { + auto* inner = curr->left->cast(); + inner->value = Builder(*getModule()) + .makeBinary(Abstract::getBinary(x->type, Or), x, y); + return inner; + } + } + { + // (i32(x) < 0) & (i32(y) < 0) ==> i32(x & y) < 0 + // (i64(x) < 0) & (i64(y) < 0) ==> i64(x & y) < 0 + Expression *x, *y; + if (matches(curr, + binary(AndInt32, + binary(LtS, any(&x), ival(0)), + binary(LtS, any(&y), ival(0)))) && + x->type == y->type) { + auto* inner = curr->left->cast(); + inner->left = Builder(*getModule()) + .makeBinary(Abstract::getBinary(x->type, And), x, y); + return inner; + } + } + { + // (i32(x) >= 0) & (i32(y) >= 0) => i32(x | y) >= 0 + // (i64(x) >= 0) & (i64(y) >= 0) => i64(x | y) >= 0 + Expression *x, *y; + if (matches(curr, + binary(AndInt32, + binary(GeS, any(&x), ival(0)), + binary(GeS, any(&y), ival(0)))) && + x->type == y->type) { + auto* inner = curr->left->cast(); + inner->left = Builder(*getModule()) + .makeBinary(Abstract::getBinary(x->type, Or), x, y); + return inner; + } + } + { + // (i32(x) == -1) & (i32(y) == -1) ==> i32(x & y) == -1 + // (i64(x) == -1) & (i64(y) == -1) ==> i64(x & y) == -1 + Expression *x, *y; + if (matches(curr, + binary(AndInt32, + binary(Eq, any(&x), ival(-1)), + binary(Eq, any(&y), ival(-1)))) && + x->type == y->type) { + auto* inner = curr->left->cast(); + inner->left = Builder(*getModule()) + .makeBinary(Abstract::getBinary(x->type, And), x, y); + return inner; + } + } + return nullptr; + } + // We can combine `or` operations, e.g. // (x > y) | (x == y) ==> x >= y - Expression* combineOr(Binary* binary) { - assert(binary->op == OrInt32); - if (auto* left = binary->left->dynCast()) { - if (auto* right = binary->right->dynCast()) { + // (x != 0) | (y != 0) ==> (x | y) != 0 + Expression* combineOr(Binary* curr) { + using namespace Abstract; + using namespace Match; + + assert(curr->op == OrInt32); + if (auto* left = curr->left->dynCast()) { + if (auto* right = curr->right->dynCast()) { if (left->op != right->op && ExpressionAnalyzer::equal(left->left, right->left) && ExpressionAnalyzer::equal(left->right, right->right) && @@ -2512,6 +2588,66 @@ struct OptimizeInstructions } } } + { + // (i32(x) != 0) | (i32(y) != 0) ==> i32(x | y) != 0 + // (i64(x) != 0) | (i64(y) != 0) ==> i64(x | y) != 0 + Expression *x, *y; + if (matches(curr, + binary(OrInt32, + binary(Ne, any(&x), ival(0)), + binary(Ne, any(&y), ival(0)))) && + x->type == y->type) { + auto* inner = curr->left->cast(); + inner->left = Builder(*getModule()) + .makeBinary(Abstract::getBinary(x->type, Or), x, y); + return inner; + } + } + { + // (i32(x) < 0) | (i32(y) < 0) ==> i32(x | y) < 0 + // (i64(x) < 0) | (i64(y) < 0) ==> i64(x | y) < 0 + Expression *x, *y; + if (matches(curr, + binary(OrInt32, + binary(LtS, any(&x), ival(0)), + binary(LtS, any(&y), ival(0)))) && + x->type == y->type) { + auto* inner = curr->left->cast(); + inner->left = Builder(*getModule()) + .makeBinary(Abstract::getBinary(x->type, Or), x, y); + return inner; + } + } + { + // (i32(x) >= 0) | (i32(y) >= 0) => i32(x & y) >= 0 + // (i64(x) >= 0) | (i64(y) >= 0) => i64(x & y) >= 0 + Expression *x, *y; + if (matches(curr, + binary(OrInt32, + binary(GeS, any(&x), ival(0)), + binary(GeS, any(&y), ival(0)))) && + x->type == y->type) { + auto* inner = curr->left->cast(); + inner->left = Builder(*getModule()) + .makeBinary(Abstract::getBinary(x->type, And), x, y); + return inner; + } + } + { + // (i32(x) != -1) | (i32(y) != -1) ==> i32(x & y) != -1 + // (i64(x) != -1) | (i64(y) != -1) ==> i64(x & y) != -1 + Expression *x, *y; + if (matches(curr, + binary(OrInt32, + binary(Ne, any(&x), ival(-1)), + binary(Ne, any(&y), ival(-1)))) && + x->type == y->type) { + auto* inner = curr->left->cast(); + inner->left = Builder(*getModule()) + .makeBinary(Abstract::getBinary(x->type, And), x, y); + return inner; + } + } return nullptr; } @@ -3055,14 +3191,14 @@ struct OptimizeInstructions } } } + + using namespace Abstract; + using namespace Match; // x - y == 0 => x == y // x - y != 0 => x != y // unsigned(x - y) > 0 => x != y // unsigned(x - y) <= 0 => x == y { - using namespace Abstract; - using namespace Match; - Binary* inner; // unsigned(x - y) > 0 => x != y if (matches(curr, diff --git a/test/lit/passes/inlining-optimizing_optimize-level=3.wast b/test/lit/passes/inlining-optimizing_optimize-level=3.wast index 980075d147f..632ec16ecfe 100644 --- a/test/lit/passes/inlining-optimizing_optimize-level=3.wast +++ b/test/lit/passes/inlining-optimizing_optimize-level=3.wast @@ -8849,19 +8849,16 @@ ;; CHECK-NEXT: (i32.or ;; CHECK-NEXT: (local.get $6) ;; CHECK-NEXT: (local.tee $12 - ;; CHECK-NEXT: (i32.or - ;; CHECK-NEXT: (i32.ne + ;; CHECK-NEXT: (i32.ne + ;; CHECK-NEXT: (i32.or ;; CHECK-NEXT: (i32.load ;; CHECK-NEXT: (local.get $13) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (i32.const 0) - ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (i32.ne ;; CHECK-NEXT: (i32.load offset=4 ;; CHECK-NEXT: (local.get $13) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) diff --git a/test/lit/passes/optimize-instructions.wast b/test/lit/passes/optimize-instructions.wast index 26ef699d162..f273e413066 100644 --- a/test/lit/passes/optimize-instructions.wast +++ b/test/lit/passes/optimize-instructions.wast @@ -10971,6 +10971,282 @@ ) )) ) + ;; CHECK: (func $optimize-compaund-relationals (param $x i32) (param $y i32) (param $a i64) (param $b i64) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.eqz + ;; CHECK-NEXT: (i32.or + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i64.eqz + ;; CHECK-NEXT: (i64.or + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (local.get $b) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.ne + ;; CHECK-NEXT: (i32.or + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i32.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i64.ne + ;; CHECK-NEXT: (i64.or + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (local.get $b) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.lt_s + ;; CHECK-NEXT: (i32.or + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i32.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i64.lt_s + ;; CHECK-NEXT: (i64.or + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (local.get $b) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.lt_s + ;; CHECK-NEXT: (i32.and + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i32.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i64.lt_s + ;; CHECK-NEXT: (i64.and + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (local.get $b) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.ge_s + ;; CHECK-NEXT: (i32.or + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i32.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i64.ge_s + ;; CHECK-NEXT: (i64.or + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (local.get $b) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.ge_s + ;; CHECK-NEXT: (i32.and + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i32.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i64.ge_s + ;; CHECK-NEXT: (i64.and + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (local.get $b) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.eq + ;; CHECK-NEXT: (i32.and + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i32.const -1) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i64.eq + ;; CHECK-NEXT: (i64.and + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (local.get $b) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.const -1) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.ne + ;; CHECK-NEXT: (i32.and + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (local.get $y) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i32.const -1) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i64.ne + ;; CHECK-NEXT: (i64.and + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (local.get $b) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.const -1) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.and + ;; CHECK-NEXT: (i32.eqz + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.eqz + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.or + ;; CHECK-NEXT: (i32.lt_s + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (i32.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.lt_s + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (i64.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (i32.and + ;; CHECK-NEXT: (i32.lt_s + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: (i32.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (i64.lt_s + ;; CHECK-NEXT: (local.get $a) + ;; CHECK-NEXT: (i64.const 0) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $optimize-compaund-relationals (param $x i32) (param $y i32) (param $a i64) (param $b i64) + ;; (i32(x) == 0) & (i32(y) == 0) ==> i32(x | y) == 0 + (drop (i32.and + (i32.eq (local.get $x) (i32.const 0)) + (i32.eq (local.get $y) (i32.const 0)) + )) + ;; (i64(x) == 0) & (i64(y) == 0) ==> i64(x | y) == 0 + (drop (i32.and + (i64.eq (local.get $a) (i64.const 0)) + (i64.eq (local.get $b) (i64.const 0)) + )) + ;; (i32(x) != 0) | (i32(y) != 0) ==> i32(x | y) != 0 + (drop (i32.or + (i32.ne (local.get $x) (i32.const 0)) + (i32.ne (local.get $y) (i32.const 0)) + )) + ;; (i64(x) != 0) | (i64(y) != 0) ==> i64(x | y) != 0 + (drop (i32.or + (i64.ne (local.get $a) (i64.const 0)) + (i64.ne (local.get $b) (i64.const 0)) + )) + ;; (i32(x) < 0) | (i32(y) < 0) ==> i32(x | y) < 0 + (drop (i32.or + (i32.lt_s (local.get $x) (i32.const 0)) + (i32.lt_s (local.get $y) (i32.const 0)) + )) + ;; (i64(x) < 0) | (i64(y) < 0) ==> i64(x | y) < 0 + (drop (i32.or + (i64.lt_s (local.get $a) (i64.const 0)) + (i64.lt_s (local.get $b) (i64.const 0)) + )) + ;; (i32(x) < 0) & (i32(y) < 0) ==> i32(x & y) < 0 + (drop (i32.and + (i32.lt_s (local.get $x) (i32.const 0)) + (i32.lt_s (local.get $y) (i32.const 0)) + )) + ;; (i64(x) < 0) & (i64(y) < 0) ==> i64(x & y) < 0 + (drop (i32.and + (i64.lt_s (local.get $a) (i64.const 0)) + (i64.lt_s (local.get $b) (i64.const 0)) + )) + ;; (i32(x) >= 0) & (i32(y) >= 0) ==> i32(x | y) >= 0 + (drop (i32.and + (i32.ge_s (local.get $x) (i32.const 0)) + (i32.ge_s (local.get $y) (i32.const 0)) + )) + ;; (i64(x) >= 0) & (i64(y) >= 0) ==> i64(x | y) >= 0 + (drop (i32.and + (i64.ge_s (local.get $a) (i64.const 0)) + (i64.ge_s (local.get $b) (i64.const 0)) + )) + ;; (i32(x) >= 0) | (i32(y) >= 0) ==> i32(x & y) >= 0 + (drop (i32.or + (i32.ge_s (local.get $x) (i32.const 0)) + (i32.ge_s (local.get $y) (i32.const 0)) + )) + ;; (i64(x) >= 0) | (i64(y) >= 0) ==> i64(x & y) >= 0 + (drop (i32.or + (i64.ge_s (local.get $a) (i64.const 0)) + (i64.ge_s (local.get $b) (i64.const 0)) + )) + ;; (i32(x) == -1) & (i32(y) == -1) ==> i32(x & y) == -1 + (drop (i32.and + (i32.eq (local.get $x) (i32.const -1)) + (i32.eq (local.get $y) (i32.const -1)) + )) + ;; (i64(x) == -1) & (i64(y) == -1) ==> i64(x & y) == -1 + (drop (i32.and + (i64.eq (local.get $a) (i64.const -1)) + (i64.eq (local.get $b) (i64.const -1)) + )) + ;; (i32(x) != -1) | (i32(y) != -1) ==> i32(x & y) != -1 + (drop (i32.or + (i32.ne (local.get $x) (i32.const -1)) + (i32.ne (local.get $y) (i32.const -1)) + )) + ;; (i64(x) != -1) | (i64(y) == -1) ==> i64(x & y) != -1 + (drop (i32.or + (i64.ne (local.get $a) (i64.const -1)) + (i64.ne (local.get $b) (i64.const -1)) + )) + + ;; (i32(x) == 0) & (i64(y) == 0) ==> skip + (drop (i32.and + (i32.eqz (local.get $x)) + (i64.eqz (local.get $a)) + )) + ;; (i32(x) < 0) | (i64(y) < 0) ==> skip + (drop (i32.or + (i32.lt_s (local.get $x) (i32.const 0)) + (i64.lt_s (local.get $a) (i64.const 0)) + )) + ;; (i64(x) < 0) & (i32(y) < 0) ==> skip + (drop (i32.and + (i64.lt_s (local.get $a) (i64.const 0)) + (i32.lt_s (local.get $x) (i32.const 0)) + )) + ) ;; CHECK: (func $optimize-relationals (param $x i32) (param $y i32) (param $X i64) (param $Y i64) ;; CHECK-NEXT: (drop ;; CHECK-NEXT: (i32.eq