Correct expand_vec_perm_blend in i386.c for V8HImode merge.

gcc/

2010-02-26  Uros Bizjak  <ubizjak@gmail.com>

	PR target/43175
	* config/i386/i386.c (expand_vec_perm_blend): Use correct
	operands in V8HImode subregs.  Fix operand order in VEC_MERGE
	rtx.

gcc/testsuite/

2010-02-26  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/43175
	* gcc.target/i386/vperm-v4si-2-sse4.c: New.

From-SVN: r157087

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 637479115175b8d1d33dfba311dac115819dbea0..5c889ada3f793dd530897a189dc9bdbbacbb4e12 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-26  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR target/43175
+       * config/i386/i386.c (expand_vec_perm_blend): Use correct
+       operands in V8HImode subregs.  Fix operand order in VEC_MERGE
+       rtx.
+
 2010-02-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * doc/invoke.texi (-fvar-tracking-assignments): Fix typo.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index bb03cba0a046039fed94bf8f0b3b4e4eb0903283..3a3b2ac943b7321744ac9ce3ff085fb6e9b33f13 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -29144,8 +29144,8 @@ expand_vec_perm_blend (struct expand_vec_perm_d *d)
     do_subreg:
       vmode = V8HImode;
       target = gen_lowpart (vmode, target);
-      op0 = gen_lowpart (vmode, target);
-      op1 = gen_lowpart (vmode, target);
+      op0 = gen_lowpart (vmode, op0);
+      op1 = gen_lowpart (vmode, op1);
       break;
 
     default:
@@ -29153,7 +29153,7 @@ expand_vec_perm_blend (struct expand_vec_perm_d *d)
     }
 
   /* This matches five different patterns with the different modes.  */
-  x = gen_rtx_VEC_MERGE (vmode, op0, op1, GEN_INT (mask));
+  x = gen_rtx_VEC_MERGE (vmode, op1, op0, GEN_INT (mask));
   x = gen_rtx_SET (VOIDmode, target, x);
   emit_insn (x);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f738c3222363c0e5024b47e36cd1d096810c9c8a..8c780474bcc1f90c886dd346409afd520121bc15 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR target/43175
+       * gcc.target/i386/vperm-v4si-2-sse4.c: New.
+
 2010-02-25  Eric Botcazou  <ebotcazou@adacore.com>
 
        * g++.dg/abi/packed1.C: Expect warning on the SPARC.

diff --git a/gcc/testsuite/gcc.target/i386/vperm-v4si-2-sse4.c b/gcc/testsuite/gcc.target/i386/vperm-v4si-2-sse4.c
new file mode 100644 (file)
index 0000000..1f35b82
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/vperm-v4si-2-sse4.c
@@ -0,0 +1,4 @@
+/* { dg-do run } */
+/* { dg-require-effective-target sse4 } */
+/* { dg-options "-O -msse4" } */
+#include "vperm-v4si-2.c"