public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Meissner <meissner@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/meissner/heads/work071)] Revert patches.
Date: Mon, 18 Oct 2021 14:07:59 +0000 (GMT)	[thread overview]
Message-ID: <20211018140759.EA6563858400@sourceware.org> (raw)

https://gcc.gnu.org/g:9a6ff130fbda39593fc2bf1db46a37207142cd0b

commit 9a6ff130fbda39593fc2bf1db46a37207142cd0b
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Mon Oct 18 10:06:25 2021 -0400

    Revert patches.
    
    2021-10-15  Michael Meissner  <meissner@linux.ibm.com>
    
    gcc/
    
            Revert patches.
            * config/rs6000/predicates.md (easy_fp_constant): Add support for
            XXSPLTIW.
            (easy_vector_constant_prefixed): Likewise.
            (easy_vector_constant): Likewise.
            * config/rs6000/rs6000-protos.h (rs6000_vec_const): Add field for
            XXSPLTIW.
            (vec_const_use_xxspltiw): New declaration.
            * config/rs6000/rs6000.c (xxspltib_constant_p): If we can generate
            XXSPLTIW, don't do XXSPLTIB and sign extend.
            (output_vec_const_move): Add support for XXSPLTIW.
            (prefixed_xxsplti_p): Recognize XXSPLTIW instructions as
            prefixed.
            (vec_const_simple_constant): New function.
            (vec_const_use_xxspltiw): New function.
            * config/rs6000/rs6000.opt (-mxxspltiw): New debug switch.
            * config/rs6000/vsx.md (vsx_mov<mode>_64bit): Update comment.
            (vsx_mov<mode>_32bit): Likewise.
    
    gcc/testsuite/
    
            Revert patches.
            * gcc.target/powerpc/vec-splat-constant-v16qi.c: New test.
            * gcc.target/powerpc/vec-splat-constant-v4sf.c: New test.
            * gcc.target/powerpc/vec-splat-constant-v4si.c: New test.
            * gcc.target/powerpc/vec-splat-constant-v8hi.c: New test.
            * gcc.target/powerpc/vec-splati-runnable.c: Update insn count.
    
    2021-10-14  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
    
            Revert patches.
            * config/rs6000/constraints.md (eQ): New constraint.
            * config/rs6000/predicates.md (easy_fp_constant): Add support for
            generating the LXVKQ instruction.
            (easy_vector_constant_ieee128): New predicate.
            (easy_vector_constant): Add support for generating the LXVKQ
            instruction.
            * config/rs6000/rs6000-protos.h (rs6000_vec_concat): Add fields
            for generating LXVKQ.
            * config/rs6000/rs6000.c (output_vec_const_move): Add support for
            generating LXVKQ.
            (vec_const_use_lxvkq): New function.
            * config/rs6000/rs6000.opt (-mlxvkq): New debug option.
            * config/rs6000/vsx.md (vsx_mov<mode>_64bit): Add support for
            generating LXVKQ.
            (vsx_mov<mode>_32bit): Likewise.
            * doc/md.texi (PowerPC and IBM RS6000 constraints): Document the
            eQ constraint.
    
    gcc/testsuite/
    
            Revert patches.
            * gcc.target/powerpc/float128-constant.c: New test.
    
    2021-10-14  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
    
            Revert patches.
            * config/rs6000/constraints.md (eS): New constraint.
            (eV): New constraint.
            * config/rs6000/predicates.md (easy_fp_constant): Add support for
            generating XXSPLTIDP.
            (easy_scalar_constant_prefixed): New predicate.
            (easy_vector_constant_prefixed): New predicate.
            (easy_vector_constant): Add support for generating XXSPLTIDP.
            * config/rs6000/rs6000-protos.h (prefixed_xxsplti_p): New
            declaration.
            (VECTOR_CONST_*): New macros.
            (rs6000_vec_const): New structure to hold information about vector
            constants.
            (vec_const_to_bytes): New function.
            (vec_const_use_xxspltidp): New function.
            * config/rs6000/rs6000.c (output_vec_const_move): Add support for
            XXSPLTIDP.
            (prefixed_xxsplti_p): New function.
            (vec_const_integer): New helper function.
            (vec_const_floating_point): New helper function.
            (vec_const_use_xxspltidp): New function.
            (vec_const_to_bytes): New function.
            * config/rs6000/rs6000.md (prefixed attribute): Add support for
            insns that generate XXSPLTIDP.
            (movsf_hardfloat): Add support for XXSPLTIDP.
            (mov<mode>_hardfloat32, FMOVE64 iterator): Likewise.
            (mov<mode>_hardfloat64, FMOVE64 iterator): Likewise.
            (movdi_internal32): Likewise.
            (movdi_internal64): Likewise.
            * config/rs6000/rs6000.opt (-mxxspltidp): New debug option.
            * config/rs6000/vsx.md (vsx_mov<mode>_64bit): Add support for
            XXSPLTIDP.
            (vsx_mov<mode>_32bit): Likewise.
            (XXSPLTIDP): New mode iterator.
            (xxspltidp_<mode>_internal): New insn.
            (XXSPLTIDP splitters): New splitters for XXSPLTIDP.
            * doc/md.texi (PowerPC and IBM RS6000 constraints): Document the
            eD constraint.
    
    gcc/testsuite/
    
            Revert patches.
            * gcc.target/powerpc/pr86731-fwrapv-longlong.c: Update insn
            regex for power10.
            * gcc.target/powerpc/vec-splat-constant-df.c: New test.
            * gcc.target/powerpc/vec-splat-constant-di.c: New test.
            * gcc.target/powerpc/vec-splat-constant-sf.c: New test.
            * gcc.target/powerpc/vec-splat-constant-v2df.c: New test.
            * gcc.target/powerpc/vec-splat-constant-v2di.c: New test.
            * gcc.target/powerpc/vec-splati-runnable.c: Update insn counts.

Diff:
---
 gcc/config/rs6000/constraints.md                   |  17 -
 gcc/config/rs6000/predicates.md                    |  98 ----
 gcc/config/rs6000/rs6000-protos.h                  |  26 -
 gcc/config/rs6000/rs6000.c                         | 534 +--------------------
 gcc/config/rs6000/rs6000.md                        |  58 +--
 gcc/config/rs6000/rs6000.opt                       |  12 -
 gcc/config/rs6000/vsx.md                           |  73 +--
 gcc/doc/md.texi                                    |  11 -
 .../gcc.target/powerpc/float128-constant.c         | 160 ------
 .../gcc.target/powerpc/pr86731-fwrapv-longlong.c   |   9 +-
 .../gcc.target/powerpc/vec-splat-constant-df.c     |  60 ---
 .../gcc.target/powerpc/vec-splat-constant-di.c     |  70 ---
 .../gcc.target/powerpc/vec-splat-constant-sf.c     |  60 ---
 .../gcc.target/powerpc/vec-splat-constant-v16qi.c  |  27 --
 .../gcc.target/powerpc/vec-splat-constant-v2df.c   |  64 ---
 .../gcc.target/powerpc/vec-splat-constant-v2di.c   |  50 --
 .../gcc.target/powerpc/vec-splat-constant-v4sf.c   |  67 ---
 .../gcc.target/powerpc/vec-splat-constant-v4si.c   |  51 --
 .../gcc.target/powerpc/vec-splat-constant-v8hi.c   |  62 ---
 .../gcc.target/powerpc/vec-splati-runnable.c       |   4 +-
 20 files changed, 36 insertions(+), 1477 deletions(-)

diff --git a/gcc/config/rs6000/constraints.md b/gcc/config/rs6000/constraints.md
index e645f405588..c8cff1a3038 100644
--- a/gcc/config/rs6000/constraints.md
+++ b/gcc/config/rs6000/constraints.md
@@ -213,23 +213,6 @@
   "A signed 34-bit integer constant if prefixed instructions are supported."
   (match_operand 0 "cint34_operand"))
 
-;; A scalar constant that can be loaded into vector registers with one prefixed
-;; instruction such as XXSPLTIDP.
-(define_constraint "eS"
-  "A scalar constant that can be loaded with one prefixed instruction."
-  (match_operand 0 "vsx_prefixed_scalar_constant"))
-
-;; A vector constant that can be loaded into vector registers with one prefixed
-;; instruction such as XXSPLTIDP
-(define_constraint "eV"
-  "A vector constant that can be loaded with one prefixed instruction."
-  (match_operand 0 "vsx_prefixed_vector_constant"))
-
-;; 128-bit IEEE 128-bit constant
-(define_constraint "eQ"
-  "An IEEE 128-bit constant that can be loaded with the LXVKQ instruction."
-  (match_operand 0 "easy_vector_constant_ieee128"))
-
 ;; Floating-point constraints.  These two are defined so that insn
 ;; length attributes can be calculated exactly.
 
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 252abbbaf9a..956e42bc514 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -601,21 +601,6 @@
   if (TARGET_VSX && op == CONST0_RTX (mode))
     return 1;
 
