Fix panic optimizing vector expressions (#12957)

This commit fixes an accidental regression from #12926 where `iconst_u`
was called with vector types which caused a panic. The fix is is to
disallow vector types in these ISLE rules and defer vector optimizations
to a future commit.

Author: alexcrichton

cranelift/codegen/src/opts/arithmetic.isle

@@ -380,11 +380,11 @@
 (rule (simplify (iadd ty (iadd ty (isub ty z x) y) x)) (iadd ty y z))
 
 ;; (x + y) == (y + x) --> true
-(rule (simplify (eq ty (iadd cty x y) (iadd cty y x))) (iconst_u ty 1))
-(rule (simplify (eq ty (iadd cty y x) (iadd cty x y))) (iconst_u ty 1))
-(rule (simplify (eq ty (iadd cty x y) (iadd cty x y))) (iconst_u ty 1))
-(rule (simplify (eq ty (iadd cty y x) (iadd cty y x))) (iconst_u ty 1))
+(rule (simplify (eq (ty_int ty) (iadd cty x y) (iadd cty y x))) (iconst_u ty 1))
+(rule (simplify (eq (ty_int ty) (iadd cty y x) (iadd cty x y))) (iconst_u ty 1))
+(rule (simplify (eq (ty_int ty) (iadd cty x y) (iadd cty x y))) (iconst_u ty 1))
+(rule (simplify (eq (ty_int ty) (iadd cty y x) (iadd cty y x))) (iconst_u ty 1))
 
 ;; (x - y) != x --> y != 0
 (rule (simplify (ne cty (isub ty x y) x)) (ne cty y (iconst_u ty 0)))
-(rule (simplify (ne cty x (isub ty x y))) (ne cty y (iconst_u ty 0)))
+(rule (simplify (ne cty x (isub ty x y))) (ne cty y (iconst_u ty 0)))

cranelift/filetests/filetests/egraph/arithmetic-precise.clif

@@ -234,6 +234,21 @@ block0(v0: i32, v1: i32):
 ;     return v5  ; v5 = 1
 ; }
 
+;; (eq ty (iadd cty x y) (iadd cty y x)) -> 1
+function %simplify_vector_icmp_eq_iadd_commute(i32x4, i32x4) -> i32x4 fast {
+block0(v0: i32x4, v1: i32x4):
+    v2 = iadd v0, v1
+    v3 = iadd v1, v0
+    v4 = icmp eq v2, v3
+    return v4
+}
+
+; function %simplify_vector_icmp_eq_iadd_commute(i32x4, i32x4) -> i32x4 fast {
+; block0(v0: i32x4, v1: i32x4):
+;     v5 = icmp eq v0, v0
+;     return v5
+; }
+
 ;; (x - y) != x --> y != 0
 function %simplify_icmp_ne_isub_x(i32, i32) -> i8 fast {
 block0(v0: i32, v1: i32):
@@ -247,4 +262,4 @@ block0(v0: i32, v1: i32):
 ;     v4 = iconst.i32 0
 ;     v5 = icmp ne v1, v4  ; v4 = 0
 ;     return v5
-; }
+; }