public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/meissner/heads/work046)] Revert patch.
@ 2021-04-12 17:07 Michael Meissner
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Meissner @ 2021-04-12 17:07 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:e4a9eb2516fef2e7f5057ab7002ff9da2d93e08c

commit e4a9eb2516fef2e7f5057ab7002ff9da2d93e08c
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Mon Apr 12 13:06:23 2021 -0400

    Revert patch.
    
    gcc/
    2021-04-08  Michael Meissner  <meissner@linux.ibm.com>
    
            Revert patch.
            * config/rs6000/contraints.md (eD): New constraint.
            * config/rs6000/predicates.md (easy_fp_constant): If we can load
            the constant with a pair of XXSPLTI32DX instructions, it is easy.
            (xxsplti32dx_operand): New predicate.
            (easy_vector_constant): If we can load the constant with a pair of
            XXSPLTI32DX instructions, it is easy.
            * config/rs6000/rs6000-cpus.def (OTHER_POWER10_MASKS): Add
            -mxxsplti32dx.
            (POWERPC_MASKS): Add -mxxsplti32dx.
            * config/rs6000/rs6000-protos.h (xxsplti32dx_constant_p): New
            declaration.
            * config/rs6000/rs6000.c (rs6000_option_override_internal): Add
            -mxxsplti32dx support.
            (xxsplti32dx_constant_p): New helper function.
            (output_vec_const_move): Split constants that need XXSPLTI32DX.
            (rs6000_opt_masks): Add -mxxsplti32dx.
            * config/rs6000/rs6000.md (movsf_hardfloat): Add support for
            loading constants with XXSPLTI32DX.
            (mov<mode>_hardfloat32, FMOVE64 iterator): Add support for loading
            constants with XXSPLTI32DX.
            (mov<mode>_hardfloat64, FMOVE64 iterator): Add support for loading
            constants with XXSPLTI32DX.
            * config/rs6000/rs6000.opt (-mxxsplti32dx): New switch.
            * config/rs6000/vsx.md (UNSPEC_XXSPLTI32DX_CONST): New unspec.
            (vsx_mov<mode>_64bit): Add support for loading constants with
            XXSPLTI32DX.
            (vsx_mov<mode>_32bit): Add support for loading constants with
            XXSPLTI32DX.
            (XXSPLTI32DX): New mode iterator.
            (xxsplti32dx_<mode>): New insn and splits.
            (xxsplti32dx_<mode>_first): New insns.
            (xxsplti32dx_<mode>_second): New insns.
    
    gcc/testsuite/
    2021-04-08  Michael Meissner  <meissner@linux.ibm.com>
    
            Revert patch.
            * gcc.target/powerpc/vec-splati-runnable.c: Update insn count.
            * gcc.target/powerpc/vec-splat-constant-sf.c: Update insn count.
            * gcc.target/powerpc/vec-splat-constant-df.c: Update insn count.
            * gcc.target/powerpc/vec-splat-constant-v2df.c: Update insn
            count.

Diff:
---
 gcc/config/rs6000/constraints.md                   |   6 -
 gcc/config/rs6000/predicates.md                    |  22 ----
 gcc/config/rs6000/rs6000-cpus.def                  |   2 -
 gcc/config/rs6000/rs6000-protos.h                  |   1 -
 gcc/config/rs6000/rs6000.c                         |  94 ----------------
 gcc/config/rs6000/rs6000.md                        |  44 +++-----
 gcc/config/rs6000/rs6000.opt                       |   4 -
 gcc/config/rs6000/vsx.md                           | 121 +++------------------
 .../gcc.target/powerpc/vec-splat-constant-df.c     |   9 +-
 .../gcc.target/powerpc/vec-splat-constant-sf.c     |   5 +-
 .../gcc.target/powerpc/vec-splat-constant-v2df.c   |  10 +-
 .../gcc.target/powerpc/vec-splati-runnable.c       |   2 +-
 12 files changed, 37 insertions(+), 283 deletions(-)

diff --git a/gcc/config/rs6000/constraints.md b/gcc/config/rs6000/constraints.md
index c7137337f4c..70b1eb01770 100644
--- a/gcc/config/rs6000/constraints.md
+++ b/gcc/config/rs6000/constraints.md
@@ -208,12 +208,6 @@
   (and (match_code "const_int")
        (match_test "((- (unsigned HOST_WIDE_INT) ival) + 0x8000) < 0x10000")))
 