-  /* Constants that can be generated with ISA 3.1 instructions are easy.  */
-  rs6000_vec_const vec_const;
-
-  if (TARGET_POWER10 && vec_const_to_bytes (op, mode, &vec_const))
-    {
-      if (vec_const_use_lxvkq (&vec_const))
-	return true;
-
-      if (vec_const_use_xxspltidp (&vec_const))
-	return true;
-
-      if (vec_const_use_xxspltiw (&vec_const))
-	return true;
-    }
-
   /* Otherwise consider floating point constants hard, so that the
      constant gets pushed to memory during the early RTL phases.  This
      has the advantage that double precision constants that can be
@@ -624,73 +609,6 @@
    return 0;
 })
 
-;; Return 1 if the operand is a scalar constant that can be loaded to a VSX
-;; register with one prefixed instruction, such as XXSPLTIDP.
-
-(define_predicate "vsx_prefixed_scalar_constant"
-  (match_code "const_int,const_double")
-{
-  rs6000_vec_const vec_const;
-
-  /* Do we have prefixed instructions and VSX registers available?  Is the
-     constant recognized?  */
-  if (!TARGET_PREFIXED || !TARGET_VSX)
-    return false;
-
-  if (!vec_const_to_bytes (op, mode, &vec_const))
-    return false;
-  
-  if (vec_const_use_xxspltidp (&vec_const))
-    return true;
-
-  return false;
-})
-
-;; Return 1 if the operand is a scalar constant that can be loaded to a VSX
-;; register with one prefixed instruction, such as XXSPLTIDP or XXSPLTIW.
-;;
-;; We have to have separate predicates and constraints for scalars and vectors,
-;; otherwise things get messed up with TImode when you try to load very large
-;; integer constants.
-
-(define_predicate "vsx_prefixed_vector_constant"
-  (match_code "const_vector,vec_duplicate")
-{
-  rs6000_vec_const vec_const;
-
-  /* Do we have prefixed instructions and VSX registers available?  Is the
-     constant recognized?  */
-  if (!TARGET_PREFIXED || !TARGET_VSX)
-    return false;
-
-  if (!vec_const_to_bytes (op, mode, &vec_const))
-    return false;
-  
-  if (vec_const_use_xxspltidp (&vec_const))
-    return true;
-
-  if (vec_const_use_xxspltiw (&vec_const))
-    return true;
-
-  return false;
-})
-
-;; Return 1 if the operand is a special IEEE 128-bit value that can be loaded
-;; via the LXVKQ instruction.
-
-(define_predicate "easy_vector_constant_ieee128"
-  (match_code "const_vector,const_double")
-{
-  rs6000_vec_const vec_const;
-
-  /* Can we generate the LXVKQ instruction?  */
-  if (!TARGET_LXVKQ || !TARGET_FLOAT128_HW || !TARGET_POWER10 || !TARGET_VSX)
-    return false;
-
-  return (vec_const_to_bytes (op, mode, &vec_const)
-	  && vec_const_use_lxvkq (&vec_const));
-})
-
 ;; Return 1 if the operand is a constant that can loaded with a XXSPLTIB
 ;; instruction and then a VUPKHSB, VECSB2W or VECSB2D instruction.
 
@@ -739,22 +657,6 @@
           && xxspltib_constant_p (op, mode, &num_insns, &value))
 	return true;
 
-      /* See if the constant can be generated with the ISA 3.1
-         instructions.  */
-      rs6000_vec_const vec_const;
-
-      if (TARGET_POWER10 && vec_const_to_bytes (op, mode, &vec_const))
-	{
-	  if (vec_const_use_lxvkq (&vec_const))
-	    return true;
-
-	  if (vec_const_use_xxspltidp (&vec_const))
-	    return true;
-
-	  if (vec_const_use_xxspltiw (&vec_const))
-	    return true;
-	}
-
       return easy_altivec_constant (op, mode);
     }
 
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index 52f094dd410..14f6b313105 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -198,7 +198,6 @@ enum non_prefixed_form reg_to_non_prefixed (rtx reg, machine_mode mode);
 extern bool prefixed_load_p (rtx_insn *);
 extern bool prefixed_store_p (rtx_insn *);
 extern bool prefixed_paddi_p (rtx_insn *);
-extern bool prefixed_xxsplti_p (rtx_insn *);
 extern void rs6000_asm_output_opcode (FILE *);
 extern void output_pcrel_opt_reloc (rtx);
 extern void rs6000_final_prescan_insn (rtx_insn *, rtx [], int);
@@ -223,31 +222,6 @@ address_is_prefixed (rtx addr,
   return (iform == INSN_FORM_PREFIXED_NUMERIC
 	  || iform == INSN_FORM_PCREL_LOCAL);
 }
-
-/* Functions and data structures relating to 128-bit vector constants.  All
-   fields are kept in big endian order.  */
-#define VECTOR_CONST_BITS	128
-#define VECTOR_CONST_BYTES	(VECTOR_CONST_BITS / 8)
-#define VECTOR_CONST_16BIT	(VECTOR_CONST_BITS / 16)
-#define VECTOR_CONST_32BIT	(VECTOR_CONST_BITS / 32)
-#define VECTOR_CONST_64BIT	(VECTOR_CONST_BITS / 64)
-
-typedef struct {
-  /* Vector constant as various sized items.  */
-  unsigned HOST_WIDE_INT d_words[VECTOR_CONST_64BIT];
-  unsigned int words[VECTOR_CONST_32BIT];
-  unsigned short h_words[VECTOR_CONST_16BIT];
-  unsigned char bytes[VECTOR_CONST_BYTES];
-  machine_mode orig_mode;		/* Original mode.  */
-  unsigned int xxspltidp_immediate;	/* Immediate value for XXSPLTIDP.  */
-  unsigned int xxspltiw_immediate;	/* Immediate value for XXSPLTIW.  */
-  unsigned int lxvkq_immediate;		/* Immediate to use with LXVKQ.  */
-} rs6000_vec_const;
-
-extern bool vec_const_to_bytes (rtx, machine_mode, rs6000_vec_const *);
-extern bool vec_const_use_xxspltidp (rs6000_vec_const *);
-extern bool vec_const_use_xxspltiw (rs6000_vec_const *);
-extern bool vec_const_use_lxvkq (rs6000_vec_const *);
 #endif /* RTX_CODE */
 
 #ifdef TREE_CODE
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 838161fb23a..acba4d9f26c 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -6925,17 +6925,12 @@ xxspltib_constant_p (rtx op,
   else
     return false;
 
-  /* See if we could generate vspltisw/vspltish/xxspltiw directly instead of
-     xxspltib + sign extend.  Special case 0/-1 to allow getting any VSX
-     register instead of an Altivec register.  */
-  if ((mode == V4SImode || mode == V8HImode) && !IN_RANGE (value, -1, 0))
-    {
-      if (EASY_VECTOR_15 (value))
-	return false;
-
-      if (TARGET_XXSPLTIW && TARGET_PREFIXED && TARGET_VSX)
-	return false;
-    }
+  /* See if we could generate vspltisw/vspltish directly instead of xxspltib +
+     sign extend.  Special case 0/-1 to allow getting any VSX register instead
+     of an Altivec register.  */
+  if ((mode == V4SImode || mode == V8HImode) && !IN_RANGE (value, -1, 0)
+      && EASY_VECTOR_15 (value))
+    return false;
 
   /* Return # of instructions and the constant byte for XXSPLTIB.  */
   if (mode == V16QImode)
@@ -6995,68 +6990,6 @@ output_vec_const_move (rtx *operands)
 	    gcc_unreachable ();
 	}
 
-      rs6000_vec_const vec_const;
-      if (TARGET_POWER10 && vec_const_to_bytes (vec, mode, &vec_const))
-	{
-	  if (vec_const_use_lxvkq (&vec_const))
-	    {
-	      operands[2] = GEN_INT (vec_const.lxvkq_immediate);
-	      return "lxvkq %x0,%2";
-	    }
-
-	  if (vec_const_use_xxspltidp (&vec_const))
-	    {
-	      operands[2] = GEN_INT (vec_const.xxspltidp_immediate);
-	      return "xxspltidp %x0,%2";
-	    }
-
-	  if (vec_const_use_xxspltiw (&vec_const))
-	    {
-	      HOST_WIDE_INT imm = vec_const.xxspltiw_immediate;
-
-	      /* See if we can generate the shorter VSPLTISB, VSPLTISH, or
-		 VSPLTISW instead of XXSPLTIW.  */
-	      if (dest_vmx_p)
-		{
-		  HOST_WIDE_INT sign_imm
-		    = ((imm & 0xffffffff) ^ 0x80000000) - 0x80000000;
-
-		  if (EASY_VECTOR_15 (sign_imm))
-		    {
-		      operands[2] = GEN_INT (sign_imm);
-		      return "vspltisw %0,%2";
-		    }
-
-		  if (vec_const.bytes[0] == vec_const.bytes[1]
-		      && vec_const.bytes[0] == vec_const.bytes[2]
-		      && vec_const.bytes[0] == vec_const.bytes[3])
-		    {
-		      HOST_WIDE_INT sign_imm8 = ((imm & 0xff) ^ 0x80) - 0x80;
-		      if (EASY_VECTOR_15 (sign_imm8))
-			{
-			  operands[2] = GEN_INT (sign_imm8);
-			  return "vspltisb %0,%2";
-			}
-		    }
-
-		  if (vec_const.h_words[0] == vec_const.h_words[1])
-		    {
-		      HOST_WIDE_INT sign_imm16
-			= ((imm & 0xffff) ^ 0x8000) - 0x8000;
-
-		      if (EASY_VECTOR_15 (sign_imm16))
-			{
-			  operands[2] = GEN_INT (sign_imm16);
-			  return "vspltish %0,%2";
-			}
-		    }
-		}
-
-	      operands[2] = GEN_INT (imm);
-	      return "xxspltiw %x0,%2";
-	    }
-	}
-
       if (TARGET_P9_VECTOR
 	  && xxspltib_constant_p (vec, mode, &num_insns, &xxspltib_value))
 	{
@@ -26791,44 +26724,6 @@ prefixed_paddi_p (rtx_insn *insn)
   return (iform == INSN_FORM_PCREL_EXTERNAL || iform == INSN_FORM_PCREL_LOCAL);
 }
 
