tree-optimization/115723 - ICE with .COND_ADD reduction
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_gcc_build--master-arm |
success
|
Build passed
|
linaro-tcwg-bot/tcwg_gcc_check--master-arm |
success
|
Test passed
|
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 |
warning
|
Patch is already merged
|
Commit Message
The following fixes an ICE with a .COND_ADD discovered as reduction
even though its else value isn't the reduction chain link but a
constant. This would be wrong-code with --disable-checking I think.
Bootstrap and regtest running on x86_64-unknown-linux-gnu.
PR tree-optimization/115723
* tree-vect-loop.cc (check_reduction_path): For a .COND_ADD
verify the else value also refers to the reduction chain op.
* gcc.dg/vect/pr115723.c: New testcase.
---
gcc/testsuite/gcc.dg/vect/pr115723.c | 25 +++++++++++++++++++++++++
gcc/tree-vect-loop.cc | 12 ++++++++----
2 files changed, 33 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/vect/pr115723.c
new file mode 100644
@@ -0,0 +1,25 @@
+/* { dg-additional-options "-ffast-math -fno-unsafe-math-optimizations" } */
+
+#include "tree-vect.h"
+
+double __attribute__((noipa))
+foo (double *x, double *y, int n)
+{
+ double res = 0.;
+ for (int i = 0; i < n; ++i)
+ if (y[i] > 0.)
+ res += x[i];
+ else
+ res = 64.;
+ return res;
+}
+
+double y[16] = { 1., 1., 1., 1., 0., 1., 1., 1.,
+ 1., 1., 1., 1., 1., 1., 1., 1. };
+int main ()
+{
+ check_vect ();
+ if (foo (y, y, 16) != 64. + 11.)
+ abort ();
+ return 0;
+}
@@ -4163,15 +4163,19 @@ pop:
FOR_EACH_IMM_USE_STMT (op_use_stmt, imm_iter, op.ops[opi])
{
- /* In case of a COND_OP (mask, op1, op2, op1) reduction we might have
- op1 twice (once as definition, once as else) in the same operation.
- Allow this. */
+ /* In case of a COND_OP (mask, op1, op2, op1) reduction we should
+ have op1 twice (once as definition, once as else) in the same
+ operation. Enforce this. */
if (cond_fn_p && op_use_stmt == use_stmt)
{
gcall *call = as_a<gcall *> (use_stmt);
unsigned else_pos
= internal_fn_else_index (internal_fn (op.code));
-
+ if (gimple_call_arg (call, else_pos) != op.ops[opi])
+ {
+ fail = true;
+ break;
+ }
for (unsigned int j = 0; j < gimple_call_num_args (call); ++j)
{
if (j == else_pos)