diff --git a/gcc/match.pd b/gcc/match.pd index e3dcff5c29c..59548286555 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -930,12 +930,12 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (if (INTEGRAL_TYPE_P (TREE_TYPE (@0)) && TYPE_UNSIGNED (TREE_TYPE (@0))) (bit_and @0 (negate @1)))) -/* Simplify (t * 2) / 2) -> t. */ (for div (trunc_div ceil_div floor_div round_div exact_div) + /* Simplify (t * u) / u -> t. */ (simplify (div (mult:c @0 @1) @1) (if (ANY_INTEGRAL_TYPE_P (type)) - (if (TYPE_OVERFLOW_UNDEFINED (type)) + (if (TYPE_OVERFLOW_UNDEFINED (type) && !TYPE_OVERFLOW_SANITIZED (type)) @0 #if GIMPLE (with {value_range vr0, vr1;} @@ -945,7 +945,23 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) && range_op_handler (MULT_EXPR).overflow_free_p (vr0, vr1)) @0)) #endif - )))) + ))) +#if GIMPLE + /* Simplify (t * u) / v -> t * (u / v) if u is multiple of v. */ + (simplify + (div (mult @0 INTEGER_CST@1) INTEGER_CST@2) + (if (INTEGRAL_TYPE_P (type) + && wi::multiple_of_p (wi::to_widest (@1), wi::to_widest (@2), SIGNED)) + (if (TYPE_OVERFLOW_UNDEFINED (type) && !TYPE_OVERFLOW_SANITIZED (type)) + (mult @0 (div! @1 @2)) + (with {value_range vr0, vr1;} + (if (get_range_query (cfun)->range_of_expr (vr0, @0) + && get_range_query (cfun)->range_of_expr (vr1, @1) + && range_op_handler (MULT_EXPR).overflow_free_p (vr0, vr1)) + (mult @0 (div! @1 @2)))) + ))) +#endif +) #if GIMPLE (for div (trunc_div exact_div) diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr112994-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr112994-1.c new file mode 100644 index 00000000000..e48d5496073 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr112994-1.c @@ -0,0 +1,13 @@ +/* PR tree-optimization/112994 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* { dg-final { scan-tree-dump-not " / \\\[2389-\\\]" "optimized" } } */ + +int f1 (int x) { return (x * 4) / 2; } +int f2 (int x) { return (x * 56) / 8; } +int f3 (int x) { return (x * 56) / -8; } +int f4 (int x) { int y = x * 4; return y / 2; } +int f5 (int x) { int y = x * 56; return y / 8; } +int f6 (int x) { int y = x * 56; return y / -8; } +unsigned f7 (unsigned x) { if (x > ~0U / 6) __builtin_unreachable (); unsigned y = x * 6; return y / 3; } +unsigned f8 (unsigned x) { if (x > ~0U / 63) __builtin_unreachable (); unsigned y = x * 63; return y / 9; }