Match: Add form 5 of unsigned SAT_MUL for widen-mul

This patch would like to try to match the the unsigned
SAT_MUL form 4, aka below:

  #define DEF_SAT_U_MUL_FMT_5(NT, WT)             \
  NT __attribute__((noinline))                    \
  sat_u_mul_##NT##_from_##WT##_fmt_5 (NT a, NT b) \
  {                                               \
    WT x = (WT)a * (WT)b;                         \
    NT hi = x >> (sizeof(NT) * 8);                \
    NT lo = (NT)x;                                \
    return lo | -!!hi;                            \
  }

  while WT is uint128_t, T is uint8_t, uint16_t, uint32_t or uint64_t.

gcc/ChangeLog:

	* match.pd: Add pattern for SAT_MUL form 5.
	* tree-ssa-math-opts.cc (math_opts_dom_walker::after_dom_children):
	Try match pattern for IOR.

Signed-off-by: Pan Li <pan2.li@intel.com>

diff --git a/gcc/match.pd b/gcc/match.pd
index 53320d7614cebfb043fe60523ddc8ebb8d41ae19..2e629fd31ceaec3369b81136b7739ec0c72105ff 100644 (file)
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -3695,6 +3695,31 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
       bool c2_is_type_precision_p = c2 == prec;
      }
      (if (widen_prec > prec && c2_is_type_precision_p && c4_is_max_p)))))
+  (match (unsigned_integer_sat_mul @0 @1)
+   /* SAT_U_MUL (X, Y) = {
+       WT x = (WT)a * (WT)b;
+       NT hi = x >> (sizeof(NT) * 8);
+       NT lo = (NT)x;
+       return lo | -!!hi;
+      } while WT is uint128_t, T is uint8_t, uint16_t, uint32_t or uint64_t.  */
+   (convert1?
+    (bit_ior (convert? (negate (convert (ne (convert (rshift @3 INTEGER_CST@2))
+                                           integer_zerop))))
+            (convert (widen_mult:c@3 (convert@4 @0)
+                                     (convert@5 @1)))))
+   (if (types_match (type, @0, @1))
+    (with
+     {
+      unsigned widen_prec = TYPE_PRECISION (TREE_TYPE (@3));
+      unsigned cvt4_prec = TYPE_PRECISION (TREE_TYPE (@4));
+      unsigned cvt5_prec = TYPE_PRECISION (TREE_TYPE (@5));
+      bool widen_mult_p = cvt4_prec == cvt5_prec && widen_prec == cvt5_prec * 2;
+
+      unsigned c2 = tree_to_uhwi (@2);
+      unsigned prec = TYPE_PRECISION (type);
+      bool c2_is_type_precision_p = c2 == prec;
+     }
+     (if (widen_mult_p && c2_is_type_precision_p)))))
 )
 
 /* The boundary condition for case 10: IMM = 1:

diff --git a/gcc/tree-ssa-math-opts.cc b/gcc/tree-ssa-math-opts.cc
index 6fafa1b4096352ad81a6dd57703ec0272f90c6ef..344ffddd3859816c02f46781b3740ebf0c0f2758 100644 (file)
--- a/gcc/tree-ssa-math-opts.cc
+++ b/gcc/tree-ssa-math-opts.cc
@@ -6529,6 +6529,7 @@ math_opts_dom_walker::after_dom_children (basic_block bb)
              break;
 
            case BIT_IOR_EXPR:
+             match_unsigned_saturation_mul (&gsi, as_a<gassign *> (stmt));
              match_saturation_add_with_assign (&gsi, as_a<gassign *> (stmt));
              match_unsigned_saturation_trunc (&gsi, as_a<gassign *> (stmt));
              /* fall-through  */