Fix PRs 48857, 48495

From-SVN: r173665

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 635fe99277b458dc0ad5ac3c9ba8039cf3b0667f..801e34ed4a95e0fe39aca3cff55fca56726730f8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,30 @@
+2011-05-11  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       Backport from mainline
+       2011-05-10  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       PR target/48857, 48495
+       * config/rs6000/rs6000.h (VSX_SCALAR_MODE): Delete.
+       (VSX_MODE): Ditto.
+       (VSX_MOVE_MODE): Ditto.
+       (ALTIVEC_OR_VSX_VECTOR_MODE): New macro, combine all Altivec and
+       VSX vector types.  Add V2DImode.
+       (HARD_REGNO_CALLER_SAVE_MODE): Use it instead of
+       ALTIVEC_VECTOR_MODE and VSX_VECTOR_MODE calls.
+       (MODES_TIEABLE_P): Ditto.
+
+       * config/rs6000/rs6000.c (rs6000_emit_move): Use
+       ALTIVEC_OR_VSX_MODE instead of ALTIVEC_VECTOR_MODE and
+       VSX_VECTOR_MODE.
+       (init_cumulative_args): Ditto.
+       (rs6000_function_arg_boundary): Ditto.
+       (rs6000_function_arg_advance_1): Ditto.
+       (rs6000_function_arg): Ditto.
+       (rs6000_function_ok_for_sibcall): Ditto.
+       (emit_frame_save): Ditto.
+       (rs6000_function_value): Ditto.
+       (rs6000_libcall_value): Ditto.
+
 2011-05-10  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index bc31809f0b4b189da932db1ce4821a3bded2ddec..0582dba7c72b84ce4d5d5b50ac01b15a7ee476d4 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -6696,7 +6696,7 @@ rs6000_emit_move (rtx dest, rtx source, enum machine_mode mode)
 
 /* Nonzero if we can use an AltiVec register to pass this arg.  */
 #define USE_ALTIVEC_FOR_ARG_P(CUM,MODE,TYPE,NAMED)             \
-  ((ALTIVEC_VECTOR_MODE (MODE) || VSX_VECTOR_MODE (MODE))      \
+  (ALTIVEC_OR_VSX_VECTOR_MODE (MODE)                           \
    && (CUM)->vregno <= ALTIVEC_ARG_MAX_REG                     \
    && TARGET_ALTIVEC_ABI                                       \
    && (NAMED))
@@ -6922,7 +6922,7 @@ function_arg_padding (enum machine_mode mode, const_tree type)
    existing library interfaces.
 
    Doubleword align SPE vectors.
-   Quadword align Altivec vectors.
+   Quadword align Altivec/VSX vectors.
    Quadword align large synthetic vector types.   */
 
 int
@@ -6939,7 +6939,7 @@ function_arg_boundary (enum machine_mode mode, tree type)
               && int_size_in_bytes (type) >= 8
               && int_size_in_bytes (type) < 16))
     return 64;
