Skip to content

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

[Cranelift] `(x < y) ? x : y != x --> x > y` (#11523)

Bongjun Jang18f3bafb37a2
diff --git a/cranelift/codegen/src/opts/icmp.isle b/cranelift/codegen/src/opts/icmp.isle
index cd26775470..0714a52717 100644
--- a/cranelift/codegen/src/opts/icmp.isle
+++ b/cranelift/codegen/src/opts/icmp.isle
@@ -294,3 +294,7 @@
; (x - y) > x == y > x
(rule (simplify (ugt cty (isub ty x y) x)) (ugt cty y x))
(rule (simplify (ule cty (isub ty x y) x)) (ule cty y x))
+
+;; (x < y) ? x : y != x == x > y, for both signed and unsigned.
+(rule (simplify (ne cty (select ty (slt cty x y) x y) x)) (sgt cty x y))
+(rule (simplify (ne cty (select ty (ult cty x y) x y) x)) (ugt cty x y))
diff --git a/cranelift/filetests/filetests/egraph/icmp.clif b/cranelift/filetests/filetests/egraph/icmp.clif
index cf4825176d..27db9ff1b6 100644
--- a/cranelift/filetests/filetests/egraph/icmp.clif
+++ b/cranelift/filetests/filetests/egraph/icmp.clif
@@ -249,4 +249,34 @@ block0(v0: i32, v1: i32):
; block0(v0: i32, v1: i32):
; v4 = icmp ule v1, v0
; return v4
-; }
\ No newline at end of file
+; }
+
+;; (ne cty (select ty (slt cty x y) x y) x) -> (sgt cty x y)
+function %simplify_select_slt_ne_i32(i32, i32) -> i8 fast {
+block0(v0: i32, v1: i32):
+ v2 = icmp slt v0, v1
+ v3 = select v2, v0, v1
+ v4 = icmp ne v3, v0
+ return v4
+}
+
+; function %simplify_select_slt_ne_i32(i32, i32) -> i8 fast {
+; block0(v0: i32, v1: i32):
+; v7 = icmp sgt v0, v1
+; return v7
+; }
+
+;; (ne cty (select ty (ult cty x y) x y) x) -> (ugt cty x y)
+function %simplify_select_ult_ne_i64(i64, i64) -> i8 fast {
+block0(v0: i64, v1: i64):
+ v2 = icmp ult v0, v1
+ v3 = select v2, v0, v1
+ v4 = icmp ne v3, v0
+ return v4
+}
+
+; function %simplify_select_ult_ne_i64(i64, i64) -> i8 fast {
+; block0(v0: i64, v1: i64):
+; v7 = icmp ugt v0, v1
+; return v7
+; }
diff --git a/cranelift/filetests/filetests/runtests/select.clif b/cranelift/filetests/filetests/runtests/select.clif
index 05b203ad83..d05a215479 100644
--- a/cranelift/filetests/filetests/runtests/select.clif
+++ b/cranelift/filetests/filetests/runtests/select.clif
@@ -413,3 +413,31 @@ block0(v0: i8):
; run: %simplify_iadd_select_const_i32(0) == 13
; run: %simplify_iadd_select_const_i32(1) == 8
+
+;; should be optimized to x > y
+function %simplify_select_slt_ne_i32(i32, i32) -> i8 fast {
+block0(v0: i32, v1: i32):
+ v2 = icmp slt v0, v1
+ v3 = select v2, v0, v1
+ v4 = icmp ne v3, v0
+ return v4
+}
+
+; run: %simplify_select_slt_ne_i32(92, 42) == 1
+; run: %simplify_select_slt_ne_i32(7, -8) == 1
+; run: %simplify_select_slt_ne_i32(-79, 42) == 0
+; run: %simplify_select_slt_ne_i32(-1111111, 42) == 0
+
+;; should be optimized to x > y (unsigned)
+function %simplify_select_ult_ne_i64(i64, i64) -> i8 fast {
+block0(v0: i64, v1: i64):
+ v2 = icmp ult v0, v1
+ v3 = select v2, v0, v1
+ v4 = icmp ne v3, v0
+ return v4
+}
+
+; run: %simplify_select_ult_ne_i64(8, 42) == 0
+; run: %simplify_select_ult_ne_i64(7, 9) == 0
+; run: %simplify_select_ult_ne_i64(3, 1) == 1
+; run: %simplify_select_ult_ne_i64(-1, 42) == 1