-/* Whether a permute type instruction is a prefixed XXSPLTI* instruction.
-   This is called from the prefixed attribute processing.  */
-
-bool
-prefixed_xxsplti_p (rtx_insn *insn)
-{
-  rtx set = single_set (insn);
-  if (!set)
-    return false;
-
-  rtx dest = SET_DEST (set);
-  rtx src = SET_SRC (set);
-  machine_mode mode = GET_MODE (dest);
-
-  if (!REG_P (dest) && !SUBREG_P (dest))
-    return false;
-
-  if (GET_CODE (src) == UNSPEC)
-    {
-      int unspec = XINT (src, 1);
-      return (unspec == UNSPEC_XXSPLTIW
-	      || unspec == UNSPEC_XXSPLTIDP
-	      || unspec == UNSPEC_XXSPLTI32DX);
-    }
-
-  rs6000_vec_const vec_const;
-  if (vec_const_to_bytes (src, mode, &vec_const))
-    {
-      if (vec_const_use_xxspltidp (&vec_const))
-	return true;
-
-      if (vec_const_use_xxspltiw (&vec_const))
-	return true;
-    }
-
-  return false;
-}
-
 /* Whether the next instruction needs a 'p' prefix issued before the
    instruction is printed out.  */
 static bool prepend_p_to_next_insn;
@@ -28692,423 +28587,6 @@ rs6000_output_addr_vec_elt (FILE *file, int value)
   fprintf (file, "\n");
 }
 