-;; SF/DF/V2DF/DI/V2DI scalar or vector constant that can be loaded with a pair
-;; of XXSPLTI32DX instructions.
-(define_constraint "eD"
-  "A vector constant that can be loaded with XXSPLTI32DX instructions."
-  (match_operand 0 "xxsplti32dx_operand"))
-
 ;; SF/DF/V2DF scalar or vector constant that can be loaded with XXSPLTIDP
 (define_constraint "eF"
   "A vector constant that can be loaded with the XXSPLTIDP instruction."
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 281c6e835b9..48d9c5509a2 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -606,11 +606,6 @@
   if (xxspltidp_operand (op, mode))
     return 1;
 
-  /* If we have the ISA 3.1 XXSPLTI32DX instruction, see if the constant can
-     be loaded with a pair of those instructions.  */
-  if (xxsplti32dx_operand (op, mode))
-    return 1;
-
   /* 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
@@ -682,20 +677,6 @@
   return xxspltidp_constant_p (op, mode, &value);
 })
 
-;; Return 1 if operand is a SF/DF CONST_DOUBLE or V2DF CONST_VECTOR that can be
-;; loaded via a pair f ISA 3.1 XXSPLTI32DX instructions.  Do not return true if
-;; the value is 0.0 or it can be loaded with XXSPLTIDP, since that is easy to
-;; generate without using XXSPLTI32DX.
-(define_predicate "xxsplti32dx_operand"
-  (match_code "const_double,const_int,const_vector,vec_duplicate")
-{
-  if (op == CONST0_RTX (mode))
-    return false;
-
-  HOST_WIDE_INT value = 0;
-  return xxsplti32dx_constant_p (op, mode, &value);
-})
-
 ;; Return 1 if the operand is a CONST_VECTOR and can be loaded into a
 ;; vector register without using memory.
 (define_predicate "easy_vector_constant"
@@ -715,9 +696,6 @@
       if (xxspltidp_operand (op, mode))
 	return true;
 
-      if (xxsplti32dx_operand (op, mode))
-	return true;
-
       if (TARGET_P9_VECTOR
           && xxspltib_constant_p (op, mode, &num_insns, &value))
 	return true;
diff --git a/gcc/config/rs6000/rs6000-cpus.def b/gcc/config/rs6000/rs6000-cpus.def
index 5a14191cc6c..cf4044831f7 100644
--- a/gcc/config/rs6000/rs6000-cpus.def
+++ b/gcc/config/rs6000/rs6000-cpus.def
@@ -79,7 +79,6 @@
 				 | OPTION_MASK_PCREL			\
 				 | OPTION_MASK_PCREL_OPT		\
 				 | OPTION_MASK_PREFIXED			\
-				 | OPTION_MASK_XXSPLTI32DX		\
 				 | OPTION_MASK_XXSPLTIDP		\
 				 | OPTION_MASK_XXSPLTIW)
 
@@ -164,7 +163,6 @@
 				 | OPTION_MASK_SOFT_FLOAT		\
 				 | OPTION_MASK_STRICT_ALIGN_OPTIONAL	\
 				 | OPTION_MASK_VSX			\
-				 | OPTION_MASK_XXSPLTI32DX		\
 				 | OPTION_MASK_XXSPLTIDP		\
 				 | OPTION_MASK_XXSPLTIW)
 
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index 12bf60b043d..0fe1c176236 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -34,7 +34,6 @@ extern bool easy_altivec_constant (rtx, machine_mode);
 extern bool xxspltib_constant_p (rtx, machine_mode, int *, int *);
 extern bool xxspltiw_constant_p (rtx, machine_mode, HOST_WIDE_INT *);
 extern bool xxspltidp_constant_p (rtx, machine_mode, HOST_WIDE_INT *);
-extern bool xxsplti32dx_constant_p (rtx, machine_mode, HOST_WIDE_INT *);
 extern int vspltis_shifted (rtx);
 extern HOST_WIDE_INT const_vector_elt_as_int (rtx, unsigned int);
 extern bool macho_lo_sum_memory_operand (rtx, machine_mode);
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 659eb301c87..08a853f2e8f 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4484,10 +4484,6 @@ rs6000_option_override_internal (bool global_init_p)
       && (rs6000_isa_flags_explicit & OPTION_MASK_XXSPLTIDP) == 0)
     rs6000_isa_flags |= OPTION_MASK_XXSPLTIDP;
 
-  if (TARGET_POWER10 && TARGET_VSX
-      && (rs6000_isa_flags_explicit & OPTION_MASK_XXSPLTI32DX) == 0)
-    rs6000_isa_flags |= OPTION_MASK_XXSPLTI32DX;
-
   if (!TARGET_PCREL && TARGET_PCREL_OPT)
     rs6000_isa_flags &= ~OPTION_MASK_PCREL_OPT;
 
@@ -6614,92 +6610,6 @@ xxspltidp_constant_p (rtx op,
   return true;
 }
 
-/* Return true if OP is of the given MODE and can be synthesized with ISA 3.1
-   XXSPLTI32DX instruction.  If the instruction can be synthesized with
-   XXSPLTIDP or is 0/-1, return false;
-
-   Return the 64-bit constant to use in the two XXSPLTI32DX instructions via
-   CONSTANT_PTR.  */
-
-bool
-xxsplti32dx_constant_p (rtx op,
-			machine_mode mode,
-			HOST_WIDE_INT *constant_ptr)
-{
-  *constant_ptr = 0;
-
-  if (!TARGET_XXSPLTI32DX)
-    return false;
-
-  if (mode == VOIDmode)
-    mode = GET_MODE (op);
-
-  if (op == CONST0_RTX (mode))
-    return false;
-
-  rtx element = op;
-  if (mode == V2DFmode || mode == V2DImode)
-    {
-      /* Handle VEC_DUPLICATE and CONST_VECTOR.  */
-      if (GET_CODE (op) == VEC_DUPLICATE)
-	element = XEXP (op, 0);
-
-      else if (GET_CODE (op) == CONST_VECTOR)
-       {
-         element = CONST_VECTOR_ELT (op, 0);
-         if (!rtx_equal_p (element, CONST_VECTOR_ELT (op, 1)))
-           return false;
-       }
-
-      else
-       return false;
-
-      mode = GET_MODE_INNER (mode);
-    }
-
-  if (GET_MODE (element) != mode)
-    return false;
-
-  /* Handle floating point constants.  */
-  if (mode == SFmode || mode == DFmode)
-    {
-      HOST_WIDE_INT xxspltidp_value = 0;
-
-      if (!CONST_DOUBLE_P (element))
-	return false;
-
-      if (xxspltidp_constant_p (element, mode, &xxspltidp_value))
-	return false;
-
-      long high_low[2];
-      const struct real_value *rv = CONST_DOUBLE_REAL_VALUE (element);
-      REAL_VALUE_TO_TARGET_DOUBLE (*rv, high_low);
-
-      if (!BYTES_BIG_ENDIAN)
-	std::swap (high_low[0], high_low[1]);
-
-      *constant_ptr = (high_low[0] << 32) | (high_low[1] & 0xffffffff);
-      return true;
-    }
-
-  /* Handle integer constants.  */
-  else if (mode == DImode)
-    {
-      if (!CONST_INT_P (element))
-	return false;
-
-      HOST_WIDE_INT value = INTVAL (element);
-      if (value == -1)
-	return false;
-
-      *constant_ptr = value;
-      return true;
-    }
-
-  else
-    return false;
-}
-
 const char *
 output_vec_const_move (rtx *operands)
 {
@@ -6773,9 +6683,6 @@ output_vec_const_move (rtx *operands)
 	  return "xxspltidp %x0,%2";
 	}
 
-      if (xxsplti32dx_operand (vec, mode))
-	return "#";
-
       if (TARGET_P9_VECTOR
 	  && xxspltib_constant_p (vec, mode, &num_insns, &xxspltib_value))
 	{
@@ -24275,7 +24182,6 @@ static struct rs6000_opt_mask const rs6000_opt_masks[] =
   { "vsx",			OPTION_MASK_VSX,		false, true  },
   { "xxspltiw",			OPTION_MASK_XXSPLTIW,		false, true  },
   { "xxspltidp",		OPTION_MASK_XXSPLTIDP,		false, true  },
-  { "xxsplti32dx",		OPTION_MASK_XXSPLTI32DX,	false, true  },
 #ifdef OPTION_MASK_64BIT
 #if TARGET_AIX_OS
   { "aix64",			OPTION_MASK_64BIT,		false, false },
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index b5886d3ccf4..5569e0591e6 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -7564,17 +7564,17 @@
 ;;
 ;;	LWZ          LFS        LXSSP       LXSSPX     STFS       STXSSP
 ;;	STXSSPX      STW        XXLXOR      LI         FMR        XSCPSGNDP
-;;	MR           MT<x>      MF<x>       NOP        XXSPLTIDP  XXSPLTI32DX
+;;	MR           MT<x>      MF<x>       NOP        XXSPLTIDP
 
 (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,        wa")
+	  !r,        *c*l,      !r,         *h,        wa")
 	(match_operand:SF 1 "input_operand"
 	 "m,         m,         wY,         Z,         f,         v,
 	  wa,        r,         j,          j,         f,         wa,
-	  r,         r,         *h,         0,         eF,        eD"))]
+	  r,         r,         *h,         0,         eF"))]
   "(register_operand (operands[0], SFmode)
    || register_operand (operands[1], SFmode))
    && TARGET_HARD_FLOAT
@@ -7597,28 +7597,19 @@
    mt%0 %1
    mf%1 %0
    nop
-   #
    #"
   [(set_attr "type"
 	"load,       fpload,    fpload,     fpload,    fpstore,   fpstore,
 	 fpstore,    store,     veclogical, integer,   fpsimple,  fpsimple,
-	 *,          mtjmpr,    mfjmpr,     *,         vecperm,   vecperm")
+	 *,          mtjmpr,    mfjmpr,     *,         vecperm")
    (set_attr "isa"
 	"*,          *,         p9v,        p8v,       *,         p9v,
 	 p8v,        *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         p10,       p10")
+	 *,          *,         *,          *,         p10")
    (set_attr "prefixed"
 	"*,          *,         *,          *,         *,         *,
 	 *,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         yes,       yes")
-   (set_attr "max_prefixed_insns"
-	"*,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         2")
-   (set_attr "num_insns"
-	"*,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         2")])
+	 *,          *,         *,          *,         yes")])
 
 ;;	LWZ          LFIWZX     STW        STFIWX     MTVSRWZ    MFVSRWZ
 ;;	FMR          MR         MT%0       MF%1       NOP
@@ -7878,18 +7869,18 @@
 
 ;;           STFD         LFD         FMR         LXSD        STXSD
 ;;           LXSD         STXSD       XXLOR       XXLXOR      GPR<-0
-;;           LWZ          STW         MR          XXSPLTIDP   XXSPLTI32DX
+;;           LWZ          STW         MR          XXSPLTIDP
 
 
 (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,         wa")
+              Y,          r,          !r,         wa")
 	(match_operand:FMOVE64 1 "input_operand"
              "d,          m,          d,          wY,         <f64_p9>,
               Z,          <f64_av>,   <f64_vsx>,  <zero_fp>,  <zero_fp>,
-              r,          Y,          r,          eF,         eD"))]
+              r,          Y,          r,          eF"))]
   "! TARGET_POWERPC64 && TARGET_HARD_FLOAT
    && (gpc_reg_operand (operands[0], <MODE>mode)
        || gpc_reg_operand (operands[1], <MODE>mode))"
@@ -7907,33 +7898,24 @@
    #
    #
    #
-   #
    #"
   [(set_attr "type"
             "fpstore,     fpload,     fpsimple,   fpload,     fpstore,
              fpload,      fpstore,    veclogical, veclogical, two,
-             store,       load,       two,        vecperm,    vecperm")
+             store,       load,       two,        vecperm")
    (set_attr "size" "64")
    (set_attr "length"
             "*,           *,          *,          *,          *,
              *,           *,          *,          *,          8,
-             8,           8,          8,          *,          *")
+             8,           8,          8,          *")
    (set_attr "isa"
             "*,           *,          *,          p9v,        p9v,
              p7v,         p7v,        *,          *,          *,
-             *,           *,          *,          p10,        p10")
+             *,           *,          *,          p10")
    (set_attr "prefixed"
             "*,           *,          *,          *,          *,
              *,           *,          *,          *,          *,
-             *,           *,          *,          yes,        yes")
-   (set_attr "max_prefixed_insns"
-            "*,           *,          *,          *,          *,
-             *,           *,          *,          *,          *,
-             *,           *,          *,          *,          2")
-   (set_attr "num_insns"
-            "*,           *,          *,          *,          *,
-             *,           *,          *,          *,          *,
-             *,           *,          *,          *,          2")])
+             *,           *,          *,          yes")])
 
 ;;           STW      LWZ     MR      G-const H-const F-const
 
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index bd269369ca0..6620cdb7716 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -627,7 +627,3 @@ Generate (do not generate) the XXSPLTIW instruction.
 mxxspltidp
 Target Undocumented Mask(XXSPLTIDP) Var(rs6000_isa_flags)
 Generate (do not generate) the XXSPLTIDP instruction.
-
-mxxsplti32dx
-Target Undocumented Mask(XXSPLTI32DX) Var(rs6000_isa_flags)
-Generate (do not generate) the XXSPLTI32DX instruction.
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index ec2c148fb4d..4b0307d447e 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -372,7 +372,6 @@
    UNSPEC_XXSPLTIW
    UNSPEC_XXSPLTIDP
    UNSPEC_XXSPLTI32DX
-   UNSPEC_XXSPLTI32DX_CONST
    UNSPEC_XXPERMX
    UNSPEC_XXEVAL
   ])
@@ -1174,19 +1173,16 @@
 ;;              VSX store  VSX load   VSX move  VSX->GPR   GPR->VSX    LQ (GPR)
 ;;              STQ (GPR)  GPR load   GPR store GPR move   XXSPLTIB    VSPLTISW
 ;;              VSX 0/-1   VMX const  GPR const LVX (VMX)  STVX (VMX)  XXSPLTI*
-;;              XXSPLTI32DX
 (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,       v,         <??r>,     wZ,        v,         wa,
-                wa")
+                ?wa,       v,         <??r>,     wZ,        v,         wa")
 
 	(match_operand:VSX_M 1 "input_operand" 
                "wa,        ZwO,       wa,        we,        r,         r,
                 wQ,        Y,         r,         r,         wE,        jwM,
-                ?jwM,      W,         <nW>,      v,         wZ,        eWeF,
-                eD"))]
+                ?jwM,      W,         <nW>,      v,         wZ,        eWeF"))]
 
   "TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode)
    && (register_operand (operands[0], <MODE>mode) 
@@ -1197,47 +1193,41 @@
   [(set_attr "type"
                "vecstore,  vecload,   vecsimple, mtvsr,     mfvsr,     load,
                 store,     load,      store,     *,         vecsimple, vecsimple,
-                vecsimple, *,         *,         vecstore,  vecload,   vecperm,
-                vecperm")
+                vecsimple, *,         *,         vecstore,  vecload,   vecperm")
    (set_attr "num_insns"
                "*,         *,         *,         2,         *,         2,
                 2,         2,         2,         2,         *,         *,
-                *,         5,         2,         *,         *,         *,
-                2")
+                *,         5,         2,         *,         *,         *")
    (set_attr "max_prefixed_insns"
                "*,         *,         *,         *,         *,         2,
                 2,         2,         2,         2,         *,         *,
-                *,         *,         *,         *,         *,         *,
-                2")
+                *,         *,         *,         *,         *,         *")
    (set_attr "length"
                "*,         *,         *,         8,         *,         8,
                 8,         8,         8,         8,         *,         *,
-                *,         20,        8,         *,         *,         *,
-                *")
+                *,         20,        8,         *,         *,         *")
    (set_attr "isa"
                "<VSisa>,   <VSisa>,   <VSisa>,   *,         *,         *,
                 *,         *,         *,         *,         p9v,       *,
-                <VSisa>,   *,         *,         *,         *,         p10,
-                p10")
+                <VSisa>,   *,         *,         *,         *,         p10")
    (set_attr "prefixed"
                "*,         *,         *,         *,         *,         *,
                 *,         *,         *,         *,         *,         *,
-                *,         *,         *,         *,         *,         yes,
-                yes")])
+                *,         *,         *,         *,         *,         yes")])
 
 ;;              VSX store  VSX load   VSX move   GPR load   GPR store  GPR move
 ;;              XXSPLTIB   VSPLTISW   VSX 0/-1   VMX const  GPR const  XXSPLTI*
-;;              LVX (VMX)  STVX (VMX) XXSPLTI32DX
+;;              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,       v,         <??r>,     wa,
-                wZ,        v,         wa")
+                wZ,        v")
 
 	(match_operand:VSX_M 1 "input_operand" 
                "wa,        ZwO,       wa,        Y,         r,         r,
                 wE,        jwM,       ?jwM,      W,         <nW>,      eWeF,
-                v,         wZ,        eD"))]
+                v,         wZ"))]
 
   "!TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode)
    && (register_operand (operands[0], <MODE>mode) 
@@ -1248,27 +1238,19 @@
   [(set_attr "type"
                "vecstore,  vecload,   vecsimple, load,      store,    *,
                 vecsimple, vecsimple, vecsimple, *,         *,        vecperm,
-                vecstore,  vecload,   vecperm")
+                vecstore,  vecload")
    (set_attr "length"
                "*,         *,         *,         16,        16,        16,
                 *,         *,         *,         20,        16,        *,
-                *,         *,         *")
+                *,         *")
    (set_attr "isa"
                "<VSisa>,   <VSisa>,   <VSisa>,   *,         *,         *,
                 p9v,       *,         <VSisa>,   *,         *,         p10,
-                *,         *,         p10")
+                *,         *")
    (set_attr "prefixed"
                "*,         *,         *,         *,         *,         *,
                 *,         *,         *,         *,         *,         yes,
-                *,         *,         yes")
-   (set_attr "max_prefixed_insns"
-               "*,         *,         *,         *,         *,         *,
-                *,         *,         *,         *,         *,         *,
-                *,         *,         2")
-   (set_attr "num_insns"
-               "*,         *,         *,         *,         *,         *,
-                *,         *,         *,         *,         *,         *,
-                *,         *,         *")])
+                *,         *")])
 
 ;; Explicit  load/store expanders for the builtin functions
 (define_expand "vsx_load_<mode>"
@@ -6348,79 +6330,6 @@
   DONE;
 })
 
-;; XXSPLTI32DX used to create 64-bit constants
-(define_mode_iterator XXSPLTI32DX [SF DF V2DF V2DI])
-
-(define_insn_and_split "*xxsplti32dx_<mode>"
-  [(set (match_operand:XXSPLTI32DX 0 "vsx_register_operand" "=wa")
-	(match_operand:XXSPLTI32DX 1 "xxsplti32dx_operand"))]
-  "TARGET_XXSPLTI32DX"
-  "#"
-  "&& 1"
-  [(set (match_dup 0)
-	(unspec:XXSPLTI32DX [(match_dup 2)
-			     (match_dup 3)] UNSPEC_XXSPLTI32DX_CONST))
-   (set (match_dup 0)
-	(unspec:XXSPLTI32DX [(match_dup 0)
-			     (match_dup 4)
-			     (match_dup 5)] UNSPEC_XXSPLTI32DX_CONST))]
-{
-  HOST_WIDE_INT value = 0;
-
-  if (!xxsplti32dx_constant_p (operands[1], <MODE>mode, &value))
-    gcc_unreachable ();
-
-  HOST_WIDE_INT high = value >> 32;
-  HOST_WIDE_INT low = value & 0xffffffff;
-
-  /* If the low bits are 0/-1, initialize that word first.  This way we can
-     use a smaller XXSPLTIB instruction instead the first XXSPLTI32DX.  */
-  if (low == 0 || low == -1)
-    {
-      operands[2] = const1_rtx;
-      operands[3] = GEN_INT (low);
-      operands[4] = const0_rtx;
-      operands[5] = GEN_INT (high);
-    }
-  else
-    {
-      operands[2] = const0_rtx;
-      operands[3] = GEN_INT (high);
-      operands[4] = const1_rtx;
-      operands[5] = GEN_INT (low);
-    }
-}
-  [(set_attr "type" "vecperm")
-   (set_attr "prefixed" "yes")
-   (set_attr "num_insns" "2")
-   (set_attr "max_prefixed_insns" "2")])
-
-;; First word of XXSPLTI32DX
-(define_insn "*xxsplti32dx_<mode>_first"
-  [(set (match_operand:XXSPLTI32DX 0 "vsx_register_operand" "=wa,wa,wa")
-	(unspec:XXSPLTI32DX [(match_operand 1 "u1bit_cint_operand" "n,n,n")
-			     (match_operand 2 "const_int_operand" "O,wM,n")]
-			    UNSPEC_XXSPLTI32DX_CONST))]
-  "TARGET_XXSPLTI32DX"
-  "@
-   xxspltib %x0,0
-   xxspltib %x0,255
-   xxsplti32dx %x0,%1,%2"
-  [(set_attr "type" "vecperm")
-   (set_attr "prefixed" "*,*,yes")])
-
-;; Second word of XXSPLTI32DX
-(define_insn "*xxsplti32dx_<mode>_second"
-  [(set (match_operand:XXSPLTI32DX 0 "vsx_register_operand" "=wa")
-	(unspec:XXSPLTI32DX [(match_operand:XXSPLTI32DX 1 "vsx_register_operand" "0")
-			     (match_operand 2 "u1bit_cint_operand" "n")
-			     (match_operand 3 "const_int_operand" "n")]
-			    UNSPEC_XXSPLTI32DX_CONST))]
-  "TARGET_XXSPLTI32DX"
-  "xxsplti32dx %x0,%2,%3"
-  [(set_attr "type" "vecperm")
-   (set_attr "prefixed" "yes")])
-
 ;; XXSPLTI32DX built-in support.
 (define_expand "xxsplti32dx_v4si"
   [(set (match_operand:V4SI 0 "register_operand" "=wa")
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c
index 1435ef4ef4f..8f6e176f9af 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c
@@ -48,16 +48,13 @@ scalar_double_m_inf (void)	/* XXSPLTIDP.  */
 double
 scalar_double_pi (void)
 {
-  return M_PI;			/* 2x XXSPLTI32DX.  */
+  return M_PI;			/* PLFD.  */
 }
 
 double
 scalar_double_denorm (void)
 {
-  return 0x1p-149f;		/* XXSPLTIB, XXSPLTI32DX.  */
+  return 0x1p-149f;		/* PLFD.  */
 }
 
-/* { dg-final { scan-assembler-times {\mxxspltidp\M}   5 } } */
-/* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 3 } } */
-/* { dg-final { scan-assembler-not   {\mplfd\M}          } } */
-/* { dg-final { scan-assembler-not   {\mplxsd\M}         } } */
+/* { dg-final { scan-assembler-times {\mxxspltidp\M} 5 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c
index e9a45d5159d..72504bdfbbd 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c
@@ -57,7 +57,4 @@ scalar_float_denorm (void)
   return 0x1p-149f;		/* PLFS.  */
 }
 
-/* { dg-final { scan-assembler-times {\mxxspltidp\M}   6 } } */
-/* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 1 } } */
-/* { dg-final { scan-assembler-not   {\mplfs\M}          } } */
-/* { dg-final { scan-assembler-not   {\mplxssp\M}        } } */
+/* { dg-final { scan-assembler-times {\mxxspltidp\M} 6 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c
index d81198b163d..d509459292c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c
@@ -51,16 +51,14 @@ v2df_double_m_inf (void)
 vector double
 v2df_double_pi (void)
 {
-  return (vector double) { M_PI, M_PI };		/* 2x XXSPLTI32DX.  */
+  return (vector double) { M_PI, M_PI };		/* PLFD.  */
 }
 
 vector double
 v2df_double_denorm (void)
 {
-  return (vector double) { (double)0x1p-149f,		/* XXSPLTIB, */
-			   (double)0x1p-149f };		/* XXSPLTI32DX.  */
+  return (vector double) { (double)0x1p-149f,
+			   (double)0x1p-149f };		/* PLFD.  */
 }
 
-/* { dg-final { scan-assembler-times {\mxxspltidp\M}   5 } } */
-/* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 3 } } */
-/* { dg-final { scan-assembler-not   {\mplxv\M}          } } */
+/* { dg-final { scan-assembler-times {\mxxspltidp\M} 5 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
index f0eb982eadf..06a8289d09b 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
@@ -162,4 +162,4 @@ main (int argc, char *argv [])
 
 /* { dg-final { scan-assembler-times {\mxxspltiw\M} 1 } } */
 /* { dg-final { scan-assembler-times {\mxxspltidp\M} 2 } } */
-/* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 4 } } */
+/* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 3 } } */


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gcc(refs/users/meissner/heads/work046)] Revert patch.
@ 2021-04-10  3:02 Michael Meissner
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Meissner @ 2021-04-10  3:02 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:a066689ae6b585cceca4b8a3f2b864d4f33f0032

commit a066689ae6b585cceca4b8a3f2b864d4f33f0032
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Fri Apr 9 23:01:45 2021 -0400

    Revert patch.
    
    Do not pass -rpath to linker with advance toolchain
    
    (#ltc-toolchain on March 3/8)
    
    gcc/
    2021-04-07  Michael Meissner  <meissner@linux.ibm.com>
    
            Revert patch.
            * config.gcc (powerpc*-*-*, rs6000-*-*): Do not set
            LINK_OS_EXTRA_SPEC32 or LINK_OS_EXTRA_SPEC664 for the Advance
            Toolchain.

Diff:
---
 gcc/config.gcc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 8bf24002502..997a9f61a5c 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -5097,6 +5097,16 @@ case "${target}" in
 			(at="/opt/$with_advance_toolchain"
 			 echo "/* Use Advance Toolchain $at */"
 			 echo
+			 echo "#undef  LINK_OS_EXTRA_SPEC32"
+			 echo "#define LINK_OS_EXTRA_SPEC32" \
+			      "\"%(link_os_new_dtags)" \
+			      "-rpath $prefix/lib -rpath $at/lib\""
+			 echo
+			 echo "#undef  LINK_OS_EXTRA_SPEC64"
+			 echo "#define LINK_OS_EXTRA_SPEC64" \
+			      "\"%(link_os_new_dtags)" \
+			      "-rpath $prefix/lib64 -rpath $at/lib64\""
+			 echo
 			 echo "#undef  LINK_OS_NEW_DTAGS_SPEC"
 			 echo "#define LINK_OS_NEW_DTAGS_SPEC" \
 			      "\"--enable-new-dtags\""


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gcc(refs/users/meissner/heads/work046)] Revert patch.
@ 2021-04-08 19:44 Michael Meissner
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Meissner @ 2021-04-08 19:44 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:befbd49b5bed1f3ed52cb2555e7cb2b10c56b603

commit befbd49b5bed1f3ed52cb2555e7cb2b10c56b603
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Thu Apr 8 15:43:47 2021 -0400

    Revert patch.
    
    gcc/
    2021-04-08  Michael Meissner  <meissner@linux.ibm.com>
    
            Revert patch.
            * config/rs6000/contraints.md (eD): New constraint.
            * config/rs6000/predicates.md (easy_fp_constant): If we can load
            the constant with a pair of XXSPLTI32DX instructions, it is easy.
            (xxsplti32dx_operand): New predicate.
            (easy_vector_constant): If we can load the constant with a pair of
            XXSPLTI32DX instructions, it is easy.
            * config/rs6000/rs6000-cpus.def (OTHER_POWER10_MASKS): Add
            -mxxsplti32dx.
            (POWERPC_MASKS): Add -mxxsplti32dx.
            * config/rs6000/rs6000-protos.h (xxsplti32dx_constant_p): New
            declaration.
            * config/rs6000/rs6000.c (rs6000_option_override_internal): Add
            -mxxsplti32dx support.
            (xxsplti32dx_constant_p): New helper function.
            (output_vec_const_move): Split constants that need XXSPLTI32DX.
            (rs6000_opt_masks): Add -mxxsplti32dx.
            * config/rs6000/rs6000.md (movsf_hardfloat): Add support for
            loading constants with XXSPLTI32DX.
            (mov<mode>_hardfloat32, FMOVE64 iterator): Add support for loading
            constants with XXSPLTI32DX.
            (mov<mode>_hardfloat64, FMOVE64 iterator): Add support for loading
            constants with XXSPLTI32DX.
            * config/rs6000/rs6000.opt (-mxxsplti32dx): New switch.
            * config/rs6000/vsx.md (UNSPEC_XXSPLTI32DX_CONST): New unspec.
            (vsx_mov<mode>_64bit): Add support for loading constants with
            XXSPLTI32DX.
            (vsx_mov<mode>_32bit): Add support for loading constants with
            XXSPLTI32DX.
            (XXSPLTI32DX): New mode iterator.
            (xxsplti32dx_<mode>): New insn and splits.
            (xxsplti32dx_<mode>_first): New insns.
            (xxsplti32dx_<mode>_second): New insns.
    
    gcc/testsuite/
    2021-04-08  Michael Meissner  <meissner@linux.ibm.com>
    
            Revert patch.
            * gcc.target/powerpc/vec-splati-runnable.c: Update insn count.

Diff:
---
 gcc/config/rs6000/constraints.md                   |   6 -
 gcc/config/rs6000/predicates.md                    |  22 ----
 gcc/config/rs6000/rs6000-cpus.def                  |   2 -
 gcc/config/rs6000/rs6000-protos.h                  |   1 -
 gcc/config/rs6000/rs6000.c                         |  94 ----------------
 gcc/config/rs6000/rs6000.md                        |  44 +++-----
 gcc/config/rs6000/rs6000.opt                       |   4 -
 gcc/config/rs6000/vsx.md                           | 121 +++------------------
 .../gcc.target/powerpc/vec-splati-runnable.c       |   2 +-
 9 files changed, 29 insertions(+), 267 deletions(-)

diff --git a/gcc/config/rs6000/constraints.md b/gcc/config/rs6000/constraints.md
index c7137337f4c..70b1eb01770 100644
--- a/gcc/config/rs6000/constraints.md
+++ b/gcc/config/rs6000/constraints.md
@@ -208,12 +208,6 @@
   (and (match_code "const_int")
        (match_test "((- (unsigned HOST_WIDE_INT) ival) + 0x8000) < 0x10000")))
 
-;; SF/DF/V2DF/DI/V2DI scalar or vector constant that can be loaded with a pair
-;; of XXSPLTI32DX instructions.
-(define_constraint "eD"
-  "A vector constant that can be loaded with XXSPLTI32DX instructions."
-  (match_operand 0 "xxsplti32dx_operand"))
-
 ;; SF/DF/V2DF scalar or vector constant that can be loaded with XXSPLTIDP
 (define_constraint "eF"
   "A vector constant that can be loaded with the XXSPLTIDP instruction."
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 281c6e835b9..48d9c5509a2 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -606,11 +606,6 @@
   if (xxspltidp_operand (op, mode))
     return 1;
 
-  /* If we have the ISA 3.1 XXSPLTI32DX instruction, see if the constant can
-     be loaded with a pair of those instructions.  */
-  if (xxsplti32dx_operand (op, mode))
-    return 1;
-
   /* 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
@@ -682,20 +677,6 @@
   return xxspltidp_constant_p (op, mode, &value);
 })
 
-;; Return 1 if operand is a SF/DF CONST_DOUBLE or V2DF CONST_VECTOR that can be
-;; loaded via a pair f ISA 3.1 XXSPLTI32DX instructions.  Do not return true if
-;; the value is 0.0 or it can be loaded with XXSPLTIDP, since that is easy to
-;; generate without using XXSPLTI32DX.
-(define_predicate "xxsplti32dx_operand"
-  (match_code "const_double,const_int,const_vector,vec_duplicate")
-{
-  if (op == CONST0_RTX (mode))
-    return false;
-
-  HOST_WIDE_INT value = 0;
-  return xxsplti32dx_constant_p (op, mode, &value);
-})
-
 ;; Return 1 if the operand is a CONST_VECTOR and can be loaded into a
 ;; vector register without using memory.
 (define_predicate "easy_vector_constant"
@@ -715,9 +696,6 @@
       if (xxspltidp_operand (op, mode))
 	return true;
 
-      if (xxsplti32dx_operand (op, mode))
-	return true;
-
       if (TARGET_P9_VECTOR
           && xxspltib_constant_p (op, mode, &num_insns, &value))
 	return true;
diff --git a/gcc/config/rs6000/rs6000-cpus.def b/gcc/config/rs6000/rs6000-cpus.def
index 5a14191cc6c..cf4044831f7 100644
--- a/gcc/config/rs6000/rs6000-cpus.def
+++ b/gcc/config/rs6000/rs6000-cpus.def
@@ -79,7 +79,6 @@
 				 | OPTION_MASK_PCREL			\
 				 | OPTION_MASK_PCREL_OPT		\
 				 | OPTION_MASK_PREFIXED			\
-				 | OPTION_MASK_XXSPLTI32DX		\
 				 | OPTION_MASK_XXSPLTIDP		\
 				 | OPTION_MASK_XXSPLTIW)
 
@@ -164,7 +163,6 @@
 				 | OPTION_MASK_SOFT_FLOAT		\
 				 | OPTION_MASK_STRICT_ALIGN_OPTIONAL	\
 				 | OPTION_MASK_VSX			\
-				 | OPTION_MASK_XXSPLTI32DX		\
 				 | OPTION_MASK_XXSPLTIDP		\
 				 | OPTION_MASK_XXSPLTIW)
 
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index 12bf60b043d..0fe1c176236 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -34,7 +34,6 @@ extern bool easy_altivec_constant (rtx, machine_mode);
 extern bool xxspltib_constant_p (rtx, machine_mode, int *, int *);
 extern bool xxspltiw_constant_p (rtx, machine_mode, HOST_WIDE_INT *);
 extern bool xxspltidp_constant_p (rtx, machine_mode, HOST_WIDE_INT *);
-extern bool xxsplti32dx_constant_p (rtx, machine_mode, HOST_WIDE_INT *);
 extern int vspltis_shifted (rtx);
 extern HOST_WIDE_INT const_vector_elt_as_int (rtx, unsigned int);
 extern bool macho_lo_sum_memory_operand (rtx, machine_mode);
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 659eb301c87..08a853f2e8f 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4484,10 +4484,6 @@ rs6000_option_override_internal (bool global_init_p)
       && (rs6000_isa_flags_explicit & OPTION_MASK_XXSPLTIDP) == 0)
     rs6000_isa_flags |= OPTION_MASK_XXSPLTIDP;
 
-  if (TARGET_POWER10 && TARGET_VSX
-      && (rs6000_isa_flags_explicit & OPTION_MASK_XXSPLTI32DX) == 0)
-    rs6000_isa_flags |= OPTION_MASK_XXSPLTI32DX;
-
   if (!TARGET_PCREL && TARGET_PCREL_OPT)
     rs6000_isa_flags &= ~OPTION_MASK_PCREL_OPT;
 
@@ -6614,92 +6610,6 @@ xxspltidp_constant_p (rtx op,
   return true;
 }
 
-/* Return true if OP is of the given MODE and can be synthesized with ISA 3.1
-   XXSPLTI32DX instruction.  If the instruction can be synthesized with
-   XXSPLTIDP or is 0/-1, return false;
-
-   Return the 64-bit constant to use in the two XXSPLTI32DX instructions via
-   CONSTANT_PTR.  */
-
-bool
-xxsplti32dx_constant_p (rtx op,
-			machine_mode mode,
-			HOST_WIDE_INT *constant_ptr)
-{
-  *constant_ptr = 0;
-
-  if (!TARGET_XXSPLTI32DX)
-    return false;
-
-  if (mode == VOIDmode)
-    mode = GET_MODE (op);
-
-  if (op == CONST0_RTX (mode))
-    return false;
-
-  rtx element = op;
-  if (mode == V2DFmode || mode == V2DImode)
-    {
-      /* Handle VEC_DUPLICATE and CONST_VECTOR.  */
-      if (GET_CODE (op) == VEC_DUPLICATE)
-	element = XEXP (op, 0);
-
-      else if (GET_CODE (op) == CONST_VECTOR)
-       {
-         element = CONST_VECTOR_ELT (op, 0);
-         if (!rtx_equal_p (element, CONST_VECTOR_ELT (op, 1)))
-           return false;
-       }
-
-      else
-       return false;
-
-      mode = GET_MODE_INNER (mode);
-    }
-
-  if (GET_MODE (element) != mode)
-    return false;
-
-  /* Handle floating point constants.  */
-  if (mode == SFmode || mode == DFmode)
-    {
-      HOST_WIDE_INT xxspltidp_value = 0;
-
-      if (!CONST_DOUBLE_P (element))
-	return false;
-
-      if (xxspltidp_constant_p (element, mode, &xxspltidp_value))
-	return false;
-
-      long high_low[2];
-      const struct real_value *rv = CONST_DOUBLE_REAL_VALUE (element);
-      REAL_VALUE_TO_TARGET_DOUBLE (*rv, high_low);
-
-      if (!BYTES_BIG_ENDIAN)
-	std::swap (high_low[0], high_low[1]);
-
-      *constant_ptr = (high_low[0] << 32) | (high_low[1] & 0xffffffff);
-      return true;
-    }
-
-  /* Handle integer constants.  */
-  else if (mode == DImode)
-    {
-      if (!CONST_INT_P (element))
-	return false;
-
-      HOST_WIDE_INT value = INTVAL (element);
-      if (value == -1)
-	return false;
-
-      *constant_ptr = value;
-      return true;
-    }
-
-  else
-    return false;
-}
-
 const char *
 output_vec_const_move (rtx *operands)
 {
@@ -6773,9 +6683,6 @@ output_vec_const_move (rtx *operands)
 	  return "xxspltidp %x0,%2";
 	}
 
-      if (xxsplti32dx_operand (vec, mode))
-	return "#";
-
       if (TARGET_P9_VECTOR
 	  && xxspltib_constant_p (vec, mode, &num_insns, &xxspltib_value))
 	{
@@ -24275,7 +24182,6 @@ static struct rs6000_opt_mask const rs6000_opt_masks[] =
   { "vsx",			OPTION_MASK_VSX,		false, true  },
   { "xxspltiw",			OPTION_MASK_XXSPLTIW,		false, true  },
   { "xxspltidp",		OPTION_MASK_XXSPLTIDP,		false, true  },
-  { "xxsplti32dx",		OPTION_MASK_XXSPLTI32DX,	false, true  },
 #ifdef OPTION_MASK_64BIT
 #if TARGET_AIX_OS
   { "aix64",			OPTION_MASK_64BIT,		false, false },
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index b5886d3ccf4..5569e0591e6 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -7564,17 +7564,17 @@
 ;;
 ;;	LWZ          LFS        LXSSP       LXSSPX     STFS       STXSSP
 ;;	STXSSPX      STW        XXLXOR      LI         FMR        XSCPSGNDP
-;;	MR           MT<x>      MF<x>       NOP        XXSPLTIDP  XXSPLTI32DX
+;;	MR           MT<x>      MF<x>       NOP        XXSPLTIDP
 
 (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,        wa")
+	  !r,        *c*l,      !r,         *h,        wa")
 	(match_operand:SF 1 "input_operand"
 	 "m,         m,         wY,         Z,         f,         v,
 	  wa,        r,         j,          j,         f,         wa,
-	  r,         r,         *h,         0,         eF,        eD"))]
+	  r,         r,         *h,         0,         eF"))]
   "(register_operand (operands[0], SFmode)
    || register_operand (operands[1], SFmode))
    && TARGET_HARD_FLOAT
@@ -7597,28 +7597,19 @@
    mt%0 %1
    mf%1 %0
    nop
-   #
    #"
   [(set_attr "type"
 	"load,       fpload,    fpload,     fpload,    fpstore,   fpstore,
 	 fpstore,    store,     veclogical, integer,   fpsimple,  fpsimple,
-	 *,          mtjmpr,    mfjmpr,     *,         vecperm,   vecperm")
+	 *,          mtjmpr,    mfjmpr,     *,         vecperm")
    (set_attr "isa"
 	"*,          *,         p9v,        p8v,       *,         p9v,
 	 p8v,        *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         p10,       p10")
+	 *,          *,         *,          *,         p10")
    (set_attr "prefixed"
 	"*,          *,         *,          *,         *,         *,
 	 *,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         yes,       yes")
-   (set_attr "max_prefixed_insns"
-	"*,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         2")
-   (set_attr "num_insns"
-	"*,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         2")])
+	 *,          *,         *,          *,         yes")])
 
 ;;	LWZ          LFIWZX     STW        STFIWX     MTVSRWZ    MFVSRWZ
 ;;	FMR          MR         MT%0       MF%1       NOP
@@ -7878,18 +7869,18 @@
 
 ;;           STFD         LFD         FMR         LXSD        STXSD
 ;;           LXSD         STXSD       XXLOR       XXLXOR      GPR<-0
-;;           LWZ          STW         MR          XXSPLTIDP   XXSPLTI32DX
+;;           LWZ          STW         MR          XXSPLTIDP
 
 
 (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,         wa")
+              Y,          r,          !r,         wa")
 	(match_operand:FMOVE64 1 "input_operand"
              "d,          m,          d,          wY,         <f64_p9>,
               Z,          <f64_av>,   <f64_vsx>,  <zero_fp>,  <zero_fp>,
-              r,          Y,          r,          eF,         eD"))]
+              r,          Y,          r,          eF"))]
   "! TARGET_POWERPC64 && TARGET_HARD_FLOAT
    && (gpc_reg_operand (operands[0], <MODE>mode)
        || gpc_reg_operand (operands[1], <MODE>mode))"
@@ -7907,33 +7898,24 @@
    #
    #
    #
-   #
    #"
   [(set_attr "type"
             "fpstore,     fpload,     fpsimple,   fpload,     fpstore,
              fpload,      fpstore,    veclogical, veclogical, two,
-             store,       load,       two,        vecperm,    vecperm")
+             store,       load,       two,        vecperm")
    (set_attr "size" "64")
    (set_attr "length"
             "*,           *,          *,          *,          *,
              *,           *,          *,          *,          8,
-             8,           8,          8,          *,          *")
+             8,           8,          8,          *")
    (set_attr "isa"
             "*,           *,          *,          p9v,        p9v,
              p7v,         p7v,        *,          *,          *,
-             *,           *,          *,          p10,        p10")
+             *,           *,          *,          p10")
    (set_attr "prefixed"
             "*,           *,          *,          *,          *,
              *,           *,          *,          *,          *,
-             *,           *,          *,          yes,        yes")
-   (set_attr "max_prefixed_insns"
-            "*,           *,          *,          *,          *,
-             *,           *,          *,          *,          *,
-             *,           *,          *,          *,          2")
-   (set_attr "num_insns"
-            "*,           *,          *,          *,          *,
-             *,           *,          *,          *,          *,
-             *,           *,          *,          *,          2")])
+             *,           *,          *,          yes")])
 
 ;;           STW      LWZ     MR      G-const H-const F-const
 
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index bd269369ca0..6620cdb7716 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -627,7 +627,3 @@ Generate (do not generate) the XXSPLTIW instruction.
 mxxspltidp
 Target Undocumented Mask(XXSPLTIDP) Var(rs6000_isa_flags)
 Generate (do not generate) the XXSPLTIDP instruction.
-
-mxxsplti32dx
-Target Undocumented Mask(XXSPLTI32DX) Var(rs6000_isa_flags)
-Generate (do not generate) the XXSPLTI32DX instruction.
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index 877f1cdca39..4b0307d447e 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -372,7 +372,6 @@
    UNSPEC_XXSPLTIW
    UNSPEC_XXSPLTIDP
    UNSPEC_XXSPLTI32DX
-   UNSPEC_XXSPLTI32DX_CONST
    UNSPEC_XXPERMX
    UNSPEC_XXEVAL
   ])
@@ -1174,19 +1173,16 @@
 ;;              VSX store  VSX load   VSX move  VSX->GPR   GPR->VSX    LQ (GPR)
 ;;              STQ (GPR)  GPR load   GPR store GPR move   XXSPLTIB    VSPLTISW
 ;;              VSX 0/-1   VMX const  GPR const LVX (VMX)  STVX (VMX)  XXSPLTI*
-;;              XXSPLTI32DX
 (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,       v,         <??r>,     wZ,        v,         wa,
-                wa")
+                ?wa,       v,         <??r>,     wZ,        v,         wa")
 
 	(match_operand:VSX_M 1 "input_operand" 
                "wa,        ZwO,       wa,        we,        r,         r,
                 wQ,        Y,         r,         r,         wE,        jwM,
-                ?jwM,      W,         <nW>,      v,         wZ,        eWeF,
-                eD"))]
+                ?jwM,      W,         <nW>,      v,         wZ,        eWeF"))]
 
   "TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode)
    && (register_operand (operands[0], <MODE>mode) 
@@ -1197,47 +1193,41 @@
   [(set_attr "type"
                "vecstore,  vecload,   vecsimple, mtvsr,     mfvsr,     load,
                 store,     load,      store,     *,         vecsimple, vecsimple,
-                vecsimple, *,         *,         vecstore,  vecload,   vecperm,
-                vecperm")
+                vecsimple, *,         *,         vecstore,  vecload,   vecperm")
    (set_attr "num_insns"
                "*,         *,         *,         2,         *,         2,
                 2,         2,         2,         2,         *,         *,
-                *,         5,         2,         *,         *,         *,
-                2")
+                *,         5,         2,         *,         *,         *")
    (set_attr "max_prefixed_insns"
                "*,         *,         *,         *,         *,         2,
                 2,         2,         2,         2,         *,         *,
-                *,         *,         *,         *,         *,         *,
-                2")
+                *,         *,         *,         *,         *,         *")
    (set_attr "length"
                "*,         *,         *,         8,         *,         8,
                 8,         8,         8,         8,         *,         *,
-                *,         20,        8,         *,         *,         *,
-                *")
+                *,         20,        8,         *,         *,         *")
    (set_attr "isa"
                "<VSisa>,   <VSisa>,   <VSisa>,   *,         *,         *,
                 *,         *,         *,         *,         p9v,       *,
-                <VSisa>,   *,         *,         *,         *,         p10,
-                p10")
+                <VSisa>,   *,         *,         *,         *,         p10")
    (set_attr "prefixed"
                "*,         *,         *,         *,         *,         *,
                 *,         *,         *,         *,         *,         *,
-                *,         *,         *,         *,         *,         yes,
-                yes")])
+                *,         *,         *,         *,         *,         yes")])
 
 ;;              VSX store  VSX load   VSX move   GPR load   GPR store  GPR move
 ;;              XXSPLTIB   VSPLTISW   VSX 0/-1   VMX const  GPR const  XXSPLTI*
-;;              LVX (VMX)  STVX (VMX) XXSPLTI32DX
+;;              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,       v,         <??r>,     wa,
-                wZ,        v,         wa")
+                wZ,        v")
 
 	(match_operand:VSX_M 1 "input_operand" 
                "wa,        ZwO,       wa,        Y,         r,         r,
                 wE,        jwM,       ?jwM,      W,         <nW>,      eWeF,
-                v,         wZ,        eD"))]
+                v,         wZ"))]
 
   "!TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode)
    && (register_operand (operands[0], <MODE>mode) 
@@ -1248,27 +1238,19 @@
   [(set_attr "type"
                "vecstore,  vecload,   vecsimple, load,      store,    *,
                 vecsimple, vecsimple, vecsimple, *,         *,        vecperm,
-                vecstore,  vecload,   vecperm")
+                vecstore,  vecload")
    (set_attr "length"
                "*,         *,         *,         16,        16,        16,
                 *,         *,         *,         20,        16,        *,
-                *,         *,         *")
+                *,         *")
    (set_attr "isa"
                "<VSisa>,   <VSisa>,   <VSisa>,   *,         *,         *,
                 p9v,       *,         <VSisa>,   *,         *,         p10,
-                *,         *,         p10")
+                *,         *")
    (set_attr "prefixed"
                "*,         *,         *,         *,         *,         *,
                 *,         *,         *,         *,         *,         yes,
-                *,         *,         yes")
-   (set_attr "max_prefixed_insns"
-               "*,         *,         *,         *,         *,         *,
-                *,         *,         *,         *,         *,         *,
-                *,         *,         2")
-   (set_attr "num_insns"
-               "*,         *,         *,         *,         *,         *,
-                *,         *,         *,         *,         *,         *,
-                *,         *,         *")])
+                *,         *")])
 
 ;; Explicit  load/store expanders for the builtin functions
 (define_expand "vsx_load_<mode>"
@@ -6348,79 +6330,6 @@
   DONE;
 })
 
-;; XXSPLTI32DX used to create 64-bit constants
-(define_mode_iterator XXSPLTI32DX [SF DF V2DF V2DI])
-
-(define_insn_and_split "*xxsplti32dx_<mode>"
-  [(set (match_operand:XXSPLTI32DX 0 "vsx_register_operand" "=wa")
-	(match_operand:XXSPLTI32DX 1 "xxsplti32dx_operand"))]
-  "TARGET_XXSPLTI32DX"
-  "#"
-  "&& 1"
-  [(set (match_dup 0)
-	(unspec:XXSPLTI32DX [(match_dup 2)
-			     (match_dup 3)] UNSPEC_XXSPLTI32DX_CONST))
-   (set (match_dup 0)
-	(unspec:XXSPLTI32DX [(match_dup 0)
-			     (match_dup 4)
-			     (match_dup 5)] UNSPEC_XXSPLTI32DX_CONST))]
-{
-  HOST_WIDE_INT value = 0;
-
-  if (!xxsplti32dx_constant_p (operands[1], <MODE>mode, &value))
-    gcc_unreachable ();
-
-  HOST_WIDE_INT high = value >> 32;
-  HOST_WIDE_INT low = value & 0xffffffff;
-
-  /* If the low bits are 0/-1, initialize that word first.  This way we can
-     use a smaller XXSPLTIB instruction instead the first XXSPLTI32DX.  */
-  if (low == 0 || low == -1)
-    {
-      operands[2] = const1_rtx;
-      operands[3] = GEN_INT (low);
-      operands[4] = const0_rtx;
-      operands[5] = GEN_INT (high);
-    }
-  else
-    {
-      operands[2] = const0_rtx;
-      operands[3] = GEN_INT (high);
-      operands[4] = const1_rtx;
-      operands[5] = GEN_INT (low);
-    }
-}
-  [(set_attr "type" "vecperm")
-   (set_attr "prefixed" "yes")
-   (set_attr "num_insns" "2")
-   (set_attr "max_prefixed_insns" "2")])
-
-;; First word of XXSPLTI32DX
-(define_insn "*xxsplti32dx_<mode>_first"
-  [(set (match_operand:XXSPLTI32DX 0 "vsx_register_operand" "=wa,wa,wa")
-	(unspec:XXSPLTI32DX [(match_operand 1 "u1bit_cint_operand" "n,n,n")
-			     (match_operand 2 "const_int_operand" "O,wM,n")]
-			    UNSPEC_XXSPLTI32DX_CONST))]
-  "TARGET_XXSPLTI32DX"
-  "@
-   xxspltib %x0,0
-   xxspltib %x0,255
-   xxsplti32dx %x0,%1,%2"
-  [(set_attr "type" "vecperm")
-   (set_attr "prefixed" "*,*,yes")])
-
-;; Second word of XXSPLTI32DX
-(define_insn "*xxsplti32dx_<mode>_second"
-  [(set (match_operand:XXSPLTI32DX 0 "vsx_register_operand" "=wa")
-	(unspec:XXSPLTI32DX [(match_dup 0)
-			     (match_operand 1 "u1bit_cint_operand" "n")
-			     (match_operand 2 "const_int_operand" "n")]
-			    UNSPEC_XXSPLTI32DX_CONST))]
-  "TARGET_XXSPLTI32DX"
-  "xxsplti32dx %x0,%1,%2"
-  [(set_attr "type" "vecperm")
-   (set_attr "prefixed" "yes")])
-
 ;; XXSPLTI32DX built-in support.
 (define_expand "xxsplti32dx_v4si"
   [(set (match_operand:V4SI 0 "register_operand" "=wa")
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
index f0eb982eadf..06a8289d09b 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
@@ -162,4 +162,4 @@ main (int argc, char *argv [])
 
 /* { dg-final { scan-assembler-times {\mxxspltiw\M} 1 } } */
 /* { dg-final { scan-assembler-times {\mxxspltidp\M} 2 } } */
-/* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 4 } } */
+/* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 3 } } */


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gcc(refs/users/meissner/heads/work046)] Revert patch.
@ 2021-04-07 21:38 Michael Meissner
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Meissner @ 2021-04-07 21:38 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:5946a1decd871b73bea96fd5bee86e681def6f02

commit 5946a1decd871b73bea96fd5bee86e681def6f02
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Wed Apr 7 17:37:54 2021 -0400

    Revert patch.
    
    gcc/testsuite/
    2021-04-07  Michael Meissner  <meissner@linux.ibm.com>
    
            Revert patch.
            * gcc.target/powerpc/vec-splat-constant-sf.c: New test.
            * gcc.target/powerpc/vec-splat-constant-df.c: New test.
            * gcc.target/powerpc/vec-splat-constant-v2df.c: New test.

Diff:
---
 .../gcc.target/powerpc/vec-splat-constant-df.c     | 62 --------------------
 .../gcc.target/powerpc/vec-splat-constant-sf.c     | 62 --------------------
 .../gcc.target/powerpc/vec-splat-constant-v2df.c   | 66 ----------------------
 3 files changed, 190 deletions(-)

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 20247b73006..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c
+++ /dev/null
@@ -1,62 +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 {\mxxspltib\|xxlxorM} 1 } } */
-/* { dg-final { scan-assembler-times {\mxxspltidp\M}       5 } } */
-/* { dg-final { scan-assembler-times {\mplfd\|plxsd\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 12accbb80dc..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c
+++ /dev/null
@@ -1,62 +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 {\mxxspltib\|xxlxorM} 1 } } */
-/* { dg-final { scan-assembler-times {\mxxspltidp\M}       6 } } */
-/* { dg-final { scan-assembler-times {\mplfs\|pstxssp\M}   1 } } */
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 04ab01789bd..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c
+++ /dev/null
@@ -1,66 +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 };		/* PLFD.  */
-}
-
-vector double
-v2df_double_denorm (void)
-{
-  return (vector double) { (double)0x1p-149f,
-			   (double)0x1p-149f };		/* PLFD.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltib\|xxlxorM} 1 } } */
-/* { dg-final { scan-assembler-times {\mxxspltidp\M}       5 } } */
-/* { dg-final { scan-assembler-times {\mplfd\|plxsd\M}     2 } } */


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gcc(refs/users/meissner/heads/work046)] Revert patch.
@ 2021-04-07 20:17 Michael Meissner
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Meissner @ 2021-04-07 20:17 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:ee2b70ed35187ff214a82cd7ab573a5a3523ac54

commit ee2b70ed35187ff214a82cd7ab573a5a3523ac54
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Wed Apr 7 16:16:35 2021 -0400

    Revert patch.
    
    gcc/
    2021-04-07  Michael Meissner  <meissner@linux.ibm.com>
    
            Revert patch.
            * config/rs6000/altivec.md (UNSPEC_XXSPLTID): Move to vsx.md and
            rename to UNSPEC_XXSPLTID.
            (xxspltidp_v2df): Move to vsx.md and re-implement.
            (xxspltidp_v2df_inst): Move to vsx.md and re-implement.
            * config/rs6000/constraints.md (eF): New constraint.
            * config/rs6000/predicates.md (easy_fp_constant): If we load the
            scalar constant with XXSPLTIDP, return true.
            (xxspltidp_operand): New predicate.
            (easy_vector_constant): If we can generate XXSPLTIDP, mark the
            vector constant as easy.
            * config/rs6000/rs6000-cpus.def (OTHER_POWER10_MASKS): Add
            -mxxspltidp support.
            (POWERPC_MASKS): Add -mxxspltidp support.
            * config/rs6000/rs6000-protos.h (xxspltidp_constant_p): New
            declaration.
            * config/rs6000/rs6000.c (rs6000_option_override_internal): Add
            -mxxspltidp support.
            (xxspltidp_constant_p): New function.
            (output_vec_const_move): Add support for XXSPLTIDP.
            (rs6000_opt_masks): Add -mxxspltidp support.
            (rs6000_emit_xxspltidp_v2df): Change function to implement the
            XXSPLTIDP instruction.
            * config/rs6000/rs6000.md (movsf_hardfloat): Add XXSPLTIDP
            support.
            (mov<mode>_hardfloat32, FMOVE64 iterator): Add XXSPLTIDP support.
            (mov<mode>_hardfloat64, FMOVE64 iterator): Add XXSPLTIDP support.
            * config/rs6000/rs6000.opt (-mxxspltidp): New switch.
            * config/rs6000/vsx.md (UNSPEC_XXSPLTIDP): Move here from
            altivec.md.  Rename it to UNSPEC_XXSPLTIDP to match the
            instruction.
            (vsx_mov<mode>_64bit): Add XXSPLTIDP support.
            (vsx_mov<mode>_32bit): Add XXSPLTIDP support.
            (XXSPLTIDP): New mode iterator.
            (xxspltidp_<mode>_internal1): New define_insn_and_split.
            (xxspltidp_<mode>_internal2): New define_insn.
            (xxspltidp_v2df): Move to vsx.md from altivec.md.  Re-implement to
            use the new constant format.

Diff:
---
 gcc/config/rs6000/altivec.md      | 21 +++++++++++
 gcc/config/rs6000/constraints.md  |  5 ---
 gcc/config/rs6000/predicates.md   | 21 -----------
 gcc/config/rs6000/rs6000-cpus.def |  2 -
 gcc/config/rs6000/rs6000-protos.h |  1 -
 gcc/config/rs6000/rs6000.c        | 77 +--------------------------------------
 gcc/config/rs6000/rs6000.md       | 34 ++++++-----------
 gcc/config/rs6000/rs6000.opt      |  5 ---
 gcc/config/rs6000/vsx.md          | 47 +-----------------------
 9 files changed, 36 insertions(+), 177 deletions(-)

diff --git a/gcc/config/rs6000/altivec.md b/gcc/config/rs6000/altivec.md
index ad6ead04cfa..708296cb14d 100644
--- a/gcc/config/rs6000/altivec.md
+++ b/gcc/config/rs6000/altivec.md
@@ -176,6 +176,7 @@
    UNSPEC_VSTRIL
    UNSPEC_SLDB
    UNSPEC_SRDB
+   UNSPEC_XXSPLTID
    UNSPEC_XXSPLTI32DX
    UNSPEC_XXBLEND
    UNSPEC_XXPERMX
@@ -818,6 +819,26 @@
   "vs<SLDB_lr>dbi %0,%1,%2,%3"
   [(set_attr "type" "vecsimple")])
 
+(define_expand "xxspltidp_v2df"
+  [(set (match_operand:V2DF 0 "register_operand" )
+	(unspec:V2DF [(match_operand:SF 1 "const_double_operand")]
+		     UNSPEC_XXSPLTID))]
+ "TARGET_POWER10"
+{
+  long value = rs6000_const_f32_to_i32 (operands[1]);
+  rs6000_emit_xxspltidp_v2df (operands[0], value);
+  DONE;
+})
+
+(define_insn "xxspltidp_v2df_inst"
+  [(set (match_operand:V2DF 0 "register_operand" "=wa")
+	(unspec:V2DF [(match_operand:SI 1 "c32bit_cint_operand" "n")]
+		     UNSPEC_XXSPLTID))]
+  "TARGET_POWER10"
+  "xxspltidp %x0,%1"
+  [(set_attr "type" "vecsimple")
+   (set_attr "prefixed" "yes")])
+
 (define_expand "xxsplti32dx_v4si"
   [(set (match_operand:V4SI 0 "register_operand" "=wa")
 	(unspec:V4SI [(match_operand:V4SI 1 "register_operand" "0")
diff --git a/gcc/config/rs6000/constraints.md b/gcc/config/rs6000/constraints.md
index 70b1eb01770..b3e36fbcfdf 100644
--- a/gcc/config/rs6000/constraints.md
+++ b/gcc/config/rs6000/constraints.md
@@ -208,11 +208,6 @@
   (and (match_code "const_int")
        (match_test "((- (unsigned HOST_WIDE_INT) ival) + 0x8000) < 0x10000")))
 
-;; SF/DF/V2DF scalar or vector constant that can be loaded with XXSPLTIDP
-(define_constraint "eF"
-  "A vector constant that can be loaded with the XXSPLTIDP instruction."
-  (match_operand 0 "xxspltidp_operand"))
-
 ;; 34-bit signed integer constant
 (define_constraint "eI"
   "A signed 34-bit integer constant if prefixed instructions are supported."
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 48d9c5509a2..dc23f62a3af 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -601,11 +601,6 @@
   if (TARGET_VSX && op == CONST0_RTX (mode))
     return 1;
 
-  /* If we have the ISA 3.1 XXSPLTIDP instruction, see if the constant can
-     be loaded with that instruction.  */
-  if (xxspltidp_operand (op, mode))
-    return 1;
-
   /* 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
@@ -664,19 +659,6 @@
   return !EASY_VECTOR_15 (value);
 })
 
-;; Return 1 if operand is a SF/DF CONST_DOUBLE or V2DF CONST_VECTOR that can be
-;; loaded via the ISA 3.1 XXSPLTIDP instruction.  Do not return true if the
-;; value is 0.0, since that is easy to generate without using XXSPLTIDP.
-(define_predicate "xxspltidp_operand"
-  (match_code "const_double,const_vector,vec_duplicate")
-{
-  if (op == CONST0_RTX (mode))
-    return false;
-
-  HOST_WIDE_INT value = 0;
-  return xxspltidp_constant_p (op, mode, &value);
-})
-
 ;; Return 1 if the operand is a CONST_VECTOR and can be loaded into a
 ;; vector register without using memory.
 (define_predicate "easy_vector_constant"
@@ -693,9 +675,6 @@
       if (xxspltiw_operand (op, mode))
 	return true;
 
-      if (xxspltidp_operand (op, mode))
-	return true;
-
       if (TARGET_P9_VECTOR
           && xxspltib_constant_p (op, mode, &num_insns, &value))
 	return true;
diff --git a/gcc/config/rs6000/rs6000-cpus.def b/gcc/config/rs6000/rs6000-cpus.def
index cf4044831f7..f7743374f26 100644
--- a/gcc/config/rs6000/rs6000-cpus.def
+++ b/gcc/config/rs6000/rs6000-cpus.def
@@ -79,7 +79,6 @@
 				 | OPTION_MASK_PCREL			\
 				 | OPTION_MASK_PCREL_OPT		\
 				 | OPTION_MASK_PREFIXED			\
-				 | OPTION_MASK_XXSPLTIDP		\
 				 | OPTION_MASK_XXSPLTIW)
 
 #define ISA_3_1_MASKS_SERVER	(ISA_3_0_MASKS_SERVER			\
@@ -163,7 +162,6 @@
 				 | OPTION_MASK_SOFT_FLOAT		\
 				 | OPTION_MASK_STRICT_ALIGN_OPTIONAL	\
 				 | OPTION_MASK_VSX			\
-				 | OPTION_MASK_XXSPLTIDP		\
 				 | OPTION_MASK_XXSPLTIW)
 
 #endif
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index 0fe1c176236..eff72af8814 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -33,7 +33,6 @@ extern void init_cumulative_args (CUMULATIVE_ARGS *, tree, rtx, int, int, int,
 extern bool easy_altivec_constant (rtx, machine_mode);
 extern bool xxspltib_constant_p (rtx, machine_mode, int *, int *);
 extern bool xxspltiw_constant_p (rtx, machine_mode, HOST_WIDE_INT *);
-extern bool xxspltidp_constant_p (rtx, machine_mode, HOST_WIDE_INT *);
 extern int vspltis_shifted (rtx);
 extern HOST_WIDE_INT const_vector_elt_as_int (rtx, unsigned int);
 extern bool macho_lo_sum_memory_operand (rtx, machine_mode);
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index f023747a578..54c338d73a5 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4480,10 +4480,6 @@ rs6000_option_override_internal (bool global_init_p)
       && (rs6000_isa_flags_explicit & OPTION_MASK_XXSPLTIW) == 0)
     rs6000_isa_flags |= OPTION_MASK_XXSPLTIW;
 
-  if (TARGET_POWER10 && TARGET_VSX
-      && (rs6000_isa_flags_explicit & OPTION_MASK_XXSPLTIDP) == 0)
-    rs6000_isa_flags |= OPTION_MASK_XXSPLTIDP;
-
   if (!TARGET_PCREL && TARGET_PCREL_OPT)
     rs6000_isa_flags &= ~OPTION_MASK_PCREL_OPT;
 
@@ -6541,69 +6537,6 @@ xxspltiw_constant_p (rtx op,
   return true;
 }
 
-/* Return true if OP is of the given MODE and can be synthesized with ISA 3.1
-   XXSPLTIDP instruction.
-
-   Return the constant that is being split via CONSTANT_PTR to use in the
-   XXSPLTIDP instruction.  */
-
-bool
-xxspltidp_constant_p (rtx op,
-		      machine_mode mode,
-		      HOST_WIDE_INT *constant_ptr)
-{
-  *constant_ptr = 0;
-
-  rtx element = op;
-  if (mode == V2DFmode)
-    {
-      /* Handle VEC_DUPLICATE and CONST_VECTOR.  */
-      if (GET_CODE (op) == VEC_DUPLICATE)
-       element = XEXP (op, 0);
-
-      else if (GET_CODE (op) == CONST_VECTOR)
-       {
-         element = CONST_VECTOR_ELT (op, 0);
-         if (!rtx_equal_p (element, CONST_VECTOR_ELT (op, 1)))
-           return false;
-       }
-
-      else
-       return false;
-
-      mode = DFmode;
-    }
-
-  if (mode != SFmode && mode != DFmode)
-    return false;
-
-  if (GET_MODE (element) != mode)
-    return false;
-
-  if (!CONST_DOUBLE_P (element))
-    return false;
-
-  /* Don't return true for 0.0 since that is easy to create without
-     XXSPLTIDP.  */
-  if (element == CONST0_RTX (mode))
-    return false;
-
-  /* If the value doesn't fit in a SFmode, exactly, we can't use XXSPLTIDP.  */
-  const struct real_value *rv = CONST_DOUBLE_REAL_VALUE (element);
-  if (!exact_real_truncate (SFmode, rv))
-    return 0;
-
-  long value;
-  REAL_VALUE_TO_TARGET_SINGLE (*rv, value);
-
-  /* Test for SFmode denormal (exponent is 0, mantissa field is non-zero).  */
-  if (((value & 0x7F800000) == 0) && ((value & 0x7FFFFF) != 0))
-    return false;
-
-  *constant_ptr = value;
-  return true;
-}
-
 const char *
 output_vec_const_move (rtx *operands)
 {
@@ -6670,13 +6603,6 @@ output_vec_const_move (rtx *operands)
 	  return "xxspltiw %x0,%2";
 	}
 
-      HOST_WIDE_INT xxspltidp_value = 0;
-      if (xxspltidp_constant_p (vec, mode, &xxspltidp_value))
-	{
-	  operands[2] = GEN_INT (xxspltidp_value);
-	  return "xxspltidp %x0,%2";
-	}
-
       if (TARGET_P9_VECTOR
 	  && xxspltib_constant_p (vec, mode, &num_insns, &xxspltib_value))
 	{
@@ -24175,7 +24101,6 @@ static struct rs6000_opt_mask const rs6000_opt_masks[] =
   { "update",			OPTION_MASK_NO_UPDATE,		true , true  },
   { "vsx",			OPTION_MASK_VSX,		false, true  },
   { "xxspltiw",			OPTION_MASK_XXSPLTIW,		false, true  },
-  { "xxspltidp",		OPTION_MASK_XXSPLTIDP,		false, true  },
 #ifdef OPTION_MASK_64BIT
 #if TARGET_AIX_OS
   { "aix64",			OPTION_MASK_64BIT,		false, false },
@@ -28001,7 +27926,7 @@ rs6000_emit_xxspltidp_v2df (rtx dst, long value)
     inform (input_location,
 	    "the result for the xxspltidp instruction "
 	    "is undefined for subnormal input values");
-  emit_insn( gen_xxspltidp_v2df_internal2 (dst, GEN_INT (value)));
+  emit_insn( gen_xxspltidp_v2df_inst (dst, GEN_INT (value)));
 }
 
 /* Implement TARGET_ASM_GENERATE_PIC_ADDR_DIFF_VEC.  */
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 5569e0591e6..ca4a4d01f05 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -7564,17 +7564,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,         eF"))]
+	  r,         r,         *h,         0"))]
   "(register_operand (operands[0], SFmode)
    || register_operand (operands[1], SFmode))
    && TARGET_HARD_FLOAT
@@ -7596,20 +7596,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")
-   (set_attr "prefixed"
-	"*,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         *,         *,
-	 *,          *,         *,          *,         yes")])
+	 *,          *,         *,          *")])
 
 ;;	LWZ          LFIWZX     STW        STFIWX     MTVSRWZ    MFVSRWZ
 ;;	FMR          MR         MT%0       MF%1       NOP
@@ -7869,18 +7864,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,          eF"))]
+              r,          Y,          r"))]
   "! TARGET_POWERPC64 && TARGET_HARD_FLOAT
    && (gpc_reg_operand (operands[0], <MODE>mode)
        || gpc_reg_operand (operands[1], <MODE>mode))"
@@ -7897,25 +7892,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")
-   (set_attr "prefixed"
-            "*,           *,          *,          *,          *,
-             *,           *,          *,          *,          *,
-             *,           *,          *,          yes")])
+             *,           *,          *")])
 
 ;;           STW      LWZ     MR      G-const H-const F-const
 
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 6620cdb7716..06e7cdbbced 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -622,8 +622,3 @@ Target Undocumented Var(rs6000_relative_jumptables) Init(1) Save
 
 mxxspltiw
 Target Undocumented Mask(XXSPLTIW) Var(rs6000_isa_flags)
-Generate (do not generate) the XXSPLTIW instruction.
-
-mxxspltidp
-Target Undocumented Mask(XXSPLTIDP) Var(rs6000_isa_flags)
-Generate (do not generate) the XXSPLTIDP instruction.
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index 270996c5e09..e5c5e157d1d 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -370,7 +370,6 @@
    UNSPEC_VDIVES
    UNSPEC_VDIVEU
    UNSPEC_XXSPLTIW
-   UNSPEC_XXSPLTIDP
   ])
 
 (define_int_iterator XVCVBF16	[UNSPEC_VSX_XVCVSPBF16
@@ -1179,7 +1178,7 @@
 	(match_operand:VSX_M 1 "input_operand" 
                "wa,        ZwO,       wa,        we,        r,         r,
                 wQ,        Y,         r,         r,         wE,        jwM,
-                ?jwM,      W,         <nW>,      v,         wZ,        eWeF"))]
+                ?jwM,      W,         <nW>,      v,         wZ,        eW"))]
 
   "TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode)
    && (register_operand (operands[0], <MODE>mode) 
@@ -1223,7 +1222,7 @@
 
 	(match_operand:VSX_M 1 "input_operand" 
                "wa,        ZwO,       wa,        Y,         r,         r,
-                wE,        jwM,       ?jwM,      W,         <nW>,      eWeF,
+                wE,        jwM,       ?jwM,      W,         <nW>,      eW,
                 v,         wZ"))]
 
   "!TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode)
@@ -6284,45 +6283,3 @@
   emit_move_insn (operands[0], cv);
   DONE;
 })
-
-;; XXSPLTIDP support.
-(define_mode_iterator XXSPLTIDP [SF DF V2DF])
-
-(define_insn_and_split "*xxspltidp_<mode>_internal1"
-  [(set (match_operand:XXSPLTIDP 0 "vsx_register_operand" "=wa")
-	(match_operand:XXSPLTIDP 1 "xxspltidp_operand"))]
-  "TARGET_XXSPLTIDP"
-  "#"
-  "&& 1"
-  [(set (match_operand:XXSPLTIDP 0 "vsx_register_operand")
-	(unspec:XXSPLTIDP [(match_dup 2)] UNSPEC_XXSPLTIDP))]
-{
-  HOST_WIDE_INT value = 0;
-
-  if (!xxspltidp_constant_p (operands[1], <MODE>mode, &value))
-    gcc_unreachable ();
-
-  operands[2] = GEN_INT (value);
-}
- [(set_attr "type" "vecperm")
-  (set_attr "prefixed" "yes")])
-
-(define_insn "xxspltidp_<mode>_internal2"
-  [(set (match_operand:XXSPLTIDP 0 "vsx_register_operand" "=wa")
-	(unspec:XXSPLTIDP [(match_operand 1 "const_int_operand" "n")]
-			  UNSPEC_XXSPLTIDP))]
-  "TARGET_XXSPLTIDP"
-  "xxspltidp %x0,%1"
- [(set_attr "type" "vecperm")
-  (set_attr "prefixed" "yes")])
-
-;; XXSPLTIDP built-in function support.
-(define_expand "xxspltidp_v2df"
-  [(use (match_operand:V2DF 0 "register_operand" ))
-   (use (match_operand:SF 1 "const_double_operand"))]
- "TARGET_POWER10"
-{
-  long value = rs6000_const_f32_to_i32 (operands[1]);
-  rs6000_emit_xxspltidp_v2df (operands[0], value);
-  DONE;
-})


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gcc(refs/users/meissner/heads/work046)] Revert patch.
@ 2021-04-07 19:17 Michael Meissner
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Meissner @ 2021-04-07 19:17 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:79804571ca24a81a6a329b1a65d9199ff4cc05db

commit 79804571ca24a81a6a329b1a65d9199ff4cc05db
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Wed Apr 7 15:16:42 2021 -0400

    Revert patch.
    
    gcc/testsuite/
    2021-04-07  Michael Meissner  <meissner@linux.ibm.com>
    
            Revert patch.
            * gcc.target/powerpc/vec-splati-runnable.c: Set optimization level
            to -O2.  Add missing abort call.  Update insn counts.
            * 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.

Diff:
---
 .../gcc.target/powerpc/vec-splat-constant-v4sf.c   | 66 ----------------------
 .../gcc.target/powerpc/vec-splat-constant-v4si.c   | 51 -----------------
 .../gcc.target/powerpc/vec-splat-constant-v8hi.c   | 53 -----------------
 .../gcc.target/powerpc/vec-splati-runnable.c       |  8 ++-
 4 files changed, 5 insertions(+), 173 deletions(-)

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 031f6fc4e30..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v4sf.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2 -save-temps" } */
-
-#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 };	/* XXSPLTIW.  */
-}
-
-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);				/* XXSPLTIW.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltiw\M}  8 } } */
-/* { dg-final { scan-assembler-not   {\mxxspltib\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-v4si.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v4si.c
deleted file mode 100644
index dd027715ad5..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 -save-temps" } */
-
-#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 62aab135f98..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v8hi.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target power10_ok } */
-/* { dg-options "-mdejagnu-cpu=power10 -O2 -save-temps" } */
-
-#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.  */
-}
-
-/* { dg-final { scan-assembler-times {\mxxspltiw\M}  4 } } */
-/* { 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 06a8289d09b..e84ce77a21d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { power10_hw } } } */
 /* { dg-do link { target { ! power10_hw } } } */
 /* { dg-require-effective-target power10_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power10 -save-temps" } */
+/* { dg-options "-mdejagnu-cpu=power10 -save-temps" } */
 #include <altivec.h>
 
 #define DEBUG 0
@@ -101,7 +101,7 @@ main (int argc, char *argv [])
       printf(" vresult_d[%i] = %e, expected_vresult_d[%i] = %e\n",
 	     i, vresult_d[i], i, expected_vresult_d[i]);
 #else
-    abort();
+    ;
 #endif
   }
 
@@ -160,6 +160,8 @@ main (int argc, char *argv [])
   return 0;
 }
 
-/* { dg-final { scan-assembler-times {\mxxspltiw\M} 1 } } */
+/* { dg-final { scan-assembler-times {\mxxspltiw\M} 2 } } */
 /* { dg-final { scan-assembler-times {\mxxspltidp\M} 2 } } */
 /* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 3 } } */
+
+


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-04-12 17:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-12 17:07 [gcc(refs/users/meissner/heads/work046)] Revert patch Michael Meissner
  -- strict thread matches above, loose matches on Subject: below --
2021-04-10  3:02 Michael Meissner
2021-04-08 19:44 Michael Meissner
2021-04-07 21:38 Michael Meissner
2021-04-07 20:17 Michael Meissner
2021-04-07 19:17 Michael Meissner

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).