re PR target/72717 (ICE: in emit_move_insn, at expr.c:3693 with vector shift @ powerp...

[gcc]
2016-12-07  Michael Meissner  <meissner@linux.vnet.ibm.com>

	PR target/72717
	* config/rs6000/rs6000.c (rs6000_expand_vector_init): If the
	V2DImode elements are SUBREG's convert the result into DImode
	rather than failing in emit_move_insn.

[gcc/testsuite]
2016-12-07  Michael Meissner  <meissner@linux.vnet.ibm.com>

	PR target/72717
	* gcc.target/powerpc/pr72717.c: New test.

From-SVN: r243418

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cc6dc718bdfa1dcd4f0e2740df94d33e8c9c17c0..79d5d6de19b0475e4a653cc5675f439454e99e83 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-07  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       PR target/72717
+       * config/rs6000/rs6000.c (rs6000_expand_vector_init): If the
+       V2DImode elements are SUBREG's convert the result into DImode
+       rather than failing in emit_move_insn.
+
 2016-12-07  Jakub Jelinek  <jakub@redhat.com>
 
        * builtins.c (fold_builtin_strstr): Removed.

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index b75a290da6aa14830b4db50661050a7b341faf11..f0c1354696b44ca5d9171c85cb86ea31c9231c35 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -6891,25 +6891,43 @@ rs6000_expand_vector_init (rtx target, rtx vals)
   /* Double word values on VSX can use xxpermdi or lxvdsx.  */
   if (VECTOR_MEM_VSX_P (mode) && (mode == V2DFmode || mode == V2DImode))
     {
-      rtx op0 = XVECEXP (vals, 0, 0);
-      rtx op1 = XVECEXP (vals, 0, 1);
+      rtx op[2];
+      size_t i;
+      size_t num_elements = all_same ? 1 : 2;
+      for (i = 0; i < num_elements; i++)
+       {
+         op[i] = XVECEXP (vals, 0, i);
+         /* Just in case there is a SUBREG with a smaller mode, do a
+            conversion.  */
+         if (GET_MODE (op[i]) != inner_mode)
+           {
+             rtx tmp = gen_reg_rtx (inner_mode);
+             convert_move (tmp, op[i], 0);
+             op[i] = tmp;
+           }
+         /* Allow load with splat double word.  */
+         else if (MEM_P (op[i]))
+           {
+             if (!all_same)
+               op[i] = force_reg (inner_mode, op[i]);
+           }
+         else if (!REG_P (op[i]))
+           op[i] = force_reg (inner_mode, op[i]);
+       }
+
       if (all_same)
        {
-         if (!MEM_P (op0) && !REG_P (op0))
-           op0 = force_reg (inner_mode, op0);
          if (mode == V2DFmode)
-           emit_insn (gen_vsx_splat_v2df (target, op0));
+           emit_insn (gen_vsx_splat_v2df (target, op[0]));
          else
-           emit_insn (gen_vsx_splat_v2di (target, op0));
+           emit_insn (gen_vsx_splat_v2di (target, op[0]));
        }
       else
        {
-         op0 = force_reg (inner_mode, op0);
-         op1 = force_reg (inner_mode, op1);
          if (mode == V2DFmode)
-           emit_insn (gen_vsx_concat_v2df (target, op0, op1));
+           emit_insn (gen_vsx_concat_v2df (target, op[0], op[1]));
          else
-           emit_insn (gen_vsx_concat_v2di (target, op0, op1));
+           emit_insn (gen_vsx_concat_v2di (target, op[0], op[1]));
        }
       return;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1c3f290762dbaf264f12625a51405848365bb119..33f1f86a05550f07de0e1e57b47b702d79a8868b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-07  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       PR target/72717
+       * gcc.target/powerpc/pr72717.c: New test.
+
 2016-12-07  Jakub Jelinek  <jakub@redhat.com>
 
        * gcc.dg/builtin-strstr-1.c: New test.

diff --git a/gcc/testsuite/gcc.target/powerpc/pr72717.c b/gcc/testsuite/gcc.target/powerpc/pr72717.c
new file mode 100644 (file)
index 0000000..1446098
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr72717.c
@@ -0,0 +1,20 @@
+/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
+/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
+/* { dg-options "-mcpu=power8 -O2" } */
+
+typedef long V __attribute__((__vector_size__(32)));
+
+extern void foo (V *, V*);
+
+/* This test generated an failure in emit_move_insn.  */
+
+void
+foo(V *p, V *q)
+{
+  V v = *q;
+  *p = v << v[0];
+}
+
+/* { dg-final { scan-assembler-times "vsld" 2 } } */