From: jakub Date: Tue, 24 Nov 2015 10:45:52 +0000 (+0000) Subject: PR target/68483 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e436644adab6979563e1388d0ac8ded2ec1d39f;p=thirdparty%2Fgcc.git PR target/68483 * tree-vect-generic.c (lower_vec_perm): If VEC_PERM_EXPR is valid vec_shr pattern, don't lower it even if can_vec_perm_p returns false. * optabs.c (shift_amt_for_vec_perm_mask): Return NULL_RTX whenever first is nelt or above. Don't mask expected with 2 * nelt - 1. * gcc.target/i386/pr68483-1.c: New test. * gcc.target/i386/pr68483-2.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230797 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d8a58721eb5a..d91c9292f5ff 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2015-11-24 Jakub Jelinek + + PR target/68483 + * tree-vect-generic.c (lower_vec_perm): If VEC_PERM_EXPR + is valid vec_shr pattern, don't lower it even if can_vec_perm_p + returns false. + * optabs.c (shift_amt_for_vec_perm_mask): Return NULL_RTX + whenever first is nelt or above. Don't mask expected with + 2 * nelt - 1. + 2015-11-24 Ilya Enkovich PR c/68337 diff --git a/gcc/optabs.c b/gcc/optabs.c index 554530282db8..40ef5829150e 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -5232,12 +5232,12 @@ shift_amt_for_vec_perm_mask (rtx sel) return NULL_RTX; first = INTVAL (CONST_VECTOR_ELT (sel, 0)); - if (first >= 2*nelt) + if (first >= nelt) return NULL_RTX; for (i = 1; i < nelt; i++) { int idx = INTVAL (CONST_VECTOR_ELT (sel, i)); - unsigned int expected = (i + first) & (2 * nelt - 1); + unsigned int expected = i + first; /* Indices into the second vector are all equivalent. */ if (idx < 0 || (MIN (nelt, (unsigned) idx) != MIN (nelt, expected))) return NULL_RTX; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6c98a6fe51fc..3c3e3cdf2bcc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-11-24 Jakub Jelinek + + PR target/68483 + * gcc.target/i386/pr68483-1.c: New test. + * gcc.target/i386/pr68483-2.c: New test. + 2015-11-24 Ilya Enkovich PR c/68337 diff --git a/gcc/testsuite/gcc.target/i386/pr68483-1.c b/gcc/testsuite/gcc.target/i386/pr68483-1.c new file mode 100644 index 000000000000..29787e94bd38 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr68483-1.c @@ -0,0 +1,22 @@ +/* PR target/68483 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -ftree-vectorize -msse2 -mno-sse3" } */ + +void +test (int *input, int *out, unsigned x1, unsigned x2) +{ + unsigned i, j; + unsigned end = x1; + + for (i = j = 0; i < 1000; i++) + { + int sum = 0; + end += x2; + for (; j < end; j++) + sum += input[j]; + out[i] = sum; + } +} + +/* { dg-final { scan-assembler "psrldq\[^\n\r]*(8,|, 8)" { target ia32 } } } */ +/* { dg-final { scan-assembler "psrldq\[^\n\r]*(4,|, 4)" { target ia32 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr68483-2.c b/gcc/testsuite/gcc.target/i386/pr68483-2.c new file mode 100644 index 000000000000..394dc1bac763 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr68483-2.c @@ -0,0 +1,15 @@ +/* PR target/68483 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -msse2 -mno-sse3" } */ + +typedef int V __attribute__((vector_size (16))); + +void +foo (V *a, V *b) +{ + V c = { 0, 0, 0, 0 }; + V d = { 1, 2, 3, 4 }; + *a = __builtin_shuffle (*b, c, d); +} + +/* { dg-final { scan-assembler "psrldq\[^\n\r]*(4,|, 4)" } } */ diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c index af1af17a4253..2c7adf737b00 100644 --- a/gcc/tree-vect-generic.c +++ b/gcc/tree-vect-generic.c @@ -1272,6 +1272,30 @@ lower_vec_perm (gimple_stmt_iterator *gsi) update_stmt (stmt); return; } + /* Also detect vec_shr pattern - VEC_PERM_EXPR with zero + vector as VEC1 and a right element shift MASK. */ + if (optab_handler (vec_shr_optab, TYPE_MODE (vect_type)) + != CODE_FOR_nothing + && TREE_CODE (vec1) == VECTOR_CST + && initializer_zerop (vec1) + && sel_int[0] + && sel_int[0] < elements) + { + for (i = 1; i < elements; ++i) + { + unsigned int expected = i + sel_int[0]; + /* Indices into the second vector are all equivalent. */ + if (MIN (elements, (unsigned) sel_int[i]) + != MIN (elements, expected)) + break; + } + if (i == elements) + { + gimple_assign_set_rhs3 (stmt, mask); + update_stmt (stmt); + return; + } + } } else if (can_vec_perm_p (TYPE_MODE (vect_type), true, NULL)) return;