-\f
-/* Copy an integer constant to the vector constant structure.  */
-
-static void
-vec_const_integer (rtx op,
-		   machine_mode mode,
-		   size_t byte_num,
-		   rs6000_vec_const *vec_const)
-{
-  unsigned HOST_WIDE_INT uvalue = UINTVAL (op);
-  unsigned bitsize = GET_MODE_BITSIZE (mode);
-
-  for (int shift = bitsize - 8; shift >= 0; shift -= 8)
-    vec_const->bytes[byte_num++] = (uvalue >> shift) & 0xff;
-}
-
-/* Copy an floating point constant to the vector constant structure.  */
-
-static void
-vec_const_floating_point (rtx op,
-			  machine_mode mode,
-			  size_t byte_num,
-			  rs6000_vec_const *vec_const)
-{
-  unsigned bitsize = GET_MODE_BITSIZE (mode);
-  unsigned num_words = bitsize / 32;
-  const REAL_VALUE_TYPE *rtype = CONST_DOUBLE_REAL_VALUE (op);
-  long real_words[VECTOR_CONST_32BIT];
-
-  /* Make sure we don't overflow the real_words array and that it is
-     filled completely.  */
-  gcc_assert (bitsize <= VECTOR_CONST_BITS && (bitsize % 32) == 0);
-
-  real_to_target (real_words, rtype, mode);
-
-  /* Iterate over each 32-bit word in the floating point constant.  The
-     real_to_target function puts out words in endian fashion.  We need
-     to arrange so the words are written in big endian order.  */
-  for (unsigned num = 0; num < num_words; num++)
-    {
-      unsigned endian_num = (BYTES_BIG_ENDIAN
-			     ? num
-			     : num_words - 1 - num);
-
-      unsigned uvalue = real_words[endian_num];
-      for (int shift = 32 - 8; shift >= 0; shift -= 8)
-	vec_const->bytes[byte_num++] = (uvalue >> shift) & 0xff;
-    }
-}
-
-/* Determine if a vector constant can be loaded with XXSPLTIDP.  If so,
-   fill out the fields used to generate the instruction.  */
-
-bool
-vec_const_use_xxspltidp (rs6000_vec_const *vec_const)
-{
-  if (!TARGET_XXSPLTIDP || !TARGET_PREFIXED || !TARGET_VSX)
-    return false;
-
-  /* Make sure that the two 64-bit segments are the same.  */
-  unsigned HOST_WIDE_INT df_upper = vec_const->d_words[0];
-  unsigned HOST_WIDE_INT df_lower = vec_const->d_words[1];
-  if (df_upper != df_lower)
-    return false;
-  
-  /* Avoid 0 since that is easy to generate without using XXSPLTIDP.  */
-  if (df_upper == 0)
-    return false;
-
-  /* Avoid values that look like DFmode NaN's, except for the normal NaN bit
-     pattern and signalling NaN bit pattern.  Recognize infinity and negative
-     infinity.
-
-     The IEEE 754 64-bit floating format has 1 bit for sign, 11 bits for the
-     exponent, and 52 bits for the mantissa (not counting the hidden bit used
-     for normal numbers).  NaN values have the exponent set to all 1 bits, and
-     the mantissa non-zero (mantissa == 0 is infinity).  */
-
-  /* Bit representation of DFmode normal quiet NaN.  */
-#define VECTOR_CONST_DF_NAN	HOST_WIDE_INT_UC (0x7ff8000000000000)
-
-  /* Bit representation of DFmode normal signaling NaN.  */
-#define VECTOR_CONST_DF_NANS	HOST_WIDE_INT_UC (0x7ff4000000000000)
-
-  /* Bit representation of DFmode positive infinity.  */
-#define VECTOR_CONST_DF_INF	HOST_WIDE_INT_UC (0x7ff0000000000000)
-
-  /* Bit representation of DFmode negative infinity.  */
-#define VECTOR_CONST_DF_NEG_INF	HOST_WIDE_INT_UC (0xfff0000000000000)
-
-  if (df_upper != VECTOR_CONST_DF_NAN
-      && df_upper != VECTOR_CONST_DF_NANS
-      && df_upper != VECTOR_CONST_DF_INF
-      && df_upper != VECTOR_CONST_DF_NEG_INF)
-    {
-      int df_exponent = (df_upper >> 52) & 0x7ff;
-      unsigned HOST_WIDE_INT df_mantissa
-	= df_upper & ((HOST_WIDE_INT_1U << 52) - HOST_WIDE_INT_1U);
-
-      if (df_exponent == 0x7ff && df_mantissa != 0)	/* other NaNs.  */
-	return false;
-
-      /* Avoid values that are DFmode subnormal values.  Subnormal numbers have
-	 the exponent all 0 bits, and the mantissa non-zero.  If the value is
-	 subnormal, then the hidden bit in the mantissa is not set.  */
-      if (df_exponent == 0 && df_mantissa != 0)		/* subnormal.  */
-	return false;
-    }
-
-  /* Change the representation to DFmode constant.  */
-  long df_words[2] = { vec_const->words[0], vec_const->words[1] };
-
-  /* real_from_target takes the target words in  target order.  */
-  if (!BYTES_BIG_ENDIAN)
-    std::swap (df_words[0], df_words[1]);
-
-  REAL_VALUE_TYPE rv_type;
-  real_from_target (&rv_type, df_words, DFmode);
-
-  const REAL_VALUE_TYPE *rv = &rv_type;
-
-  /* Validate that the number can be stored as a SFmode value.  */
-  if (!exact_real_truncate (SFmode, rv))
-    return false;
-
-  /* Validate that the number is not a SFmode subnormal value (exponent is 0,
-     mantissa field is non-zero) which is undefined for the XXSPLTIDP
-     instruction.  */
-  long sf_value;
-  real_to_target (&sf_value, rv, SFmode);
-
-  /* IEEE 754 32-bit values have 1 bit for the sign, 8 bits for the exponent,
-     and 23 bits for the mantissa.  Subnormal numbers have the exponent all
-     0 bits, and the mantissa non-zero.  */
-  long sf_exponent = (sf_value >> 23) & 0xFF;
-  long sf_mantissa = sf_value & 0x7FFFFF;
-
-  if (sf_exponent == 0 && sf_mantissa != 0)
-    return false;
-
-  /* Record the information in the vec_const structure for XXSPLTIDP.  */
-  vec_const->xxspltidp_immediate = sf_value;
-
-  return true;
-}
-
-/* Determine if a vector constant can be loaded with XXSPLTIW.  If so,
-   fill out the fields used to generate the instruction.  */
-
-bool
-vec_const_use_xxspltiw (rs6000_vec_const *vec_const)
-{
-  if (!TARGET_XXSPLTIW || !TARGET_PREFIXED || !TARGET_VSX)
-    return false;
-
-  /* Make sure that each of the 4 32-bit segments are the same.  */
-  unsigned int value = vec_const->words[0];
-  if (value != vec_const->words[1]
-      || value != vec_const->words[2]
-      || value != vec_const->words[3])
-    return false;
-
-  /* Avoid values that are easy to create with other instructions (0.0 for
-     floating point, and values that can be loaded with VSPLTISW, VSPLTISH,
-     VSPLTISB, or XXSPLTISB.  */
-  if (value == 0)
-    return false;
-
-  machine_mode mode = vec_const->orig_mode;
-  if (mode == VOIDmode)
-    mode = SImode;
-
-  if (!FLOAT_MODE_P (mode))
-    {
-      /* Can we use VSPLTISW to load the constant?  */
-      int sign_value = ((value & 0xffffffff) ^ 0x80000000) - 0x80000000;
-      if (EASY_VECTOR_15 (sign_value))
-	return false;
-
-      /* Can we use VSPLTISH to load the constant?  */
-      if (vec_const->h_words[0] == vec_const->h_words[1])
-	{
-	  int sign_value16 = ((value & 0xffff) ^ 0x8000) - 0x8000;
-	  if (EASY_VECTOR_15 (sign_value16))
-	    return false;
-	}
-
-      /* Can we use XXSPLTISB/VSPLTISB to load the constant?  */
-      if (vec_const->bytes[0] == vec_const->bytes[1]
-	  && vec_const->bytes[0] == vec_const->bytes[2]
-	  && vec_const->bytes[0] == vec_const->bytes[3])
-	return false;
-    }
-
-  /* Record the immediate in the vec_const structure for XXSPLTIW.  */
-  vec_const->xxspltiw_immediate = value;
-
-  return true;
-}
-
-/* Determine if a vector constant can be loaded with LXVKQ.  If so, fill out
-   the fields used to generate the instruction.  */
-
-bool
-vec_const_use_lxvkq (rs6000_vec_const *vec_const)
-{
-  unsigned immediate;
-
-  if (!TARGET_LXVKQ || !TARGET_PREFIXED || !TARGET_VSX)
-    return false;
-
-  /* Verify that all of the bottom 3 words in the constants loaded by the
-     LXVKQ instruction are zero.  */
-  for (size_t i = 1; i < VECTOR_CONST_32BIT; i++)
-    if (vec_const->words[i] != 0)
-      return false;
-
-  /* See if we have a match.  */
-  switch (vec_const->words[0])
-    {
-    case 0x3FFF0000U: immediate = 1;  break;	/* IEEE 128-bit +1.0.  */
-    case 0x40000000U: immediate = 2;  break;	/* IEEE 128-bit +2.0.  */
-    case 0x40008000U: immediate = 3;  break;	/* IEEE 128-bit +3.0.  */
-    case 0x40010000U: immediate = 4;  break;	/* IEEE 128-bit +4.0.  */
-    case 0x40014000U: immediate = 5;  break;	/* IEEE 128-bit +5.0.  */
-    case 0x40018000U: immediate = 6;  break;	/* IEEE 128-bit +6.0.  */
-    case 0x4001C000U: immediate = 7;  break;	/* IEEE 128-bit +7.0.  */
-    case 0x7FFF0000U: immediate = 8;  break;	/* IEEE 128-bit +Infinity.  */
-    case 0x7FFF8000U: immediate = 9;  break;	/* IEEE 128-bit quiet NaN.  */
-    case 0x80000000U: immediate = 16; break;	/* IEEE 128-bit -0.0.  */
-    case 0xBFFF0000U: immediate = 17; break;	/* IEEE 128-bit -1.0.  */
-    case 0xC0000000U: immediate = 18; break;	/* IEEE 128-bit -2.0.  */
-    case 0xC0008000U: immediate = 19; break;	/* IEEE 128-bit -3.0.  */
-    case 0xC0010000U: immediate = 20; break;	/* IEEE 128-bit -4.0.  */
-    case 0xC0014000U: immediate = 21; break;	/* IEEE 128-bit -5.0.  */
-    case 0xC0018000U: immediate = 22; break;	/* IEEE 128-bit -6.0.  */
-    case 0xC001C000U: immediate = 23; break;	/* IEEE 128-bit -7.0.  */
-    case 0xFFFF0000U: immediate = 24; break;	/* IEEE 128-bit -Infinity.  */
-
-      /* anything else cannot be loaded.  */
-    default:
-      return false;
-    }
-
-  /* We can use the LXVKQ instruction, record the immediate needed for the
-     instruction.  */
-  vec_const->lxvkq_immediate = immediate;
-  return true;
-}
-
-/* Convert a vector constant to an internal structure, breaking it out to
-   bytes, half words, words, and double words.  Return true if we have
-   successfully broken it out.  */
-
-bool
-vec_const_to_bytes (rtx op,
-		    machine_mode mode,
-		    rs6000_vec_const *vec_const)
-{
-  /* Initialize vec const structure.  */
-  memset ((void *)vec_const, 0, sizeof (rs6000_vec_const));
-
-  /* Set up the vector bits.  */
-  switch (GET_CODE (op))
-    {
-      /* Integer constants, default to double word.  */
-    case CONST_INT:
-      {
-	/* Scalars are treated as 64-bit integers.  */
-	if (mode == VOIDmode)
-	  mode = DImode;
-
-	vec_const_integer (op, mode, 0, vec_const);
-
-	/* Splat the constant to the rest of the vector constant structure.  */
-	unsigned size = GET_MODE_SIZE (mode);
-	gcc_assert (size <= VECTOR_CONST_BYTES);
-	gcc_assert ((VECTOR_CONST_BYTES % size) == 0);
-
-	for (size_t splat = size; splat < VECTOR_CONST_BYTES; splat += size)
-	  memcpy ((void *) &vec_const->bytes[splat],
-		  (void *) &vec_const->bytes[0],
-		  size);
-	break;
-      }
-
-      /* Floating point constants.  */
-    case CONST_DOUBLE:
-      {
-	/* Fail if the floating point constant is the wrong mode.  */
-	if (mode == VOIDmode)
-	  mode = GET_MODE (op);
-
-	else if (GET_MODE (op) != mode)
-	  return false;
-
-	/* SFmode stored as scalars are stored in DFmode format.  */
-	if (mode == SFmode)
-	  mode = DFmode;
-
-	vec_const_floating_point (op, mode, 0, vec_const);
-
-	/* Splat the constant to the rest of the vector constant structure.  */
-	unsigned size = GET_MODE_SIZE (mode);
-	gcc_assert (size <= VECTOR_CONST_BYTES);
-	gcc_assert ((VECTOR_CONST_BYTES % size) == 0);
-
-	for (size_t splat = size; splat < VECTOR_CONST_BYTES; splat += size)
-	  memcpy ((void *) &vec_const->bytes[splat],
-		  (void *) &vec_const->bytes[0],
-		  size);
-	break;
-      }
-
-      /* Vector constants, iterate each element.  On little endian systems, we
-	 have to reverse the element numbers.  */
-    case CONST_VECTOR:
-      {
-	/* Fail if the vector constant is the wrong mode.  */
-	if (mode == VOIDmode)
-	  mode = GET_MODE (op);
-
-	else if (GET_MODE (op) != mode)
-	  return false;
-
-	machine_mode ele_mode = GET_MODE_INNER (mode);
-	size_t nunits = GET_MODE_NUNITS (mode);
-	size_t size = GET_MODE_SIZE (ele_mode);
-
-	for (size_t num = 0; num < nunits; num++)
-	  {
-	    rtx ele = (GET_CODE (op) == VEC_DUPLICATE
-		       ? XEXP (op, 0)
-		       : CONST_VECTOR_ELT (op, num));
-	    size_t byte_num = (BYTES_BIG_ENDIAN
-			       ? num
-			       : nunits - 1 - num) * size;
-
-	    if (CONST_INT_P (ele))
-	      vec_const_integer (ele, ele_mode, byte_num, vec_const);
-	    else if (CONST_DOUBLE_P (ele))
-	      vec_const_floating_point (ele, ele_mode, byte_num, vec_const);
-	    else
-	      return false;
-	  }
-
-	break;
-      }
-
-	/* Treat VEC_DUPLICATE of a constant just like a vector constant.  */
-    case VEC_DUPLICATE:
-      {
-	/* Fail if the vector duplicate is the wrong mode.  */
-	if (mode == VOIDmode)
-	  mode = GET_MODE (op);
-
-	else if (GET_MODE (op) != mode)
-	  return false;
-
-	machine_mode ele_mode = GET_MODE_INNER (mode);
-	size_t nunits = GET_MODE_NUNITS (mode);
-	size_t size = GET_MODE_SIZE (ele_mode);
-	rtx ele = XEXP (op, 0);
-
-	if (!CONST_INT_P (ele) && !CONST_DOUBLE_P (ele))
-	  return false;
-
-	for (size_t num = 0; num < nunits; num++)
-	  {
-	    size_t byte_num = num * size;
-
-	    if (CONST_INT_P (ele))
-	      vec_const_integer (ele, ele_mode, byte_num, vec_const);
-	    else
-	      vec_const_floating_point (ele, ele_mode, byte_num, vec_const);
-	  }
-
-	break;
-      }
-
-      /* Any thing else, just return failure.  */
-    default:
-      return false;
-    }
-
-  /* Pack half words together.  */
-  for (size_t i = 0; i < VECTOR_CONST_16BIT; i++)
-    vec_const->h_words[i] = ((vec_const->bytes[2*i] << 8)
-			     | vec_const->bytes[2*i + 1]);
-
-  /* Pack words together.  */
-  for (size_t i = 0; i < VECTOR_CONST_32BIT; i++)
-    {
-      unsigned word = 0;
-      for (size_t j = 0; j < 4; j++)
-	word = (word << 8) | vec_const->bytes[(4*i) + j];
-
-      vec_const->words[i] = word;
-    }
-
-  /* Pack double words together.  */
-  for (size_t i = 0; i < VECTOR_CONST_64BIT; i++)
-    {
-      unsigned HOST_WIDE_INT d_word = 0;
-      for (size_t j = 0; j < 8; j++)
-	d_word = (d_word << 8) | vec_const->bytes[(8*i) + j];
-
-      vec_const->d_words[i] = d_word;
-    }
-
-  /* Remember original mode that the vector/scalar used.  */
-  vec_const->orig_mode = mode;
-
-  return true;
-}
-
-\f
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 #include "gt-rs6000.h"
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 79ea4a82b4f..6bec2bddbde 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -314,11 +314,6 @@
 
 	 (eq_attr "type" "integer,add")
 	 (if_then_else (match_test "prefixed_paddi_p (insn)")
-		       (const_string "yes")
-		       (const_string "no"))
-
-	 (eq_attr "type" "vecperm")
-	 (if_then_else (match_test "prefixed_xxsplti_p (insn)")
 		       (const_string "yes")
 		       (const_string "no"))]
 
@@ -7764,17 +7759,17 @@
 ;;
 ;;	LWZ          LFS        LXSSP       LXSSPX     STFS       STXSSP
 ;;	STXSSPX      STW        XXLXOR      LI         FMR        XSCPSGNDP
