A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
[Cranelift] add commutative rules for min/max ops (#13198)
Bongjun Jangf48ee88ddb8a
diff --git a/cranelift/codegen/src/opts/cprop.isle b/cranelift/codegen/src/opts/cprop.isleindex 21533feb96..4ee8a293f2 100644--- a/cranelift/codegen/src/opts/cprop.isle+++ b/cranelift/codegen/src/opts/cprop.isle@@ -101,6 +101,26 @@(iconst _ k2)))(subsume (iconst ty (imm64_rotl ty k1 k2))))+(rule (simplify (umin (fits_in_64 ty)+ (iconst ty k1)+ (iconst ty k2)))+ (subsume (iconst ty (imm64_umin ty k1 k2))))++(rule (simplify (umax (fits_in_64 ty)+ (iconst ty k1)+ (iconst ty k2)))+ (subsume (iconst ty (imm64_umax ty k1 k2))))++(rule (simplify (smin (fits_in_64 ty)+ (iconst ty k1)+ (iconst ty k2)))+ (subsume (iconst ty (imm64_smin ty k1 k2))))++(rule (simplify (smax (fits_in_64 ty)+ (iconst ty k1)+ (iconst ty k2)))+ (subsume (iconst ty (imm64_smax ty k1 k2))))+(rule (simplify (ireduce narrow (iconst (fits_in_64 _) (u64_from_imm64 imm))))(subsume (iconst narrow (imm64_masked narrow imm))))@@ -146,6 +166,11 @@(bxor ty k @ (iconst ty _) x))(bxor ty x k))+(rule (simplify (smin ty k @ (iconst ty _) x)) (smin ty x k))+(rule (simplify (umin ty k @ (iconst ty _) x)) (umin ty x k))+(rule (simplify (smax ty k @ (iconst ty _) x)) (smax ty x k))+(rule (simplify (umax ty k @ (iconst ty _) x)) (umax ty x k))+(rule (simplify(icmp ty cc k @ (iconst _ _) x))(icmp ty (intcc_swap_args cc) x k))@@ -204,6 +229,19 @@(rule (simplify (select ty (iconst_u _ 0) _ y))(subsume y))+(rule (simplify+ (umin ty (umin ty x k1 @ (iconst ty _)) k2 @ (iconst ty _)))+ (umin ty x (umin ty k1 k2)))+(rule (simplify+ (umax ty (umax ty x k1 @ (iconst ty _)) k2 @ (iconst ty _)))+ (umax ty x (umax ty k1 k2)))+(rule (simplify+ (smin ty (smin ty x k1 @ (iconst ty _)) k2 @ (iconst ty _)))+ (smin ty x (smin ty k1 k2)))+(rule (simplify+ (smax ty (smax ty x k1 @ (iconst ty _)) k2 @ (iconst ty _)))+ (smax ty x (smax ty k1 k2)))+;; Reassociate across `==`/`!=` when we can simplify a constant;; `x + K1 == K2` --> `x == K2 - K1`(rule (simplify (eq ty1 (iadd ty2 x k1@(iconst _ _)) k2@(iconst _ _)))diff --git a/cranelift/filetests/filetests/egraph/cprop.clif b/cranelift/filetests/filetests/egraph/cprop.clifindex 2700afb2d8..d8fba887f1 100644--- a/cranelift/filetests/filetests/egraph/cprop.clif+++ b/cranelift/filetests/filetests/egraph/cprop.clif@@ -421,6 +421,54 @@ block0(v0: i32):; nextln: v4 = iadd v0, v3 ; v3 = 1; nextln: return v4+function %smin_const_lhs_reassoc_fold(i32) -> i32 {+block0(v0: i32):+ v1 = iconst.i32 4+ v2 = smin v1, v0+ v3 = iconst.i32 -9+ v4 = smin v3, v2+ return v4+}++; check: v12 = smin v0, v3 ; v3 = -9+; nextln: return v12++function %umin_const_lhs_reassoc_fold(i32) -> i32 {+block0(v0: i32):+ v1 = iconst.i32 13+ v2 = umin v1, v0+ v3 = iconst.i32 7+ v4 = umin v3, v2+ return v4+}++; check: v12 = umin v0, v3 ; v3 = 7+; nextln: return v12++function %smax_const_lhs_reassoc_fold(i32) -> i32 {+block0(v0: i32):+ v1 = iconst.i32 -9+ v2 = smax v1, v0+ v3 = iconst.i32 4+ v4 = smax v3, v2+ return v4+}++; check: v12 = smax v0, v3 ; v3 = 4+; nextln: return v12++function %umax_const_lhs_reassoc_fold(i32) -> i32 {+block0(v0: i32):+ v1 = iconst.i32 7+ v2 = umax v1, v0+ v3 = iconst.i32 13+ v4 = umax v3, v2+ return v4+}++; check: v12 = umax v0, v3 ; v3 = 13+; nextln: return v12+function %bswap_i16() -> i16 {block0:v0 = iconst.i16 0x1234