-  else if ((ALTIVEC_VECTOR_MODE (mode) || VSX_VECTOR_MODE (mode))
+  else if (ALTIVEC_OR_VSX_VECTOR_MODE (mode)
           || (type && TREE_CODE (type) == VECTOR_TYPE
               && int_size_in_bytes (type) >= 16))
     return 128;
@@ -7084,8 +7084,7 @@ function_arg_advance (CUMULATIVE_ARGS *cum, enum machine_mode mode,
     cum->nargs_prototype--;
 
   if (TARGET_ALTIVEC_ABI
-      && (ALTIVEC_VECTOR_MODE (mode)
-         || VSX_VECTOR_MODE (mode)
+      && (ALTIVEC_OR_VSX_VECTOR_MODE (mode)
          || (type && TREE_CODE (type) == VECTOR_TYPE
              && int_size_in_bytes (type) == 16)))
     {
@@ -7679,8 +7678,7 @@ function_arg (CUMULATIVE_ARGS *cum, enum machine_mode mode,
     else
       return gen_rtx_REG (mode, cum->vregno);
   else if (TARGET_ALTIVEC_ABI
-          && (ALTIVEC_VECTOR_MODE (mode)
-              || VSX_VECTOR_MODE (mode)
+          && (ALTIVEC_OR_VSX_VECTOR_MODE (mode)
               || (type && TREE_CODE (type) == VECTOR_TYPE
                   && int_size_in_bytes (type) == 16)))
     {
@@ -18282,7 +18280,7 @@ emit_frame_save (rtx frame_reg, rtx frame_ptr, enum machine_mode mode,
 
   /* Some cases that need register indexed addressing.  */
   if ((TARGET_ALTIVEC_ABI && ALTIVEC_VECTOR_MODE (mode))
-      || (TARGET_VSX && VSX_VECTOR_MODE (mode))
+      || (TARGET_VSX && ALTIVEC_OR_VSX_VECTOR_MODE (mode))
       || (TARGET_E500_DOUBLE && mode == DFmode)
       || (TARGET_SPE_ABI
          && SPE_VECTOR_MODE (mode)
@@ -25567,13 +25565,12 @@ rs6000_function_value (const_tree valtype,
   else if (TREE_CODE (valtype) == COMPLEX_TYPE
           && targetm.calls.split_complex_arg)
     return rs6000_complex_function_value (mode);
+  /* VSX is a superset of Altivec and adds V2DImode/V2DFmode.  Since the same
+     return register is used in both cases, and we won't see V2DImode/V2DFmode
+     for pure altivec, combine the two cases.  */
   else if (TREE_CODE (valtype) == VECTOR_TYPE
           && TARGET_ALTIVEC && TARGET_ALTIVEC_ABI
-          && ALTIVEC_VECTOR_MODE (mode))
-    regno = ALTIVEC_ARG_RETURN;
-  else if (TREE_CODE (valtype) == VECTOR_TYPE
-          && TARGET_VSX && TARGET_ALTIVEC_ABI
-          && VSX_VECTOR_MODE (mode))
+          && ALTIVEC_OR_VSX_VECTOR_MODE (mode))
     regno = ALTIVEC_ARG_RETURN;
   else if (TARGET_E500_DOUBLE && TARGET_HARD_FLOAT
           && (mode == DFmode || mode == DCmode
@@ -25613,12 +25610,12 @@ rs6000_libcall_value (enum machine_mode mode)
           && TARGET_HARD_FLOAT && TARGET_FPRS
            && ((TARGET_SINGLE_FLOAT && mode == SFmode) || TARGET_DOUBLE_FLOAT))
     regno = FP_ARG_RETURN;
-  else if (ALTIVEC_VECTOR_MODE (mode)
+  /* VSX is a superset of Altivec and adds V2DImode/V2DFmode.  Since the same
+     return register is used in both cases, and we won't see V2DImode/V2DFmode
+     for pure altivec, combine the two cases.  */
+  else if (ALTIVEC_OR_VSX_VECTOR_MODE (mode)
           && TARGET_ALTIVEC && TARGET_ALTIVEC_ABI)
     regno = ALTIVEC_ARG_RETURN;
-  else if (VSX_VECTOR_MODE (mode)
-          && TARGET_VSX && TARGET_ALTIVEC_ABI)
-    regno = ALTIVEC_ARG_RETURN;
   else if (COMPLEX_MODE_P (mode) && targetm.calls.split_complex_arg)
     return rs6000_complex_function_value (mode);
   else if (TARGET_E500_DOUBLE && TARGET_HARD_FLOAT

diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 596f8a82eaebd1d1a8c3da3ba1bd66f45a389431..f96ba9317513fdab9783ed0db9e0eb8fa3ff5a4d 100644 (file)
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -1038,10 +1038,9 @@ extern unsigned rs6000_pointer_size;
 
 /* When setting up caller-save slots (MODE == VOIDmode) ensure we allocate
    enough space to account for vectors in FP regs. */
-#define HARD_REGNO_CALLER_SAVE_MODE(REGNO, NREGS, MODE)        \
-  (TARGET_VSX                                          \
-   && ((MODE) == VOIDmode || VSX_VECTOR_MODE (MODE)    \
-       || ALTIVEC_VECTOR_MODE (MODE))                  \
+#define HARD_REGNO_CALLER_SAVE_MODE(REGNO, NREGS, MODE)                        \
+  (TARGET_VSX                                                          \
+   && ((MODE) == VOIDmode || ALTIVEC_OR_VSX_VECTOR_MODE (MODE))                \
    && FP_REGNO_P (REGNO)                               \
    ? V2DFmode                                          \
    : choose_hard_reg_mode ((REGNO), (NREGS), false))
@@ -1057,25 +1056,16 @@ extern unsigned rs6000_pointer_size;
         ((MODE) == V4SFmode            \
          || (MODE) == V2DFmode)        \
 
-#define VSX_SCALAR_MODE(MODE)          \
-       ((MODE) == DFmode)
-
-#define VSX_MODE(MODE)                 \
-       (VSX_VECTOR_MODE (MODE)         \
-        || VSX_SCALAR_MODE (MODE))
-
-#define VSX_MOVE_MODE(MODE)            \
-       (VSX_VECTOR_MODE (MODE)         \
-        || VSX_SCALAR_MODE (MODE)      \
-        || ALTIVEC_VECTOR_MODE (MODE)  \
-        || (MODE) == TImode)
-
 #define ALTIVEC_VECTOR_MODE(MODE)      \
         ((MODE) == V16QImode           \
          || (MODE) == V8HImode         \
          || (MODE) == V4SFmode         \
          || (MODE) == V4SImode)
 
+#define ALTIVEC_OR_VSX_VECTOR_MODE(MODE)                               \
+  (ALTIVEC_VECTOR_MODE (MODE) || VSX_VECTOR_MODE (MODE)                        \
+   || (MODE) == V2DImode)
+
 #define SPE_VECTOR_MODE(MODE)          \
        ((MODE) == V4HImode             \
          || (MODE) == V2SFmode          \
@@ -1118,10 +1108,10 @@ extern unsigned rs6000_pointer_size;
    ? ALTIVEC_VECTOR_MODE (MODE2)               \
    : ALTIVEC_VECTOR_MODE (MODE2)               \
    ? ALTIVEC_VECTOR_MODE (MODE1)               \
-   : VSX_VECTOR_MODE (MODE1)                   \
-   ? VSX_VECTOR_MODE (MODE2)                   \
-   : VSX_VECTOR_MODE (MODE2)                   \
-   ? VSX_VECTOR_MODE (MODE1)                   \
+   : ALTIVEC_OR_VSX_VECTOR_MODE (MODE1)                \
+   ? ALTIVEC_OR_VSX_VECTOR_MODE (MODE2)                \
+   : ALTIVEC_OR_VSX_VECTOR_MODE (MODE2)                \
+   ? ALTIVEC_OR_VSX_VECTOR_MODE (MODE1)                \
    : 1)
 
 /* Post-reload, we can't use any new AltiVec registers, as we already

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bab036cf2e0614c3f37d5a1e466b765211a52553..21d0fc7b342a2feb4962f90be708eea606a7dc6b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-11  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       Backport from mainline
+       2011-05-10  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       PR target/48857
+       * gcc.target/powerpc/pr48857.c: New file, make sure V2DI arguments
+       are passed and returned in vector registers.
+
 2011-05-10  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/gcc/testsuite/gcc.target/powerpc/pr48857.c b/gcc/testsuite/gcc.target/powerpc/pr48857.c
new file mode 100644 (file)
index 0000000..e8201c0
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr48857.c
@@ -0,0 +1,25 @@
+/* { dg-do compile { target { powerpc*-*-* } } } */
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mcpu=power7 -mabi=altivec" } */
+/* { dg-final { scan-assembler-times "lxvd2x" 1 } } */
+/* { dg-final { scan-assembler-times "stxvd2x" 1 } } */
+/* { dg-final { scan-assembler-not "ld" } } */
+/* { dg-final { scan-assembler-not "lwz" } } */
+/* { dg-final { scan-assembler-not "stw" } } */
+/* { dg-final { scan-assembler-not "addi" } } */
+
+typedef vector long long v2di_type;
+
+v2di_type
+return_v2di (v2di_type *ptr)
+{
+  return *ptr;         /* should generate lxvd2x 34,0,3.  */
+}
+
+void
+pass_v2di (v2di_type arg, v2di_type *ptr)
+{
+  *ptr = arg;          /* should generate stxvd2x 34,0,{3,5}.  */
+}
+