-;;	MR           MT<x>      MF<x>       NOP        XXSPLTIDP
+;;	MR           MT<x>      MF<x>       NOP
 
 (define_insn "movsf_hardfloat"
   [(set (match_operand:SF 0 "nonimmediate_operand"
 	 "=!r,       f,         v,          wa,        m,         wY,
 	  Z,         m,         wa,         !r,        f,         wa,
-	  !r,        *c*l,      !r,         *h,        wa")
+	  !r,        *c*l,      !r,         *h")
 	(match_operand:SF 1 "input_operand"
 	 "m,         m,         wY,         Z,         f,         v,
 	  wa,        r,         j,          j,         f,         wa,
-	  r,         r,         *h,         0,         eS"))]
+	  r,         r,         *h,         0"))]
   "(register_operand (operands[0], SFmode)
    || register_operand (operands[1], SFmode))
    && TARGET_HARD_FLOAT
@@ -7796,16 +7791,15 @@
    mr %0,%1
    mt%0 %1
    mf%1 %0
-   nop
-   #"
+   nop"
   [(set_attr "type"
 	"load,       fpload,    fpload,     fpload,    fpstore,   fpstore,
 	 fpstore,    store,     veclogical, integer,   fpsimple,  fpsimple,
-	 *,          mtjmpr,    mfjmpr,     *,         vecperm")
+	 *,          mtjmpr,    mfjmpr,     *")
    (set_attr "isa"
 	"*,          *,         p9v,        p8v,       *,         p9v,
 	 p8v,        *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         p10")])
+	 *,          *,         *,          *")])
 
 ;;	LWZ          LFIWZX     STW        STFIWX     MTVSRWZ    MFVSRWZ
 ;;	FMR          MR         MT%0       MF%1       NOP
@@ -8065,18 +8059,18 @@
 
 ;;           STFD         LFD         FMR         LXSD        STXSD
 ;;           LXSD         STXSD       XXLOR       XXLXOR      GPR<-0
-;;           LWZ          STW         MR          XXSPLTIDP
+;;           LWZ          STW         MR
 
 
 (define_insn "*mov<mode>_hardfloat32"
   [(set (match_operand:FMOVE64 0 "nonimmediate_operand"
             "=m,          d,          d,          <f64_p9>,   wY,
               <f64_av>,   Z,          <f64_vsx>,  <f64_vsx>,  !r,
-              Y,          r,          !r,         wa")
+              Y,          r,          !r")
 	(match_operand:FMOVE64 1 "input_operand"
              "d,          m,          d,          wY,         <f64_p9>,
               Z,          <f64_av>,   <f64_vsx>,  <zero_fp>,  <zero_fp>,
-              r,          Y,          r,          eS"))]
+              r,          Y,          r"))]
   "! TARGET_POWERPC64 && TARGET_HARD_FLOAT
    && (gpc_reg_operand (operands[0], <MODE>mode)
        || gpc_reg_operand (operands[1], <MODE>mode))"
@@ -8093,21 +8087,20 @@
    #
    #
    #
-   #
    #"
   [(set_attr "type"
             "fpstore,     fpload,     fpsimple,   fpload,     fpstore,
              fpload,      fpstore,    veclogical, veclogical, two,
-             store,       load,       two,        vecperm")
+             store,       load,       two")
    (set_attr "size" "64")
    (set_attr "length"
             "*,           *,          *,          *,          *,
              *,           *,          *,          *,          8,
-             8,           8,          8,          *")
+             8,           8,          8")
    (set_attr "isa"
             "*,           *,          *,          p9v,        p9v,
              p7v,         p7v,        *,          *,          *,
-             *,           *,          *,          p10")])
+             *,           *,          *")])
 
 ;;           STW      LWZ     MR      G-const H-const F-const
 
@@ -8134,19 +8127,19 @@
 ;;           STFD         LFD         FMR         LXSD        STXSD
 ;;           LXSDX        STXSDX      XXLOR       XXLXOR      LI 0
 ;;           STD          LD          MR          MT{CTR,LR}  MF{CTR,LR}
-;;           NOP          MFVSRD      MTVSRD      XXSPLTIDP
+;;           NOP          MFVSRD      MTVSRD
 
 (define_insn "*mov<mode>_hardfloat64"
   [(set (match_operand:FMOVE64 0 "nonimmediate_operand"
            "=m,           d,          d,          <f64_p9>,   wY,
              <f64_av>,    Z,          <f64_vsx>,  <f64_vsx>,  !r,
              YZ,          r,          !r,         *c*l,       !r,
-            *h,           r,          <f64_dm>,   wa")
+            *h,           r,          <f64_dm>")
 	(match_operand:FMOVE64 1 "input_operand"
             "d,           m,          d,          wY,         <f64_p9>,
              Z,           <f64_av>,   <f64_vsx>,  <zero_fp>,  <zero_fp>,
              r,           YZ,         r,          r,          *h,
-             0,           <f64_dm>,   r,          eS"))]
+             0,           <f64_dm>,   r"))]
   "TARGET_POWERPC64 && TARGET_HARD_FLOAT
    && (gpc_reg_operand (operands[0], <MODE>mode)
        || gpc_reg_operand (operands[1], <MODE>mode))"
@@ -8168,19 +8161,18 @@
    mf%1 %0
    nop
    mfvsrd %0,%x1
-   mtvsrd %x0,%1
-   #"
+   mtvsrd %x0,%1"
   [(set_attr "type"
             "fpstore,     fpload,     fpsimple,   fpload,     fpstore,
              fpload,      fpstore,    veclogical, veclogical, integer,
              store,       load,       *,          mtjmpr,     mfjmpr,
-             *,           mfvsr,      mtvsr,      vecperm")
+             *,           mfvsr,      mtvsr")
    (set_attr "size" "64")
    (set_attr "isa"
             "*,           *,          *,          p9v,        p9v,
              p7v,         p7v,        *,          *,          *,
              *,           *,          *,          *,          *,
-             *,           p8v,        p8v,        p10")])
+             *,           p8v,        p8v")])
 
 ;;           STD      LD       MR      MT<SPR> MF<SPR> G-const
 ;;           H-const  F-const  Special
@@ -9228,7 +9220,6 @@
 ;; a gpr into a fpr instead of reloading an invalid 'Y' address
 
 ;;        GPR store  GPR load   GPR move   FPR store  FPR load   FPR move
-;;        XXSPLTIDP
 ;;        GPR const  AVX store  AVX store  AVX load   AVX load   VSX move
 ;;        P9 0       P9 -1      AVX 0/-1   VSX 0      VSX -1     P9 const
 ;;        AVX const  
@@ -9236,13 +9227,11 @@
 (define_insn "*movdi_internal32"
   [(set (match_operand:DI 0 "nonimmediate_operand"
          "=Y,        r,         r,         m,         ^d,        ^d,
-          ^wa,
           r,         wY,        Z,         ^v,        $v,        ^wa,
           wa,        wa,        v,         wa,        *i,        v,
           v")
 	(match_operand:DI 1 "input_operand"
          "r,         Y,         r,         ^d,        m,         ^d,
-          eS,
           IJKnF,     ^v,        $v,        wY,        Z,         ^wa,
           Oj,        wM,        OjwM,      Oj,        wM,        wS,
           wB"))]
@@ -9257,7 +9246,6 @@
    lfd%U1%X1 %0,%1
    fmr %0,%1
    #
-   #
    stxsd %1,%0
    stxsdx %x1,%y0
    lxsd %0,%1
@@ -9272,20 +9260,17 @@
    #"
   [(set_attr "type"
          "store,     load,      *,         fpstore,   fpload,    fpsimple,
-          vecperm,
           *,         fpstore,   fpstore,   fpload,    fpload,    veclogical,
           vecsimple, vecsimple, vecsimple, veclogical,veclogical,vecsimple,
           vecsimple")
    (set_attr "size" "64")
    (set_attr "length"
          "8,         8,         8,         *,         *,         *,
-          *,
           16,        *,         *,         *,         *,         *,
           *,         *,         *,         *,         *,         8,
           *")
    (set_attr "isa"
          "*,         *,         *,         *,         *,         *,
-          p10,
           *,         p9v,       p7v,       p9v,       p7v,       *,
           p9v,       p9v,       p7v,       *,         *,         p7v,
           p7v")])
@@ -9321,7 +9306,6 @@
 })
 
 ;;	   GPR store   GPR load    GPR move
-;;	   XXSPLTIDP
 ;;	   GPR li      GPR lis     GPR pli     GPR #
 ;;	   FPR store   FPR load    FPR move
 ;;	   AVX store   AVX store   AVX load    AVX load    VSX move
@@ -9332,7 +9316,6 @@
 (define_insn "*movdi_internal64"
   [(set (match_operand:DI 0 "nonimmediate_operand"
 	  "=YZ,        r,          r,
-	   ^wa,
 	   r,          r,          r,          r,
 	   m,          ^d,         ^d,
 	   wY,         Z,          $v,         $v,         ^wa,
@@ -9342,7 +9325,6 @@
 	   ?r,         ?wa")
 	(match_operand:DI 1 "input_operand"
 	  "r,          YZ,         r,
-	   eS,
 	   I,          L,          eI,         nF,
 	   ^d,         m,          ^d,
 	   ^v,         $v,         wY,         Z,          ^wa,
@@ -9357,7 +9339,6 @@
    std%U0%X0 %1,%0
    ld%U1%X1 %0,%1
    mr %0,%1
-   #
    li %0,%1
    lis %0,%v1
    li %0,%1
@@ -9384,7 +9365,6 @@
    mtvsrd %x0,%1"
   [(set_attr "type"
 	  "store,      load,       *,
-	   vecperm,
 	   *,          *,          *,          *,
 	   fpstore,    fpload,     fpsimple,
 	   fpstore,    fpstore,    fpload,     fpload,     veclogical,
@@ -9395,7 +9375,6 @@
    (set_attr "size" "64")
    (set_attr "length"
 	  "*,          *,          *,
-	   *,
 	   *,          *,          *,          20,
 	   *,          *,          *,
 	   *,          *,          *,          *,          *,
@@ -9405,7 +9384,6 @@
 	   *,          *")
    (set_attr "isa"
 	  "*,          *,          *,
-	   p10,
 	   *,          *,          p10,        *,
 	   *,          *,          *,
 	   p9v,        p7v,        p9v,        p7v,        *,
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 015bf91b6d5..9d7878f144a 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -640,18 +640,6 @@ mprivileged
 Target Var(rs6000_privileged) Init(0)
 Generate code that will run in privileged state.
 
-mxxspltidp
-Target Undocumented Var(TARGET_XXSPLTIDP) Init(1) Save
-Generate (do not generate) XXSPLTIDP instructions.
-
-mxxspltiw
-Target Undocumented Var(TARGET_XXSPLTIW) Init(1) Save
-Generate (do not generate) XXSPLTIW instructions.
-
-mlxvkq
-Target Undocumented Var(TARGET_LXVKQ) Init(1) Save
-Generate (do not generate) LXVKQ instructions.
-
 -param=rs6000-density-pct-threshold=
 Target Undocumented Joined UInteger Var(rs6000_density_pct_threshold) Init(85) IntegerRange(0, 100) Param
 When costing for loop vectorization, we probably need to penalize the loop body
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index 07b0b671920..bf033e31c1c 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -1192,19 +1192,16 @@
 
 ;;              VSX store  VSX load   VSX move  VSX->GPR   GPR->VSX    LQ (GPR)
 ;;              STQ (GPR)  GPR load   GPR store GPR move   XXSPLTIB    VSPLTISW
-;;              XXLSPLTI*  LXVKQ
 ;;              VSX 0/-1   VMX const  GPR const LVX (VMX)  STVX (VMX)
 (define_insn "vsx_mov<mode>_64bit"
   [(set (match_operand:VSX_M 0 "nonimmediate_operand"
                "=ZwO,      wa,        wa,        r,         we,        ?wQ,
                 ?&r,       ??r,       ??Y,       <??r>,     wa,        v,
-                wa,        wa,
                 ?wa,       v,         <??r>,     wZ,        v")
 
 	(match_operand:VSX_M 1 "input_operand" 
                "wa,        ZwO,       wa,        we,        r,         r,
                 wQ,        Y,         r,         r,         wE,        jwM,
-                eV,        eQ,
                 ?jwM,      W,         <nW>,      v,         wZ"))]
 
   "TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode)
@@ -1216,47 +1213,36 @@
   [(set_attr "type"
                "vecstore,  vecload,   vecsimple, mtvsr,     mfvsr,     load,
                 store,     load,      store,     *,         vecsimple, vecsimple,
-                vecperm,   vecperm,
                 vecsimple, *,         *,         vecstore,  vecload")
    (set_attr "num_insns"
                "*,         *,         *,         2,         *,         2,
                 2,         2,         2,         2,         *,         *,
-                *,         *,
                 *,         5,         2,         *,         *")
    (set_attr "max_prefixed_insns"
                "*,         *,         *,         *,         *,         2,
                 2,         2,         2,         2,         *,         *,
-                *,         *,
                 *,         *,         *,         *,         *")
    (set_attr "length"
                "*,         *,         *,         8,         *,         8,
                 8,         8,         8,         8,         *,         *,
-                *,         *,
                 *,         20,        8,         *,         *")
    (set_attr "isa"
                "<VSisa>,   <VSisa>,   <VSisa>,   *,         *,         *,
                 *,         *,         *,         *,         p9v,       *,
-                p10,       p10,
                 <VSisa>,   *,         *,         *,         *")])
 
 ;;              VSX store  VSX load   VSX move   GPR load   GPR store  GPR move
-;;              XXSPLTIB   VSPLTISW   VSX 0/-1
-;;              XXSPLTI*   LXVKQ
-;;              VMX const  GPR const
+;;              XXSPLTIB   VSPLTISW   VSX 0/-1   VMX const  GPR const
 ;;              LVX (VMX)  STVX (VMX)
 (define_insn "*vsx_mov<mode>_32bit"
   [(set (match_operand:VSX_M 0 "nonimmediate_operand"
                "=ZwO,      wa,        wa,        ??r,       ??Y,       <??r>,
-                wa,        v,         ?wa,
-                wa,        wa,
-                v,         <??r>,
+                wa,        v,         ?wa,       v,         <??r>,
                 wZ,        v")
 
 	(match_operand:VSX_M 1 "input_operand" 
                "wa,        ZwO,       wa,        Y,         r,         r,
-                wE,        jwM,       ?jwM,
-                eV,        eQ,
-                W,         <nW>,
+                wE,        jwM,       ?jwM,      W,         <nW>,
                 v,         wZ"))]
 
   "!TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode)
@@ -1267,21 +1253,15 @@
 }
   [(set_attr "type"
                "vecstore,  vecload,   vecsimple, load,      store,    *,
-                vecsimple, vecsimple, vecsimple,
-                vecperm,   vecperm,
-                *,         *,
+                vecsimple, vecsimple, vecsimple, *,         *,
                 vecstore,  vecload")
    (set_attr "length"
                "*,         *,         *,         16,        16,        16,
-                *,         *,         *,
-                *,         *,
-                20,        16,
+                *,         *,         *,         20,        16,
                 *,         *")
    (set_attr "isa"
                "<VSisa>,   <VSisa>,   <VSisa>,   *,         *,         *,
-                p9v,       *,         <VSisa>,
-                p10,       p10,
-                *,         *,
+                p9v,       *,         <VSisa>,   *,         *,
                 *,         *")])
 
 ;; Explicit  load/store expanders for the builtin functions
@@ -6478,47 +6458,6 @@
   [(set_attr "type" "vecperm")
    (set_attr "prefixed" "yes")])
 
-;; Generate the XXSPLTIDP instruction to support SFmode, DFmode, and DImode
-;; scalar constants and vector constants that look like DFmode floating point
-;; values where both elements are the same.  The constant has to be expressible
-;; as a SFmode constant that is not a SFmode denormal value.
-;;
-;; We don't need splitters for the 128-bit types, since the function
-;; rs6000_output_move_128bit handles the generation of XXSPLTIDP.
-(define_mode_iterator XXSPLTIDP [DI SF DF])
-
-(define_insn "xxspltidp_<mode>_internal"
-  [(set (match_operand:XXSPLTIDP 0 "register_operand" "=wa")
-	(unspec:XXSPLTIDP [(match_operand:SI 1 "c32bit_cint_operand" "n")]
-			  UNSPEC_XXSPLTIDP))]
-  "TARGET_POWER10"
-  "xxspltidp %x0,%1"
-  [(set_attr "type" "vecperm")
-   (set_attr "prefixed" "yes")])
-
-(define_split
-  [(set (match_operand:XXSPLTIDP 0 "vsx_register_operand")
-	(match_operand:XXSPLTIDP 1 "vsx_prefixed_scalar_constant"))]
-  "TARGET_POWER10"
-  [(pc)]
-{
-  rtx dest = operands[0];
-  rtx src = operands[1];
-  rs6000_vec_const vec_const;
-
-  if (!vec_const_to_bytes (src, <MODE>mode, &vec_const))
-    gcc_unreachable ();
-
-  if (vec_const_use_xxspltidp (&vec_const))
-    {
-      rtx imm = GEN_INT (vec_const.xxspltidp_immediate);
-      emit_insn (gen_xxspltidp_<mode>_internal (dest, imm));
-      DONE;
-    }
-
-  gcc_unreachable ();
-})
-
 ;; XXSPLTI32DX built-in function support
 (define_expand "xxsplti32dx_v4si"
   [(set (match_operand:V4SI 0 "register_operand" "=wa")
diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
index 0e87ad1f200..41f1850bf6e 100644
--- a/gcc/doc/md.texi
+++ b/gcc/doc/md.texi
@@ -3336,17 +3336,6 @@ A constant whose negation is a signed 16-bit constant.
 @item eI
 A signed 34-bit integer constant if prefixed instructions are supported.
 
-@item eS
-A scalar constant that can be loaded with one prefixed instruction to
-a VSX register.
-
-@item eV
-A vector constant that can be loaded with one prefixed instruction to
-a VSX register.
-
-@item eQ
-A constant that can be loaded with the LXVKQ instruction.
-
 @ifset INTERNALS
 @item G
 A floating point constant that can be loaded into a register with one
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-constant.c b/gcc/testsuite/gcc.target/powerpc/float128-constant.c
deleted file mode 100644
index f6becac1075..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/float128-constant.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* { dg-require-effective-target ppc_float128_hw } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -mlxvkq -O2" } */
-
-/* Test whether the LXVKQ instruction is generated to load special IEEE 128-bit
-   constants.  */
-
-_Float128
-return_0 (void)
-{
-  return 0.0f128;			/* XXSPLTIB 34,0.  */
-}
-
-_Float128
-return_1 (void)
-{
-  return 1.0f128;			/* LXVKQ 34,1.  */
-}
-
-_Float128
-return_2 (void)
-{
-  return 2.0f128;			/* LXVKQ 34,2.  */
-}
-
-_Float128
-return_3 (void)
-{
-  return 3.0f128;			/* LXVKQ 34,3.  */
-}
-
-_Float128
-return_4 (void)
-{
-  return 4.0f128;			/* LXVKQ 34,4.  */
-}
-
-_Float128
-return_5 (void)
-{
-  return 5.0f128;			/* LXVKQ 34,5.  */
-}
-
-_Float128
-return_6 (void)
-{
-  return 6.0f128;			/* LXVKQ 34,6.  */
-}
-
-_Float128
-return_7 (void)
-{
-  return 7.0f128;			/* LXVKQ 34,7.  */
-}
-
-_Float128
-return_m0 (void)
-{
-  return -0.0f128;			/* LXVKQ 34,16.  */
-}
-
-_Float128
-return_m1 (void)
-{
-  return -1.0f128;			/* LXVKQ 34,17.  */
-}
-
-_Float128
-return_m2 (void)
-{
-  return -2.0f128;			/* LXVKQ 34,18.  */
-}
-
-_Float128
-return_m3 (void)
-{
-  return -3.0f128;			/* LXVKQ 34,19.  */
-}
-
-_Float128
-return_m4 (void)
-{
-  return -4.0f128;			/* LXVKQ 34,20.  */
-}
-
-_Float128
-return_m5 (void)
-{
-  return -5.0f128;			/* LXVKQ 34,21.  */
-}
-
-_Float128
-return_m6 (void)
-{
-  return -6.0f128;			/* LXVKQ 34,22.  */
-}
-
-_Float128
-return_m7 (void)
-{
-  return -7.0f128;			/* LXVKQ 34,23.  */
-}
-
-_Float128
-return_inf (void)
-{
-  return __builtin_inff128 ();		/* LXVKQ 34,8.  */
-}
-
-_Float128
-return_minf (void)
-{
-  return - __builtin_inff128 ();	/* LXVKQ 34,24.  */
-}
-
-_Float128
-return_nan (void)
-{
-  return __builtin_nanf128 ("");	/* LXVKQ 34,9.  */
-}
-
-/* Note, the following NaNs should not generate a LXVKQ instruction.  */
-_Float128
-return_mnan (void)
-{
-  return - __builtin_nanf128 ("");	/* PLXV 34,... */
-}
-
-_Float128
-return_nan2 (void)
-{
-  return __builtin_nanf128 ("1");	/* PLXV 34,... */
-}
-
-_Float128
-return_nans (void)
-{
-  return __builtin_nansf128 ("");	/* PLXV 34,... */
-}
-
-vector long long
-return_longlong_neg_0 (void)
-{
-  /* This vector is the same pattern as -0.0F128.  */
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define FIRST	0x8000000000000000
-#define SECOND	0x0000000000000000
-
-#else
-#define FIRST	0x0000000000000000
-#define SECOND	0x8000000000000000
-#endif
-
-  return (vector long long) { FIRST, SECOND };	/* LXVKQ 34,16.  */
-}
-
-/* { dg-final { scan-assembler-times {\mlxvkq\M}    19 } } */
-/* { dg-final { scan-assembler-times {\mplxv\M}      3 } } */
-/* { dg-final { scan-assembler-times {\mxxspltib\M}  1 } } */
-
diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
index dcb30e1d886..bd1502bb30a 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
@@ -24,12 +24,11 @@ vector signed long long splats4(void)
         return (vector signed long long) vec_sl(mzero, mzero);
 }
 
-/* Codegen will consist of splat and shift instructions for most types.  If
-   folding is enabled, the vec_sl tests using vector long long type will
-   generate a lvx instead of a vspltisw+vsld pair.  On power10, it will
-   generate a xxspltidp instruction instead of the lvx.  */
+/* Codegen will consist of splat and shift instructions for most types.
+   If folding is enabled, the vec_sl tests using vector long long type will
+   generate a lvx instead of a vspltisw+vsld pair.  */
 
 /* { dg-final { scan-assembler-times {\mvspltis[bhw]\M} 0 } } */
 /* { dg-final { scan-assembler-times {\mvsl[bhwd]\M} 0 } } */
-/* { dg-final { scan-assembler-times {\mp?lxv\M|\mlxv\M|\mlxvd2x\M|\mxxspltidp\M} 2 } } */
+/* { dg-final { scan-assembler-times {\mp?lxv\M|\mlxv\M|\mlxvd2x\M} 2 } } */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c
deleted file mode 100644
index 8f6e176f9af..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
-
-#include <math.h>
-
-/* Test generating DFmode constants with the ISA 3.1 (power10) XXSPLTIDP
-   instruction.  */
-
-double
-scalar_double_0 (void)
-{
-  return 0.0;			/* XXSPLTIB or XXLXOR.  */
-}
-
-double
-scalar_double_1 (void)
-{
-  return 1.0;			/* XXSPLTIDP.  */
-}
-
-#ifndef __FAST_MATH__
-double
-scalar_double_m0 (void)
-{
-  return -0.0;			/* XXSPLTIDP.  */
-}
-
-double
-scalar_double_nan (void)
-{
-  return __builtin_nan ("");	/* XXSPLTIDP.  */
-}
-
-double
-scalar_double_inf (void)
-{
-  return __builtin_inf ();	/* XXSPLTIDP.  */
-}
-
-double
-scalar_double_m_inf (void)	/* XXSPLTIDP.  */
-{
-  return - __builtin_inf ();
-}
-#endif
-
-double
-scalar_double_pi (void)
-{
-  return M_PI;			/* PLFD.  */
-}
-
-double
-scalar_double_denorm (void)
-{
-  return 0x1p-149f;		/* PLFD.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltidp\M} 5 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-di.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-di.c
deleted file mode 100644
index 75714d0b11d..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-di.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
-
-/* Test generating DImode constants that have the same bit pattern as DFmode
-   constants that can be loaded with the XXSPLTIDP instruction with the ISA 3.1
-   (power10).  We use asm to force the value into vector registers.  */
-
-double
-scalar_0 (void)
-{
-  /* XXSPLTIB or XXLXOR.  */
-  double d;
-  long long ll = 0;
-
-  __asm__ ("xxmr %x0,%x1" : "=wa" (d) : "wa" (ll));
-  return d;
-}
-
-double
-scalar_1 (void)
-{
-  /* VSPLTISW/VUPKLSW or XXSPLTIB/VEXTSB2D.  */
-  double d;
-  long long ll = 1;
-
-  __asm__ ("xxmr %x0,%x1" : "=wa" (d) : "wa" (ll));
-  return d;
-}
-
-/* 0x8000000000000000LL is the bit pattern for -0.0, which can be generated
-   with XXSPLTIDP.  */
-double
-scalar_float_neg_0 (void)
-{
-  /* XXSPLTIDP.  */
-  double d;
-  long long ll = 0x8000000000000000LL;
-
-  __asm__ ("xxmr %x0,%x1" : "=wa" (d) : "wa" (ll));
-  return d;
-}
-
-/* 0x3ff0000000000000LL is the bit pattern for 1.0 which can be generated with
-   XXSPLTIDP.  */
-double
-scalar_float_1_0 (void)
-{
-  /* XXSPLTIDP.  */
-  double d;
-  long long ll = 0x3ff0000000000000LL;
-
-  __asm__ ("xxmr %x0,%x1" : "=wa" (d) : "wa" (ll));
-  return d;
-}
-
-/* 0x400921fb54442d18LL is the bit pattern for PI, which cannot be generated
-   with XXSPLTIDP.  */
-double
-scalar_pi (void)
-{
-  /* PLXV.  */
-  double d;
-  long long ll = 0x400921fb54442d18LL;
-
-  __asm__ ("xxmr %x0,%x1" : "=wa" (d) : "wa" (ll));
-  return d;
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltidp\M} 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c
deleted file mode 100644
index 72504bdfbbd..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
-
-#include <math.h>
-
-/* Test generating SFmode constants with the ISA 3.1 (power10) XXSPLTIDP
-   instruction.  */
-
-float
-scalar_float_0 (void)
-{
-  return 0.0f;			/* XXSPLTIB or XXLXOR.  */
-}
-
-float
-scalar_float_1 (void)
-{
-  return 1.0f;			/* XXSPLTIDP.  */
-}
-
-#ifndef __FAST_MATH__
-float
-scalar_float_m0 (void)
-{
-  return -0.0f;			/* XXSPLTIDP.  */
-}
-
-float
-scalar_float_nan (void)
-{
-  return __builtin_nanf ("");	/* XXSPLTIDP.  */
-}
-
-float
-scalar_float_inf (void)
-{
-  return __builtin_inff ();	/* XXSPLTIDP.  */
-}
-
-float
-scalar_float_m_inf (void)	/* XXSPLTIDP.  */
-{
-  return - __builtin_inff ();
-}
-#endif
-
-float
-scalar_float_pi (void)
-{
-  return (float)M_PI;		/* XXSPLTIDP.  */
-}
-
-float
-scalar_float_denorm (void)
-{
-  return 0x1p-149f;		/* PLFS.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltidp\M} 6 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v16qi.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v16qi.c
deleted file mode 100644
index 2707d86e6fd..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v16qi.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2 -mxxspltiw" } */
-
-#include <altivec.h>
-
-/* Test whether XXSPLTIW is generated for V16HI vector constants where the
-   first 4 elements are the same as the next 4 elements, etc.  */
-
-vector unsigned char
-v16qi_const_1 (void)
-{
-  return (vector unsigned char) { 1, 1, 1, 1, 1, 1, 1, 1,
-				  1, 1, 1, 1, 1, 1, 1, 1, }; /* VSLTPISB.  */
-}
-
-vector unsigned char
-v16qi_const_2 (void)
-{
-  return (vector unsigned char) { 1, 2, 3, 4, 1, 2, 3, 4,
-				  1, 2, 3, 4, 1, 2, 3, 4, }; /* XXSPLTIW.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltiw\M}              1 } } */
-/* { dg-final { scan-assembler-times {\mvspltisb\M|\mxxspltib\M} 1 } } */
-/* { dg-final { scan-assembler-not   {\mlxvx?\M}                   } } */
-/* { dg-final { scan-assembler-not   {\mplxv\M}                    } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c
deleted file mode 100644
index 82ffc86f8aa..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
-
-#include <math.h>
-
-/* Test generating V2DFmode constants with the ISA 3.1 (power10) XXSPLTIDP
-   instruction.  */
-
-vector double
-v2df_double_0 (void)
-{
-  return (vector double) { 0.0, 0.0 };			/* XXSPLTIB or XXLXOR.  */
-}
-
-vector double
-v2df_double_1 (void)
-{
-  return (vector double) { 1.0, 1.0 };			/* XXSPLTIDP.  */
-}
-
-#ifndef __FAST_MATH__
-vector double
-v2df_double_m0 (void)
-{
-  return (vector double) { -0.0, -0.0 };		/* XXSPLTIDP.  */
-}
-
-vector double
-v2df_double_nan (void)
-{
-  return (vector double) { __builtin_nan (""),
-			   __builtin_nan ("") };	/* XXSPLTIDP.  */
-}
-
-vector double
-v2df_double_inf (void)
-{
-  return (vector double) { __builtin_inf (),
-			   __builtin_inf () };		/* XXSPLTIDP.  */
-}
-
-vector double
-v2df_double_m_inf (void)
-{
-  return (vector double) { - __builtin_inf (),
-			   - __builtin_inf () };	/* XXSPLTIDP.  */
-}
-#endif
-
-vector double
-v2df_double_pi (void)
-{
-  return (vector double) { M_PI, M_PI };		/* PLVX.  */
-}
-
-vector double
-v2df_double_denorm (void)
-{
-  return (vector double) { (double)0x1p-149f,
-			   (double)0x1p-149f };		/* PLVX.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltidp\M} 5 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2di.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2di.c
deleted file mode 100644
index 4d44f943d26..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2di.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
-
-/* Test generating V2DImode constants that have the same bit pattern as
-   V2DFmode constants that can be loaded with the XXSPLTIDP instruction with
-   the ISA 3.1 (power10).  */
-
-vector long long
-vector_0 (void)
-{
-  /* XXSPLTIB or XXLXOR.  */
-  return (vector long long) { 0LL, 0LL };
-}
-
-vector long long
-vector_1 (void)
-{
-  /* XXSPLTIB and VEXTSB2D.  */
-  return (vector long long) { 1LL, 1LL };
-}
-
-/* 0x8000000000000000LL is the bit pattern for -0.0, which can be generated
-   with XXSPLTISDP.  */
-vector long long
-vector_float_neg_0 (void)
-{
-  /* XXSPLTIDP.  */
-  return (vector long long) { 0x8000000000000000LL, 0x8000000000000000LL };
-}
-
-/* 0x3ff0000000000000LL is the bit pattern for 1.0 which can be generated with
-   XXSPLTISDP.  */
-vector long long
-vector_float_1_0 (void)
-{
-  /* XXSPLTIDP.  */
-  return (vector long long) { 0x3ff0000000000000LL, 0x3ff0000000000000LL };
-}
-
-/* 0x400921fb54442d18LL is the bit pattern for PI, which cannot be generated
-   with XXSPLTIDP.  */
-vector long long
-scalar_pi (void)
-{
-  /* PLXV.  */
-  return (vector long long) { 0x400921fb54442d18LL, 0x400921fb54442d18LL };
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltidp\M} 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v4sf.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v4sf.c
deleted file mode 100644
index 05d4ee3f5cb..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v4sf.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2 -mxxspltiw" } */
-
-#include <altivec.h>
-
-/* Test whether XXSPLTIW is generated for V4SF vector constants.  */
-
-vector float
-v4sf_const_1 (void)
-{
-  return (vector float) { 1.0f, 1.0f, 1.0f, 1.0f };	/* XXSPLTIW.  */
-}
-
-vector float
-v4sf_const_nan (void)
-{
-  return (vector float) { __builtin_nanf (""),
-			  __builtin_nanf (""),
-			  __builtin_nanf (""),
-			  __builtin_nanf ("") };	/* XXSPLTIW.  */
-}
-
-vector float
-v4sf_const_inf (void)
-{
-  return (vector float) { __builtin_inff (),
-			  __builtin_inff (),
-			  __builtin_inff (),
-			  __builtin_inff () };		/* XXSPLTIW.  */
-}
-
-vector float
-v4sf_const_m0 (void)
-{
-  return (vector float) { -0.0f, -0.0f, -0.0f, -0.0f };	/* XXSPLTIB/VSLW.  */
-}
-
-vector float
-v4sf_splats_1 (void)
-{
-  return vec_splats (1.0f);				/* XXSPLTIW.  */
-}
-
-vector float
-v4sf_splats_nan (void)
-{
-  return vec_splats (__builtin_nanf (""));		/* XXSPLTIW.  */
-}
-
-vector float
-v4sf_splats_inf (void)
-{
-  return vec_splats (__builtin_inff ());		/* XXSPLTIW.  */
-}
-
-vector float
-v8hi_splats_m0 (void)
-{
-  return vec_splats (-0.0f);				/* XXSPLTIB/VSLW.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltiw\M} 6 } } */
-/* { dg-final { scan-assembler-times {\mxxspltib\M} 2 } } */
-/* { dg-final { scan-assembler-times {\mvslw\M}     2 } } */
-/* { dg-final { scan-assembler-not   {\mlxvx?\M}      } } */
-/* { dg-final { scan-assembler-not   {\mplxv\M}       } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v4si.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v4si.c
deleted file mode 100644
index da909e948b2..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v4si.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2 -mxxspltiw" } */
-
-#include <altivec.h>
-
-/* Test whether XXSPLTIW is generated for V4SI vector constants.  We make sure
-   the power9 support (XXSPLTIB/VEXTSB2W) is not done.  */
-
-vector int
-v4si_const_1 (void)
-{
-  return (vector int) { 1, 1, 1, 1 };			/* VSLTPISW.  */
-}
-
-vector int
-v4si_const_126 (void)
-{
-  return (vector int) { 126, 126, 126, 126 };		/* XXSPLTIW.  */
-}
-
-vector int
-v4si_const_1023 (void)
-{
-  return (vector int) { 1023, 1023, 1023, 1023 };	/* XXSPLTIW.  */
-}
-
-vector int
-v4si_splats_1 (void)
-{
-  return vec_splats (1);				/* VSLTPISW.  */
-}
-
-vector int
-v4si_splats_126 (void)
-{
-  return vec_splats (126);				/* XXSPLTIW.  */
-}
-
-vector int
-v8hi_splats_1023 (void)
-{
-  return vec_splats (1023);				/* XXSPLTIW.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltiw\M}  4 } } */
-/* { dg-final { scan-assembler-times {\mvspltisw\M}  2 } } */
-/* { dg-final { scan-assembler-not   {\mxxspltib\M}    } } */
-/* { dg-final { scan-assembler-not   {\mvextsb2w\M}    } } */
-/* { dg-final { scan-assembler-not   {\mlxvx?\M}       } } */
-/* { dg-final { scan-assembler-not   {\mplxv\M}        } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v8hi.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v8hi.c
deleted file mode 100644
index 290e05d4a64..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v8hi.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2 -mxxspltiw" } */
-
-#include <altivec.h>
-
-/* Test whether XXSPLTIW is generated for V8HI vector constants.  We make sure
-   the power9 support (XXSPLTIB/VUPKLSB) is not done.  */
-
-vector short
-v8hi_const_1 (void)
-{
-  return (vector short) { 1, 1, 1, 1, 1, 1, 1, 1 };	/* VSLTPISH.  */
-}
-
-vector short
-v8hi_const_126 (void)
-{
-  return (vector short) { 126, 126, 126, 126,
-			  126, 126, 126, 126 };		/* XXSPLTIW.  */
-}
-
-vector short
-v8hi_const_1023 (void)
-{
-  return (vector short) { 1023, 1023, 1023, 1023,
-			  1023, 1023, 1023, 1023 };	/* XXSPLTIW.  */
-}
-
-vector short
-v8hi_splats_1 (void)
-{
-  return vec_splats ((short)1);				/* VSLTPISH.  */
-}
-
-vector short
-v8hi_splats_126 (void)
-{
-  return vec_splats ((short)126);			/* XXSPLTIW.  */
-}
-
-vector short
-v8hi_splats_1023 (void)
-{
-  return vec_splats ((short)1023);			/* XXSPLTIW.  */
-}
-
-/* Test that we can optimiza V8HI where all of the even elements are the same
-   and all of the odd elements are the same.  */
-vector short
-v8hi_const_1023_1000 (void)
-{
-  return (vector short) { 1023, 1000, 1023, 1000,
-			  1023, 1000, 1023, 1000 };	/* XXSPLTIW.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltiw\M}  5 } } */
-/* { dg-final { scan-assembler-times {\mvspltish\M}  2 } } */
-/* { dg-final { scan-assembler-not   {\mxxspltib\M}    } } */
-/* { dg-final { scan-assembler-not   {\mvupklsb\M}     } } */
-/* { dg-final { scan-assembler-not   {\mlxvx?\M}       } } */
-/* { dg-final { scan-assembler-not   {\mplxv\M}        } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
index 6c01666b625..a135279b1d7 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
@@ -149,8 +149,8 @@ main (int argc, char *argv [])
   return 0;
 }
 
-/* { dg-final { scan-assembler-times {\mxxspltiw\M} 3 } } */
-/* { dg-final { scan-assembler-times {\mxxspltidp\M} 3 } } */
+/* { dg-final { scan-assembler-times {\mxxspltiw\M} 2 } } */
+/* { dg-final { scan-assembler-times {\mxxspltidp\M} 2 } } */
 /* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 3 } } */


             reply	other threads:[~2021-10-18 14:07 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-18 14:07 Michael Meissner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-29 22:31 Michael Meissner
2021-10-21  2:51 Michael Meissner
2021-10-21  2:27 Michael Meissner
2021-10-21  0:37 Michael Meissner
2021-10-20 22:26 Michael Meissner
2021-10-20 21:21 Michael Meissner
2021-10-20 17:56 Michael Meissner
2021-10-18 18:49 Michael Meissner
2021-10-18 17:43 Michael Meissner
2021-10-15 23:44 Michael Meissner
2021-10-15 15:12 Michael Meissner
2021-10-15  5:23 Michael Meissner
2021-10-14 23:43 Michael Meissner
2021-10-14 16:47 Michael Meissner
2021-10-14 15:35 Michael Meissner
2021-10-14 13:43 Michael Meissner
2021-10-14  2:59 Michael Meissner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211018140759.EA6563858400@sourceware.org \
    --to=meissner@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).