diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-07-30 09:13:04 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-07-30 09:13:04 +0200 |
| commit | fa2987ed8db073b9d59688363e2dfb6c60f47d70 (patch) | |
| tree | bdae53051778481f8c651e293ee50f84cfc142e3 /gcc | |
| parent | b867820937a15b28e063aeec2706e31587f9eaf4 (diff) | |
| download | gcc-fa2987ed8db073b9d59688363e2dfb6c60f47d70.zip gcc-fa2987ed8db073b9d59688363e2dfb6c60f47d70.tar.gz gcc-fa2987ed8db073b9d59688363e2dfb6c60f47d70.tar.bz2 | |
re PR target/91150 (wrong code with -O -mavx512vbmi due to wrong writemask)
PR target/91150
* config/i386/i386-expand.c (expand_vec_perm_blend): Change mask type
from unsigned to unsigned HOST_WIDE_INT. For E_V64QImode cast
comparison to unsigned HOST_WIDE_INT before shifting it left.
* gcc.target/i386/avx512bw-pr91150.c: New test.
From-SVN: r273897
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/i386/i386-expand.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/i386/avx512bw-pr91150.c | 37 |
4 files changed, 52 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f991c70..030c589 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-07-30 Jakub Jelinek <jakub@redhat.com> + + PR target/91150 + * config/i386/i386-expand.c (expand_vec_perm_blend): Change mask type + from unsigned to unsigned HOST_WIDE_INT. For E_V64QImode cast + comparison to unsigned HOST_WIDE_INT before shifting it left. + 2019-07-30 Uroš Bizjak <ubizjak@gmail.com> * config/i386/i386.md (movstrict<mode>): Use register_operand diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c index d50e21e..7e12a86 100644 --- a/gcc/config/i386/i386-expand.c +++ b/gcc/config/i386/i386-expand.c @@ -16385,7 +16385,8 @@ static bool expand_vec_perm_blend (struct expand_vec_perm_d *d) { machine_mode mmode, vmode = d->vmode; - unsigned i, mask, nelt = d->nelt; + unsigned i, nelt = d->nelt; + unsigned HOST_WIDE_INT mask; rtx target, op0, op1, maskop, x; rtx rperm[32], vperm; @@ -16439,7 +16440,7 @@ expand_vec_perm_blend (struct expand_vec_perm_d *d) case E_V16SImode: case E_V8DImode: for (i = 0; i < nelt; ++i) - mask |= (d->perm[i] >= nelt) << i; + mask |= ((unsigned HOST_WIDE_INT) (d->perm[i] >= nelt)) << i; break; case E_V2DImode: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2e69275..650e436 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-07-30 Jakub Jelinek <jakub@redhat.com> + + PR target/91150 + * gcc.target/i386/avx512bw-pr91150.c: New test. + 2019-07-29 Jozef Lawrynowicz <jozef.l@mittosystems.com> * gcc.target/msp430/pr78818-data-region.c: Add -mlarge to dg-options. diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-pr91150.c b/gcc/testsuite/gcc.target/i386/avx512bw-pr91150.c new file mode 100644 index 0000000..8c68622 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/avx512bw-pr91150.c @@ -0,0 +1,37 @@ +/* PR target/91150 */ +/* { dg-do run } */ +/* { dg-options "-O2 -mavx512bw" } */ +/* { dg-require-effective-target avx512bw } */ + +#include "avx512bw-check.h" + +typedef unsigned char V __attribute__((vector_size (64))); + +__attribute__((noipa)) void +foo (V *x, V *y, V *z) +{ + *x = __builtin_shuffle (*y, *z, (V) { 0, 1, 2, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, + 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127 }); +} + +static void +avx512bw_test (void) +{ + union U { unsigned char a[64]; V v; } a, b, c; + int i; + for (i = 0; i < 64; i++) + { + b.a[i] = i + 1; + c.a[i] = i + 65; + } + foo (&a.v, &b.v, &c.v); + for (i = 0; i < 64; i++) + if (a.a[i] != (i < 16 ? i + 1 : i + 65)) + __builtin_abort (); +} |