Skip to content

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

Fix ISLE optimization for vector inputs (#12179)

Alex Crichton05277cf8d1b6
diff --git a/cranelift/codegen/src/opts/selects.isle b/cranelift/codegen/src/opts/selects.isle
index 6ba40558e7..1772adb4f9 100644
--- a/cranelift/codegen/src/opts/selects.isle
+++ b/cranelift/codegen/src/opts/selects.isle
@@ -103,14 +103,14 @@
(rule (simplify (select ty d (select ty d x _) a)) (select ty d x a))
;; min x y < x => false and its commutative versions
-(rule (simplify (sgt ty (smin _ x y) x)) (iconst_u ty 0))
-(rule (simplify (sgt ty (smin _ x y) y)) (iconst_u ty 0))
-(rule (simplify (slt ty x (smin _ x z))) (iconst_u ty 0))
-(rule (simplify (slt ty x (smin _ y x))) (iconst_u ty 0))
-(rule (simplify (ugt ty (umin _ x y) x)) (iconst_u ty 0))
-(rule (simplify (ugt ty (umin _ x y) y)) (iconst_u ty 0))
-(rule (simplify (ult ty x (umin _ x z))) (iconst_u ty 0))
-(rule (simplify (ult ty x (umin _ y x))) (iconst_u ty 0))
+(rule (simplify (sgt (fits_in_64 ty) (smin _ x y) x)) (iconst_u ty 0))
+(rule (simplify (sgt (fits_in_64 ty) (smin _ x y) y)) (iconst_u ty 0))
+(rule (simplify (slt (fits_in_64 ty) x (smin _ x z))) (iconst_u ty 0))
+(rule (simplify (slt (fits_in_64 ty) x (smin _ y x))) (iconst_u ty 0))
+(rule (simplify (ugt (fits_in_64 ty) (umin _ x y) x)) (iconst_u ty 0))
+(rule (simplify (ugt (fits_in_64 ty) (umin _ x y) y)) (iconst_u ty 0))
+(rule (simplify (ult (fits_in_64 ty) x (umin _ x z))) (iconst_u ty 0))
+(rule (simplify (ult (fits_in_64 ty) x (umin _ y x))) (iconst_u ty 0))
diff --git a/tests/misc_testsuite/issue12170.wat b/tests/misc_testsuite/issue12170.wat
new file mode 100644
index 0000000000..23cd2f3523
--- /dev/null
+++ b/tests/misc_testsuite/issue12170.wat
@@ -0,0 +1,13 @@
+(module
+ (func (export "hi") (result v128)
+ (local $i v128)
+ v128.const i64x2 0xfa2675c080000000 0xe8a433230a7479e5
+ local.set $i
+ local.get $i
+ local.get $i
+ local.get $i
+ i32x4.min_s
+ i32x4.lt_s
+ )
+
+)