On Thu, Dec 5, 2024 at 2:25 AM <pan2...@intel.com> wrote:
>
> From: Pan Li <pan2...@intel.com>
>
> This patch would like to refactor the all unsigned SAT_TRUNC patterns,
> aka:
> * Extract type check outside.
> * Re-arrange the related match pattern forms together.
OK.
> The below test suites are passed for this patch.
> * The rv64gcv fully regression test.
> * The x86 bootstrap test.
> * The x86 fully regression test.
>
> gcc/ChangeLog:
>
> * match.pd: Refactor sorts of unsigned SAT_TRUNC match patterns.
>
> Signed-off-by: Pan Li <pan2...@intel.com>
> ---
> gcc/match.pd | 112 ++++++++++++++++++++++++---------------------------
> 1 file changed, 52 insertions(+), 60 deletions(-)
>
> diff --git a/gcc/match.pd b/gcc/match.pd
> index fd1d8bcc776..650c3f4cc1d 100644
> --- a/gcc/match.pd
> +++ b/gcc/match.pd
> @@ -3262,6 +3262,58 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
> }
> (if (wi::eq_p (sum, wi::uhwi (0, precision))))))))
>
> +(if (INTEGRAL_TYPE_P (type) && TYPE_UNSIGNED (type))
> + (match (unsigned_integer_sat_trunc @0)
> + /* SAT_U_TRUNC = (NT)x | (NT)(-(X > (WT)(NT)(-1))) */
> + (bit_ior:c (negate (convert (gt @0 INTEGER_CST@1))) (convert @0))
> + (if (TYPE_UNSIGNED (TREE_TYPE (@0)))
> + (with
> + {
> + unsigned itype_precision = TYPE_PRECISION (TREE_TYPE (@0));
> + unsigned otype_precision = TYPE_PRECISION (type);
> + wide_int trunc_max = wi::mask (otype_precision, false, itype_precision);
> + wide_int int_cst = wi::to_wide (@1, itype_precision);
> + }
> + (if (otype_precision < itype_precision && wi::eq_p (trunc_max,
> int_cst))))))
> + (match (unsigned_integer_sat_trunc @0)
> + /* SAT_U_TRUNC = (NT)(MIN_EXPR (X, IMM))
> + If Op_0 def is MIN_EXPR and not single_use. Aka below pattern:
> +
> + _18 = MIN_EXPR <left_8, 4294967295>; // op_0 def
> + iftmp.0_11 = (unsigned int) _18; // op_0
> + stream.avail_out = iftmp.0_11;
> + left_37 = left_8 - _18; // op_0 use
> +
> + Transfer to .SAT_TRUNC will have MIN_EXPR still live. Then the backend
> + (for example x86/riscv) will have 2-3 more insns generation for
> .SAT_TRUNC
> + besides the MIN_EXPR. Thus, keep the normal truncation as is should be
> + the better choose. */
> + (convert (min@2 @0 INTEGER_CST@1))
> + (if (TYPE_UNSIGNED (TREE_TYPE (@0)) && single_use (@2))
> + (with
> + {
> + unsigned itype_precision = TYPE_PRECISION (TREE_TYPE (@0));
> + unsigned otype_precision = TYPE_PRECISION (type);
> + wide_int trunc_max = wi::mask (otype_precision, false, itype_precision);
> + wide_int int_cst = wi::to_wide (@1, itype_precision);
> + }
> + (if (otype_precision < itype_precision && wi::eq_p (trunc_max,
> int_cst))))))
> + (match (unsigned_integer_sat_trunc @0)
> + /* SAT_U_TRUNC = (NT)X | ((NT)(X <= (WT)-1) + (NT)-1) */
> + (bit_ior:c (plus:c (convert (le @0 INTEGER_CST@1)) INTEGER_CST@2)
> + (convert @0))
> + (if (TYPE_UNSIGNED (TREE_TYPE (@0)))
> + (with
> + {
> + unsigned itype_precision = TYPE_PRECISION (TREE_TYPE (@0));
> + unsigned otype_precision = TYPE_PRECISION (type);
> + wide_int trunc_max = wi::mask (otype_precision, false, itype_precision);
> + wide_int max = wi::mask (otype_precision, false, otype_precision);
> + wide_int int_cst_1 = wi::to_wide (@1);
> + wide_int int_cst_2 = wi::to_wide (@2);
> + }
> + (if (wi::eq_p (trunc_max, int_cst_1) && wi::eq_p (max, int_cst_2)))))))
> +
> /* Signed saturation add, case 1:
> T sum = (T)((UT)X + (UT)Y)
> SAT_S_ADD = (X ^ sum) & !(X ^ Y) < 0 ? (-(T)(X < 0) ^ MAX) : sum;
> @@ -3416,66 +3468,6 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
> @2)
> (if (INTEGRAL_TYPE_P (type) && !TYPE_UNSIGNED (type))))
>
> -/* Unsigned saturation truncate, case 1, sizeof (WT) > sizeof (NT).
> - SAT_U_TRUNC = (NT)x | (NT)(-(X > (WT)(NT)(-1))). */
> -(match (unsigned_integer_sat_trunc @0)
> - (bit_ior:c (negate (convert (gt @0 INTEGER_CST@1)))
> - (convert @0))
> - (if (INTEGRAL_TYPE_P (type) && TYPE_UNSIGNED (type)
> - && TYPE_UNSIGNED (TREE_TYPE (@0)))
> - (with
> - {
> - unsigned itype_precision = TYPE_PRECISION (TREE_TYPE (@0));
> - unsigned otype_precision = TYPE_PRECISION (type);
> - wide_int trunc_max = wi::mask (otype_precision, false, itype_precision);
> - wide_int int_cst = wi::to_wide (@1, itype_precision);
> - }
> - (if (otype_precision < itype_precision && wi::eq_p (trunc_max,
> int_cst))))))
> -
> -/* Unsigned saturation truncate, case 2, sizeof (WT) > sizeof (NT).
> - SAT_U_TRUNC = (NT)(MIN_EXPR (X, 255)). */
> -/* If Op_0 def is MIN_EXPR and not single_use. Aka below pattern:
> -
> - _18 = MIN_EXPR <left_8, 4294967295>; // op_0 def
> - iftmp.0_11 = (unsigned int) _18; // op_0
> - stream.avail_out = iftmp.0_11;
> - left_37 = left_8 - _18; // op_0 use
> -
> - Transfer to .SAT_TRUNC will have MIN_EXPR still live. Then the backend
> - (for example x86/riscv) will have 2-3 more insns generation for .SAT_TRUNC
> - besides the MIN_EXPR. Thus, keep the normal truncation as is should be
> - the better choose. */
> -(match (unsigned_integer_sat_trunc @0)
> - (convert (min@2 @0 INTEGER_CST@1))
> - (if (INTEGRAL_TYPE_P (type) && TYPE_UNSIGNED (type)
> - && TYPE_UNSIGNED (TREE_TYPE (@0)) && single_use (@2))
> - (with
> - {
> - unsigned itype_precision = TYPE_PRECISION (TREE_TYPE (@0));
> - unsigned otype_precision = TYPE_PRECISION (type);
> - wide_int trunc_max = wi::mask (otype_precision, false, itype_precision);
> - wide_int int_cst = wi::to_wide (@1, itype_precision);
> - }
> - (if (otype_precision < itype_precision && wi::eq_p (trunc_max,
> int_cst))))))
> -
> -/* Unsigned saturation truncate, case 3, sizeof (WT) > sizeof (NT).
> - SAT_U_TRUNC = (NT)X | ((NT)(X <= (WT)-1) + (NT)-1). */
> -(match (unsigned_integer_sat_trunc @0)
> - (bit_ior:c (plus:c (convert (le @0 INTEGER_CST@1)) INTEGER_CST@2)
> - (convert @0))
> - (if (INTEGRAL_TYPE_P (type) && TYPE_UNSIGNED (type)
> - && TYPE_UNSIGNED (TREE_TYPE (@0)))
> - (with
> - {
> - unsigned itype_precision = TYPE_PRECISION (TREE_TYPE (@0));
> - unsigned otype_precision = TYPE_PRECISION (type);
> - wide_int trunc_max = wi::mask (otype_precision, false, itype_precision);
> - wide_int max = wi::mask (otype_precision, false, otype_precision);
> - wide_int int_cst_1 = wi::to_wide (@1);
> - wide_int int_cst_2 = wi::to_wide (@2);
> - }
> - (if (wi::eq_p (trunc_max, int_cst_1) && wi::eq_p (max, int_cst_2))))))
> -
> /* Signed saturation truncate, case 1 and case 2, sizeof (WT) > sizeof (NT).
> SAT_S_TRUNC(X) = (unsigned)X + NT_MAX + 1 > Unsigned_MAX ? (NT)X. */
> (match (signed_integer_sat_trunc @0)
> --
> 2.43.0
>
