Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

[Cranelift] delete extend/reduce rule (#13031)

Hyunbin Kima7c6fdd31831
diff --git a/cranelift/codegen/src/opts/arithmetic.isle b/cranelift/codegen/src/opts/arithmetic.isle
index a8aa42fdee..8d71372b7b 100644
--- a/cranelift/codegen/src/opts/arithmetic.isle
+++ b/cranelift/codegen/src/opts/arithmetic.isle
@@ -406,18 +406,6 @@
(rule (simplify (ineg ty (imul ty (ineg ty y) x))) (imul ty x y))
(rule (simplify (ineg ty (imul ty x (ineg ty y)))) (imul ty x y))
-;; ireduce(xext(a) + xext(b)) --> a + b
-(rule (simplify (ireduce ty (iadd cty (sextend cty x) (sextend cty y)))) (iadd ty x y))
-(rule (simplify (ireduce ty (iadd cty (sextend cty x) (uextend cty y)))) (iadd ty x y))
-(rule (simplify (ireduce ty (iadd cty (uextend cty x) (sextend cty y)))) (iadd ty x y))
-(rule (simplify (ireduce ty (iadd cty (uextend cty x) (uextend cty y)))) (iadd ty x y))
-
-;; ireduce(xext(a) - xext(b)) --> a - b
-(rule (simplify (ireduce ty (isub cty (sextend cty x) (sextend cty y)))) (isub ty x y))
-(rule (simplify (ireduce ty (isub cty (sextend cty x) (uextend cty y)))) (isub ty x y))
-(rule (simplify (ireduce ty (isub cty (uextend cty x) (sextend cty y)))) (isub ty x y))
-(rule (simplify (ireduce ty (isub cty (uextend cty x) (uextend cty y)))) (isub ty x y))
-
;; max(x, y) >= x
(rule (simplify (sge ty (smax ty x y) x)) (iconst_u ty 1))
(rule (simplify (sge ty (smax ty y x) x)) (iconst_u ty 1))
diff --git a/cranelift/filetests/filetests/egraph/arithmetic-precise.clif b/cranelift/filetests/filetests/egraph/arithmetic-precise.clif
index 8ea8ec3c9c..ea988e15f2 100644
--- a/cranelift/filetests/filetests/egraph/arithmetic-precise.clif
+++ b/cranelift/filetests/filetests/egraph/arithmetic-precise.clif
@@ -340,38 +340,6 @@ block0(v0: i32, v1: i32):
; return v5
; }
-;; ireduce(sextend(x) + uextend(y)) --> x + y
-function %test_ireduce_iadd_extends(i8, i8) -> i8 fast {
-block0(v0: i8, v1: i8):
- v2 = sextend.i16 v0
- v3 = uextend.i16 v1
- v4 = iadd v2, v3
- v5 = ireduce.i8 v4
- return v5
-}
-
-; function %test_ireduce_iadd_extends(i8, i8) -> i8 fast {
-; block0(v0: i8, v1: i8):
-; v6 = iadd v0, v1
-; return v6
-; }
-
-;; ireduce(sextend(x) - uextend(y)) --> x - y
-function %test_ireduce_isub_extends(i8, i8) -> i8 fast {
-block0(v0: i8, v1: i8):
- v2 = sextend.i16 v0
- v3 = uextend.i16 v1
- v4 = isub v2, v3
- v5 = ireduce.i8 v4
- return v5
-}
-
-; function %test_ireduce_isub_extends(i8, i8) -> i8 fast {
-; block0(v0: i8, v1: i8):
-; v6 = isub v0, v1
-; return v6
-; }
-
;; smax(x, y) >= x --> true
function %test_sge_smax_x(i32, i32) -> i8 fast {
block0(v0: i32, v1: i32):
diff --git a/cranelift/filetests/filetests/egraph/arithmetic.clif b/cranelift/filetests/filetests/egraph/arithmetic.clif
index c0f169d7f6..b131428a6a 100644
--- a/cranelift/filetests/filetests/egraph/arithmetic.clif
+++ b/cranelift/filetests/filetests/egraph/arithmetic.clif
@@ -363,8 +363,8 @@ block0(v0: i16, v1: i16, v2: i16):
return v8
}
-; check: v10 = iadd v0, v1
-; check: v15 = iadd v10, v2
+; check: v12 = iadd v0, v1
+; check: v15 = iadd v12, v2
; check: return v15
;; or(x, C) + (-C) --> and(x, ~C)
diff --git a/cranelift/filetests/filetests/egraph/extends.clif b/cranelift/filetests/filetests/egraph/extends.clif
index 81b619b757..a4b260eebf 100644
--- a/cranelift/filetests/filetests/egraph/extends.clif
+++ b/cranelift/filetests/filetests/egraph/extends.clif
@@ -179,8 +179,8 @@ block0(v0: i16, v1: i16):
return v5
}
-; check: v6 = iadd v0, v1
-; check: return v6
+; check: v8 = iadd v0, v1
+; check: return v8
function %extend_bxor_reduce(i64, i64) -> i64 {
block0(v0: i64, v1: i64):
diff --git a/cranelift/filetests/filetests/runtests/arithmetic.clif b/cranelift/filetests/filetests/runtests/arithmetic.clif
index 037d8bd4f0..f8a71620a1 100644
--- a/cranelift/filetests/filetests/runtests/arithmetic.clif
+++ b/cranelift/filetests/filetests/runtests/arithmetic.clif
@@ -881,33 +881,6 @@ block0(v0: i32, v1: i32):
; run: %test_ineg_imul_ineg_rhs(0, 0) == 0
; run: %test_ineg_imul_ineg_rhs(1, 2) == 2
-function %test_ireduce_iadd_extends(i8, i8) -> i8 fast {
-block0(v0: i8, v1: i8):
- v2 = sextend.i16 v0
- v3 = uextend.i16 v1
- v4 = iadd v2, v3
- v5 = ireduce.i8 v4
- return v5
-}
-
-; run: %test_ireduce_iadd_extends(0, 0) == 0
-; run: %test_ireduce_iadd_extends(1, 2) == 3
-
-function %test_ireduce_isub_extends(i8, i8) -> i8 fast {
-block0(v0: i8, v1: i8):
- v2 = sextend.i16 v0
- v3 = uextend.i16 v1
- v4 = isub v2, v3
- v5 = ireduce.i8 v4
- return v5
-}
-
-; run: %test_ireduce_isub_extends(0, 0) == 0
-; run: %test_ireduce_isub_extends(5, 2) == 3
-; run: %test_ireduce_isub_extends(0, 1) == -1
-; run: %test_ireduce_isub_extends(-1, 1) == -2
-; run: %test_ireduce_isub_extends(-128, 1) == 127
-
function %test_sge_smax_x(i32, i32) -> i8 fast {
block0(v0: i32, v1: i32):
v2 = smax v0, v1