diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-2.c | 23 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-3.c | 25 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-4.c | 23 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-5.c | 24 | ||||
| -rw-r--r-- | gcc/tree-vect-loop.c | 35 |
7 files changed, 145 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 63779d3..c5515e4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,13 @@ 2018-08-22 Richard Sandiford <richard.sandiford@arm.com> PR tree-optimization/86725 + * tree-vect-loop.c (vect_inner_phi_in_double_reduction_p): New + function. + (vect_analyze_scalar_cycles_1): Check it. + +2018-08-22 Richard Sandiford <richard.sandiford@arm.com> + + PR tree-optimization/86725 * tree-vect-loop.c (vect_is_simple_reduction): When treating an outer loop phi as a double reduction, make sure that the single user of the phi result is an inner loop phi. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3117afa..55312e8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,14 @@ 2018-08-22 Richard Sandiford <richard.sandiford@arm.com> PR tree-optimization/86725 + * gcc.dg/vect/no-scevccp-pr86725-2.c: New test. + * gcc.dg/vect/no-scevccp-pr86725-3.c: Likewise. + * gcc.dg/vect/no-scevccp-pr86725-4.c: Likewise. + * gcc.dg/vect/no-scevccp-pr86725-5.c: Likewise. + +2018-08-22 Richard Sandiford <richard.sandiford@arm.com> + + PR tree-optimization/86725 * gcc.dg/vect/no-scevccp-pr86725-1.c: New test. 2018-08-22 Richard Sandiford <richard.sandiford@arm.com> diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-2.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-2.c new file mode 100644 index 0000000..b208c1a --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-2.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-O -w" } */ + +int +nr (int xe) +{ + int oo, wo = 0; + + for (oo = 0; oo < 4; ++oo) + { + int qq; + + for (qq = 0; qq < 2; ++qq) + { + wo += 0x80000000; + xe += wo; + } + } + return xe; +} + +/* { dg-final { scan-tree-dump "reduction used in loop" "vect" { target vect_int } } } */ +/* { dg-final { scan-tree-dump-not "OUTER LOOP VECTORIZED" "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-3.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-3.c new file mode 100644 index 0000000..590c744 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-3.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-O -w" } */ + +int foo; +int +nr (int xe) +{ + int oo, wo = 0; + + for (oo = 0; oo < 4; ++oo) + { + int qq; + + for (qq = 0; qq < 2; ++qq) + { + wo += 0x80000000; + xe += wo; + } + } + foo = wo; + return xe; +} + +/* { dg-final { scan-tree-dump "reduction used in loop" "vect" { target vect_int } } } */ +/* { dg-final { scan-tree-dump-not "OUTER LOOP VECTORIZED" "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-4.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-4.c new file mode 100644 index 0000000..d995c9b --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-4.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-O -w" } */ + +int +nr (unsigned int xe, unsigned int qqn) +{ + unsigned int oo, wo = 0; + + for (oo = 0; oo < 4; ++oo) + { + unsigned int qq = qqn; + do + { + wo += 1; + xe += wo; + } + while (qq-- > 0); + } + return xe; +} + +/* { dg-final { scan-tree-dump "reduction used in loop" "vect" { target vect_int } } } */ +/* { dg-final { scan-tree-dump-not "OUTER LOOP VECTORIZED" "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-5.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-5.c new file mode 100644 index 0000000..6e7c9d8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-5.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-O -w" } */ + +unsigned int foo; +int +nr (unsigned int xe, unsigned int qqn) +{ + unsigned int oo, wo = 0; + + for (oo = 0; oo < 4; ++oo) + { + unsigned int qq = qqn; + do + { + wo += 1; + xe += qq; + } + while (qq-- > 0); + } + foo = wo; + return xe; +} + +/* { dg-final { scan-tree-dump "OUTER LOOP VECTORIZED" "vect" { target vect_int } } } */ diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index f21d995..d5e3552 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -462,6 +462,40 @@ vect_is_simple_iv_evolution (unsigned loop_nb, tree access_fn, tree * init, return true; } +/* Return true if PHI, described by STMT_INFO, is the inner PHI in + what we are assuming is a double reduction. For example, given + a structure like this: + + outer1: + x_1 = PHI <x_4(outer2), ...>; + ... + + inner: + x_2 = PHI <x_1(outer1), ...>; + ... + x_3 = ...; + ... + + outer2: + x_4 = PHI <x_3(inner)>; + ... + + outer loop analysis would treat x_1 as a double reduction phi and + this function would then return true for x_2. */ + +static bool +vect_inner_phi_in_double_reduction_p (stmt_vec_info stmt_info, gphi *phi) +{ + loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info); + use_operand_p use_p; + ssa_op_iter op_iter; + FOR_EACH_PHI_ARG (use_p, phi, op_iter, SSA_OP_USE) + if (stmt_vec_info def_info = loop_vinfo->lookup_def (USE_FROM_PTR (use_p))) + if (STMT_VINFO_DEF_TYPE (def_info) == vect_double_reduction_def) + return true; + return false; +} + /* Function vect_analyze_scalar_cycles_1. Examine the cross iteration def-use cycles of scalar variables @@ -522,6 +556,7 @@ vect_analyze_scalar_cycles_1 (loop_vec_info loop_vinfo, struct loop *loop) } if (!access_fn + || vect_inner_phi_in_double_reduction_p (stmt_vinfo, phi) || !vect_is_simple_iv_evolution (loop->num, access_fn, &init, &step) || (LOOP_VINFO_LOOP (loop_vinfo) != loop && TREE_CODE (step) != INTEGER_CST)) |