From 1ca846ff2e8f8c1775af2da29b9037fb7916a3fa Mon Sep 17 00:00:00 2001 From: jakub Date: Wed, 9 Nov 2011 21:37:27 +0000 Subject: [PATCH] PR target/50911 * config/i386/i386.c (expand_vec_perm_interleave2): If d->vmode is V4SImode, !TARGET_SSE2 and punpck[lh]* is needed, change dremap.vmode to V4SFmode. * gcc.dg/torture/vshuf-16.inc: Add interleave low and high permutations. * gcc.dg/torture/vshuf-32.inc: Likewise. * gcc.dg/torture/vshuf-4.inc: Likewise. * gcc.dg/torture/vshuf-8.inc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181238 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/config/i386/i386.c | 4 ++++ gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.dg/torture/vshuf-16.inc | 4 +++- gcc/testsuite/gcc.dg/torture/vshuf-32.inc | 4 +++- gcc/testsuite/gcc.dg/torture/vshuf-4.inc | 4 +++- gcc/testsuite/gcc.dg/torture/vshuf-8.inc | 4 +++- 7 files changed, 28 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 104de01bfe6..e3252836f94 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2011-11-09 Jakub Jelinek + PR target/50911 + * config/i386/i386.c (expand_vec_perm_interleave2): If d->vmode is + V4SImode, !TARGET_SSE2 and punpck[lh]* is needed, change dremap.vmode + to V4SFmode. + * function.h (requires_stack_frame_p): New prototype. * function.c (requires_stack_frame_p): No longer static. * config/i386/i386.c (ix86_finalize_stack_realign_flags): If diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 008af27042a..4d460daad89 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -35877,6 +35877,8 @@ expand_vec_perm_interleave2 (struct expand_vec_perm_d *d) dremap.perm[i * 2] = i; dremap.perm[i * 2 + 1] = i + nelt; } + if (!TARGET_SSE2 && d->vmode == V4SImode) + dremap.vmode = V4SFmode; } else if ((contents & (h2 | h4)) == contents) { @@ -35888,6 +35890,8 @@ expand_vec_perm_interleave2 (struct expand_vec_perm_d *d) dremap.perm[i * 2] = i + nelt2; dremap.perm[i * 2 + 1] = i + nelt + nelt2; } + if (!TARGET_SSE2 && d->vmode == V4SImode) + dremap.vmode = V4SFmode; } else if ((contents & (h1 | h4)) == contents) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6a8dba73ea0..b92292b1193 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2011-11-09 Jakub Jelinek + PR target/50911 + * gcc.dg/torture/vshuf-16.inc: Add interleave low and high + permutations. + * gcc.dg/torture/vshuf-32.inc: Likewise. + * gcc.dg/torture/vshuf-4.inc: Likewise. + * gcc.dg/torture/vshuf-8.inc: Likewise. + * gcc.dg/tm/memopt-1.c: Fix up regexp. 2011-11-09 Ian Lance Taylor diff --git a/gcc/testsuite/gcc.dg/torture/vshuf-16.inc b/gcc/testsuite/gcc.dg/torture/vshuf-16.inc index 89ef544a11a..abefdcba22b 100644 --- a/gcc/testsuite/gcc.dg/torture/vshuf-16.inc +++ b/gcc/testsuite/gcc.dg/torture/vshuf-16.inc @@ -19,7 +19,9 @@ T (15, 1, 30, 27, 31, 9, 18, 25, 12, 7, 4, 2, 16, 25, 20, 10, 3) \ T (16, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30) \ T (17, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31) \ T (18, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) \ -T (19, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) +T (19, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) \ +T (20, 0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23) \ +T (21, 8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31) #define EXPTESTS \ T (116, 28, 13, 27, 11, 21, 1, 5, 22, 29, 14, 15, 6, 3, 10, 16, 30) \ T (117, 22, 26, 1, 13, 29, 3, 18, 18, 11, 21, 12, 28, 19, 5, 7, 4) \ diff --git a/gcc/testsuite/gcc.dg/torture/vshuf-32.inc b/gcc/testsuite/gcc.dg/torture/vshuf-32.inc index bbeebaabeeb..583364a8161 100644 --- a/gcc/testsuite/gcc.dg/torture/vshuf-32.inc +++ b/gcc/testsuite/gcc.dg/torture/vshuf-32.inc @@ -19,7 +19,9 @@ T (15, 2, 43, 49, 34, 28, 35, 29, 36, 51, 9, 17, 48, 10, 37, 45, 21, 52, 19, 25, T (16, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62) \ T (17, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63) \ T (18, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) \ -T (19, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) +T (19, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) \ +T (20, 0, 32, 1, 33, 2, 34, 3, 35, 4, 36, 5, 37, 6, 38, 7, 39, 8, 40, 9, 41, 10, 42, 11, 43, 12, 44, 13, 45, 14, 46, 15, 47) \ +T (21, 16, 48, 17, 49, 18, 50, 19, 51, 20, 52, 21, 53, 22, 54, 23, 55, 24, 56, 25, 57, 26, 58, 27, 59, 28, 60, 29, 61, 30, 62, 31, 63) #define EXPTESTS \ T (116, 13, 38, 47, 3, 17, 8, 38, 20, 59, 61, 39, 26, 7, 49, 63, 43, 57, 16, 40, 19, 4, 32, 27, 7, 52, 19, 46, 55, 36, 41, 48, 6) \ T (117, 39, 35, 59, 20, 56, 18, 58, 63, 57, 14, 2, 16, 5, 61, 35, 4, 53, 9, 52, 51, 27, 33, 61, 12, 3, 35, 36, 40, 37, 7, 45, 42) \ diff --git a/gcc/testsuite/gcc.dg/torture/vshuf-4.inc b/gcc/testsuite/gcc.dg/torture/vshuf-4.inc index 94bdb777dfe..cdba12cd27c 100644 --- a/gcc/testsuite/gcc.dg/torture/vshuf-4.inc +++ b/gcc/testsuite/gcc.dg/torture/vshuf-4.inc @@ -19,7 +19,9 @@ T (15, 6, 1, 3, 4) \ T (16, 0, 2, 4, 6) \ T (17, 1, 3, 5, 7) \ T (18, 3, 3, 3, 3) \ -T (19, 3, 2, 1, 0) +T (19, 3, 2, 1, 0) \ +T (20, 0, 4, 1, 5) \ +T (21, 2, 6, 3, 7) #define EXPTESTS \ T (116, 1, 2, 4, 3) \ T (117, 7, 3, 3, 0) \ diff --git a/gcc/testsuite/gcc.dg/torture/vshuf-8.inc b/gcc/testsuite/gcc.dg/torture/vshuf-8.inc index 66586fabe73..b865162133a 100644 --- a/gcc/testsuite/gcc.dg/torture/vshuf-8.inc +++ b/gcc/testsuite/gcc.dg/torture/vshuf-8.inc @@ -19,7 +19,9 @@ T (15, 0, 5, 11, 7, 4, 6, 14, 1) \ T (16, 0, 2, 4, 6, 8, 10, 12, 14) \ T (17, 1, 3, 5, 7, 9, 11, 13, 15) \ T (18, 3, 3, 3, 3, 3, 3, 3, 3) \ -T (19, 7, 6, 5, 4, 3, 2, 1, 0) +T (19, 7, 6, 5, 4, 3, 2, 1, 0) \ +T (20, 0, 8, 1, 9, 2, 10, 3, 11) \ +T (21, 4, 12, 5, 13, 6, 14, 7, 15) #define EXPTESTS \ T (116, 9, 3, 9, 4, 7, 0, 0, 6) \ T (117, 4, 14, 12, 8, 9, 6, 0, 10) \ -- 2.11.0