[RuleSet] fix Hydra division lowering

Author: bongjunj

cranelift/codegen/src/opts/hydra.isle

@@ -553,10 +553,6 @@
     (simplify (ushr ty (bxor ty x (iconst_u ty c1)) (iconst_u ty c2)))
     (bxor ty (ushr ty (iconst_u ty c1) (iconst_u ty c2)) (ushr ty x (iconst_u ty c2)))
 )
-(rule
-    (simplify (ushr ty (ushr ty (iconst_u ty c1) x) (iconst_u ty c2)))
-    (ushr ty (udiv (iconst_u ty c1) (ishl ty (iconst_u ty 1) (iconst_u ty c2))) x)
-)
 (rule (simplify (band ty (band ty x y) x)) (band ty x y))
 (rule (simplify (band ty (band ty y x) x)) (band ty x y))
 (rule (simplify (band ty (iconst_u ty 1) (ushr ty (iconst_u ty 1) x))) (ushr ty (iconst_u ty 1) x))
@@ -714,24 +710,20 @@
 (rule (simplify (isub ty x (isub ty y z))) (iadd ty x (isub ty z y)))
 (rule (simplify (isub ty x x)) (iconst_u ty 0))
 (rule (simplify (isub ty x y)) (bxor ty y x))
-(rule (simplify (select ty (eq cty (iconst_u ty 1) x) (udiv y x) z)) (select ty (eq cty x (iconst_u ty 1)) y z))
 (rule (simplify (select ty (eq cty (iconst_u ty c1) x) (iconst_u ty 0) (isub ty (iconst_u ty c1) x))) (isub ty (iconst_u ty c1) x))
 (rule (simplify (select ty (eq cty (iconst_u ty c1) x) (imul ty x y) z)) (select ty (eq cty (iconst_u ty c1) x) (imul ty (iconst_u ty c1) y) z))
 (rule (simplify (select ty (eq cty (iconst_u ty c1) x) (imul ty y x) z)) (select ty (eq cty (iconst_u ty c1) x) (imul ty (iconst_u ty c1) y) z))
 (rule (simplify (select ty (eq cty (iconst_u ty c1) x) (ushr ty y x) z)) (select ty (eq cty (iconst_u ty c1) x) (ushr ty y (iconst_u ty c1)) z))
-(rule (simplify (select ty (eq cty x (iconst_u ty 1)) (udiv y x) z)) (select ty (eq cty x (iconst_u ty 1)) y z))
 (rule (simplify (select ty (eq cty x (iconst_u ty c1)) (iconst_u ty 0) (isub ty (iconst_u ty c1) x))) (isub ty (iconst_u ty c1) x))
 (rule (simplify (select ty (eq cty x (iconst_u ty c1)) (imul ty x y) z)) (select ty (eq cty (iconst_u ty c1) x) (imul ty (iconst_u ty c1) y) z))
 (rule (simplify (select ty (eq cty x (iconst_u ty c1)) (imul ty y x) z)) (select ty (eq cty (iconst_u ty c1) x) (imul ty (iconst_u ty c1) y) z))
 (rule (simplify (select ty (eq cty x (iconst_u ty c1)) (ushr ty y x) z)) (select ty (eq cty (iconst_u ty c1) x) (ushr ty y (iconst_u ty c1)) z))
 (rule (simplify (select ty (eq cty x y) (isub ty y x) z)) (select ty (eq cty x y) (iconst_u ty 0) z))
 (rule (simplify (select ty (eq cty y x) (isub ty y x) z)) (select ty (eq cty x y) (iconst_u ty 0) z))
-(rule (simplify (select ty (ne cty (iconst_u ty 1) x) z (udiv y x))) (select ty (eq cty x (iconst_u ty 1)) y z))
 (rule (simplify (select ty (ne cty (iconst_u ty c1) x) (isub ty (iconst_u ty c1) x) (iconst_u ty 0))) (isub ty (iconst_u ty c1) x))
 (rule (simplify (select ty (ne cty (iconst_u ty c1) x) z (imul ty x y))) (select ty (eq cty (iconst_u ty c1) x) (imul ty (iconst_u ty c1) y) z))
 (rule (simplify (select ty (ne cty (iconst_u ty c1) x) z (imul ty y x))) (select ty (eq cty (iconst_u ty c1) x) (imul ty (iconst_u ty c1) y) z))
 (rule (simplify (select ty (ne cty (iconst_u ty c1) x) z (ushr ty y x))) (select ty (eq cty (iconst_u ty c1) x) (ushr ty y (iconst_u ty c1)) z))
-(rule (simplify (select ty (ne cty x (iconst_u ty 1)) z (udiv y x))) (select ty (eq cty x (iconst_u ty 1)) y z))
 (rule (simplify (select ty (ne cty x (iconst_u ty c1)) (isub ty (iconst_u ty c1) x) (iconst_u ty 0))) (isub ty (iconst_u ty c1) x))
 (rule (simplify (select ty (ne cty x (iconst_u ty c1)) z (imul ty x y))) (select ty (eq cty (iconst_u ty c1) x) (imul ty (iconst_u ty c1) y) z))
 (rule (simplify (select ty (ne cty x (iconst_u ty c1)) z (imul ty y x))) (select ty (eq cty (iconst_u ty c1) x) (imul ty (iconst_u ty c1) y) z))
@@ -770,10 +762,7 @@
 (rule (simplify (slt cty x (select ty (sle cty y x) y x))) (iconst_u ty 0))
 (rule (simplify (slt cty x (select ty (slt cty x y) x y))) (iconst_u ty 0))
 (rule (simplify (slt cty x (select ty (slt cty x y) y x))) (slt cty x y))
-(rule (simplify (udiv x (band ty (ishl ty (iconst_u ty 1) z) y))) (ushr ty x z))
-(rule (simplify (udiv x (band ty y (ishl ty (iconst_u ty 1) z)))) (ushr ty x z))
 (rule (simplify (ugt cty (iconst_u ty 1) (ishl ty (iconst_u ty 1) x))) (iconst_u ty 0))
-(rule (simplify (ugt cty (iconst_u ty c1) (udiv (iconst_u ty c1) x))) (if-let true (u64_is_power_of_two c1)) (ult cty (iconst_u ty 1) x))
 (rule (simplify (ugt cty x (select ty (uge cty x y) y x))) (ult cty y x))
 (rule (simplify (ugt cty x (select ty (ugt cty y x) x y))) (ult cty y x))
 (rule (simplify (ugt cty x (select ty (ule cty y x) y x))) (ult cty y x))
@@ -783,6 +772,7 @@
 (rule (simplify (ult cty (select ty (ugt cty y x) x y) x)) (ult cty y x))
 (rule (simplify (ult cty (select ty (ule cty y x) y x) x)) (ult cty y x))
 (rule (simplify (ult cty (select ty (ult cty x y) x y) x)) (ult cty y x))
-(rule (simplify (ult cty (udiv (iconst_u ty c1) x) (iconst_u ty c1))) (if-let true (u64_is_power_of_two c1)) (ult cty (iconst_u ty 1) x))
 (rule (simplify (ushr ty (band ty (ishl ty y z) x) z)) (band ty y (ushr ty x z)))
 (rule (simplify (ushr ty (band ty x (ishl ty y z)) z)) (band ty y (ushr ty x z)))
+(rule (simplify_skeleton (udiv x (band ty (ishl ty (iconst_u ty 1) z) y))) (ushr ty x z))
+(rule (simplify_skeleton (udiv x (band ty y (ishl ty (iconst_u ty 1) z)))) (ushr ty x z))