Skip to content

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

[Cranelift] `x < y ^^ x > y => x != y` (#11999)

Bongjun Jangd861f5f41f58
diff --git a/cranelift/codegen/src/opts/icmp.isle b/cranelift/codegen/src/opts/icmp.isle
index ceeb5adfb1..d007831886 100644
--- a/cranelift/codegen/src/opts/icmp.isle
+++ b/cranelift/codegen/src/opts/icmp.isle
@@ -302,3 +302,8 @@
(rule (simplify (ult cty (bnot ty x) (bnot ty y))) (ugt cty x y))
(rule (simplify (slt cty (bnot ty x) (bnot ty y))) (sgt cty x y))
+
+;; a < b ^^ a > b => (a ≠ b)
+(rule (simplify (bxor ty (slt cty x y) (sgt cty x y))) (ne cty x y))
+(rule (simplify (bxor ty (ult cty x y) (ugt cty x y))) (ne cty x y))
+
diff --git a/cranelift/filetests/filetests/egraph/icmp.clif b/cranelift/filetests/filetests/egraph/icmp.clif
index 27db9ff1b6..10e0caf5c3 100644
--- a/cranelift/filetests/filetests/egraph/icmp.clif
+++ b/cranelift/filetests/filetests/egraph/icmp.clif
@@ -280,3 +280,34 @@ block0(v0: i64, v1: i64):
; v7 = icmp ugt v0, v1
; return v7
; }
+
+;; (bxor ty (slt cty x y) (sgt cty x y)) -> (ne cty x y)
+function %test_bxor_slt_sgt(i32, i32) -> i8 fast {
+block0(v0: i32, v1: i32):
+ v2 = icmp slt v0, v1
+ v3 = icmp sgt v0, v1
+ v4 = bxor v2, v3
+ return v4
+}
+
+; function %test_bxor_slt_sgt(i32, i32) -> i8 fast {
+; block0(v0: i32, v1: i32):
+; v5 = icmp ne v0, v1
+; return v5
+; }
+
+;; (bxor ty (ult cty x y) (ugt cty x y)) -> (ne cty x y)
+function %test_bxor_ult_ugt(i32, i32) -> i8 fast {
+block0(v0: i32, v1: i32):
+ v2 = icmp ult v0, v1
+ v3 = icmp ugt v0, v1
+ v4 = bxor v2, v3
+ return v4
+}
+
+; function %test_bxor_ult_ugt(i32, i32) -> i8 fast {
+; block0(v0: i32, v1: i32):
+; v5 = icmp ne v0, v1
+; return v5
+; }
+
diff --git a/cranelift/filetests/filetests/runtests/icmp.clif b/cranelift/filetests/filetests/runtests/icmp.clif
index fbcae5e674..7e69545cca 100644
--- a/cranelift/filetests/filetests/runtests/icmp.clif
+++ b/cranelift/filetests/filetests/runtests/icmp.clif
@@ -65,3 +65,27 @@ block0(v0: i8, v2: i8):
; run: %fold_cmp_over_nots2(2, 1) == 1
+;; (bxor ty (slt cty x y) (sgt cty x y)) -> (ne cty x y)
+function %test_bxor_slt_sgt(i32, i32) -> i8 fast {
+block0(v0: i32, v1: i32):
+ v2 = icmp slt v0, v1
+ v3 = icmp sgt v0, v1
+ v4 = bxor v2, v3
+ return v4
+}
+
+; run: %test_bxor_slt_sgt(1, 1) == 0
+; run: %test_bxor_slt_sgt(1, 3) == 1
+
+;; (bxor ty (ult cty x y) (ugt cty x y)) -> (ne cty x y)
+function %test_bxor_ult_ugt(i32, i32) -> i8 fast {
+block0(v0: i32, v1: i32):
+ v2 = icmp ult v0, v1
+ v3 = icmp ugt v0, v1
+ v4 = bxor v2, v3
+ return v4
+}
+
+; run: %test_bxor_ult_ugt(1, 1) == 0
+; run: %test_bxor_ult_ugt(1, 3) == 1
+