From a265c9a929b4ca727e9b0c93eb98e15244f2735c Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 8 Apr 2019 13:54:02 +0000 Subject: [PATCH] re PR tree-optimization/90006 (gcc loops indefinitely around vect_get_constant_vectors on -O2 -ftree-slp-vectorize -fno-math-errno) 2019-04-08 Richard Biener PR tree-optimization/90006 * tree-vect-data-refs.c (vect_get_smallest_scalar_type): Handle calls like lrint. * gcc.dg/vect/bb-slp-pr90006.c: New testcase. From-SVN: r270210 --- gcc/ChangeLog | 6 +++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gcc.dg/vect/bb-slp-pr90006.c | 31 ++++++++++++++++++++++ gcc/tree-vect-data-refs.c | 9 +++++++ 4 files changed, 51 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/vect/bb-slp-pr90006.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 51fc0bf9d50..845f21e7f3b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-04-08 Richard Biener + + PR tree-optimization/90006 + * tree-vect-data-refs.c (vect_get_smallest_scalar_type): Handle + calls like lrint. + 2019-04-08 Andrea Corallo PR target/83033 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9b7b08d0e0e..038a431317c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-04-08 Richard Biener + + PR tree-optimization/90006 + * gcc.dg/vect/bb-slp-pr90006.c: New testcase. + 2019-04-08 Jakub Jelinek PR rtl-optimization/89865 diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-pr90006.c b/gcc/testsuite/gcc.dg/vect/bb-slp-pr90006.c new file mode 100644 index 00000000000..104d3fb89b0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/bb-slp-pr90006.c @@ -0,0 +1,31 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fno-math-errno" } */ +/* { dg-additional-options "-march=x86-64" { target x86_64-*-* i?86-*-* } } */ + +long int lrint(double x); + +int a, b; +union c { + int d; +}; + +int e() +{ + int f, g, h; + long i, j, k; + double l, m = b = lrint(0.3127); + a = b >> 16 >> 8 & 255; + ((union c *)e)->d = a; + k = m; + h = k >> 16 >> 8 & 255; + ((union c *)(e + 4))->d = h; + j = lrint(l); + g = j >> 16 >> 8 & 255; + ((union c *)(e + 8))->d = g; + i = lrint(0.292); + f = i >> 16 >> 8 & 255; + ((union c *)(e + 12))->d = f; + return 0; +} + +/* { dg-final { scan-tree-dump "basic block vectorized" "slp2" { target { { x86_64-*-* i?86-*-* } && ilp32 } } } } */ diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index 1380088af6a..8f185c99dad 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -141,6 +141,15 @@ vect_get_smallest_scalar_type (stmt_vec_info stmt_info, { tree rhs_type = TREE_TYPE (gimple_assign_rhs1 (assign)); + rhs = TREE_INT_CST_LOW (TYPE_SIZE_UNIT (rhs_type)); + if (rhs < lhs) + scalar_type = rhs_type; + } + else if (is_gimple_call (stmt_info->stmt) + && gimple_call_num_args (stmt_info->stmt) > 0) + { + tree rhs_type = TREE_TYPE (gimple_call_arg (stmt_info->stmt, 0)); + rhs = TREE_INT_CST_LOW (TYPE_SIZE_UNIT (rhs_type)); if (rhs < lhs) scalar_type = rhs_type; -- 2.30.2