Power10: Add options to disable load and store vector pair.

Message ID ZSnVmfS6Mi4n6V7C@cowardly-lion.the-meissners.org
State Accepted
Headers
Series Power10: Add options to disable load and store vector pair. |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Michael Meissner Oct. 13, 2023, 11:41 p.m. UTC
  In working on some future patches that involve utilizing vector pair
instructions, I wanted to be able to tune my program to enable or disable using
the vector pair load or store operations while still keeping the other
operations on the vector pair.

This patch adds two undocumented tuning options.  The -mno-load-vector-pair
option would tell GCC to generate two load vector instructions instead of a
single load vector pair.  The -mno-store-vector-pair option would tell GCC to
generate two store vector instructions instead of a single store vector pair.

If either -mno-load-vector-pair is used, GCC will not generate the indexed
stxvpx instruction.  Similarly if -mno-store-vector-pair is used, GCC will not
generate the indexed lxvpx instruction.  The reason for this is to enable
splitting the {,p}lxvp or {,p}stxvp instructions after reload without needing a
scratch GPR register.

The default for -mcpu=power10 is that both load vector pair and store vector
pair are enabled.

I decided that if the user explicitly used the __builtin_vsx_lxvp or the
__builtin_vsx_stxvp built-in functions to load or store a vector pair, that
those functions would always generate a vector pair instruction.

I added code so that the user code can modify these settings using either a
'#pragma GCC target' directive or used __attribute__((__target__(...))) in the
function declaration.

I added tests for the switches, #pragma, and attribute options.

I have built this on both little endian power10 systems and big endian power9
systems doing the normal bootstrap and test.  There were no regressions in any
of the tests, and the new tests passed.  Can I check this patch into the master
branch?

2023-10-13  Michael Meissner  <meissner@linux.ibm.com>

gcc/

	* config/rs6000/mma.md (movoo): Add support for -mload-vector-pair and
	-mstore-vector-pair.
	* config/rs6000/rs6000-cpus.def (OTHER_POWER10_MASKS): Likewise.
	(POWERPC_MASKS): Likewise.
	* config/rs6000/rs6000.md (rs6000_setup_reg_addr_masks): If either load
	vector pair or store vector pair instructions are not being generated,
	don't allow lxvpx or stxvpx to be generated.
	(rs6000_option_override_internal): Add warnings if either
	-mload-vector-pair or -mstore-vector-pair is used without having MMA
	instructions.
	(rs6000_opt_masks): Allow user to override -mload-vector-pair or
	-mstore-vector-pair via #pragma or attribute.
	* config/rs6000/rs6000.opt (-mload-vector-pair): New option.
	(-mstore-vector-pair): Likewise.

gcc/testsuite/

	* gcc.target/powerpc/vector-pair-attribute.c: New test.
	* gcc.target/powerpc/vector-pair-pragma.c: New test.
	* gcc.target/powerpc/vector-pair-switch1.c: New test.
	* gcc.target/powerpc/vector-pair-switch2.c: New test.
	* gcc.target/powerpc/vector-pair-switch3.c: New test.
	* gcc.target/powerpc/vector-pair-switch4.c: New test.
---
 gcc/config/rs6000/mma.md                      | 44 +++++++++++++++
 gcc/config/rs6000/rs6000-builtin.cc           | 46 +++++++++++++---
 gcc/config/rs6000/rs6000-builtins.def         |  6 ++
 gcc/config/rs6000/rs6000-cpus.def             |  8 ++-
 gcc/config/rs6000/rs6000.cc                   | 30 +++++++++-
 gcc/config/rs6000/rs6000.opt                  |  8 +++
 .../powerpc/vector-pair-attribute.c           | 39 +++++++++++++
 .../gcc.target/powerpc/vector-pair-builtin.c  | 40 ++++++++++++++
 .../gcc.target/powerpc/vector-pair-pragma.c   | 55 +++++++++++++++++++
 .../gcc.target/powerpc/vector-pair-switch1.c  | 16 ++++++
 .../gcc.target/powerpc/vector-pair-switch2.c  | 17 ++++++
 .../gcc.target/powerpc/vector-pair-switch3.c  | 17 ++++++
 .../gcc.target/powerpc/vector-pair-switch4.c  | 17 ++++++
 13 files changed, 331 insertions(+), 12 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/powerpc/vector-pair-attribute.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/vector-pair-builtin.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/vector-pair-pragma.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/vector-pair-switch1.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/vector-pair-switch2.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/vector-pair-switch3.c
 create mode 100644 gcc/testsuite/gcc.target/powerpc/vector-pair-switch4.c
  

Comments

Michael Meissner Oct. 25, 2023, 8:13 p.m. UTC | #1
Ping patch:

| Date: Fri, 13 Oct 2023 19:41:13 -0400
| From: Michael Meissner <meissner@linux.ibm.com>
| Subject: [PATCH] Power10: Add options to disable load and store vector pair.
| Message-ID: <ZSnVmfS6Mi4n6V7C@cowardly-lion.the-meissners.org>

https://gcc.gnu.org/pipermail/gcc-patches/2023-October/632987.html
  
Michael Meissner Nov. 3, 2023, 7:47 a.m. UTC | #2
Ping #2

| Date: Fri, 13 Oct 2023 19:41:13 -0400
| From: Michael Meissner <meissner@linux.ibm.com>
| Subject: [PATCH] Power10: Add options to disable load and store vector pair.
| Message-ID: <ZSnVmfS6Mi4n6V7C@cowardly-lion.the-meissners.org>

https://gcc.gnu.org/pipermail/gcc-patches/2023-October/632987.html
  
Michael Meissner Nov. 8, 2023, 4:10 p.m. UTC | #3
I discovered a short coming in the patch I proposed to add
-mno-load-vector-pair and -mno-store-vector-pair tuning options.  I will submit
a new patch shortly.

| Date: Fri, 13 Oct 2023 19:41:13 -0400
| From: Michael Meissner <meissner@linux.ibm.com>
| Subject: [PATCH] Power10: Add options to disable load and store vector pair.
| Message-ID: <ZSnVmfS6Mi4n6V7C@cowardly-lion.the-meissners.org>
  

Patch

diff --git a/gcc/config/rs6000/mma.md b/gcc/config/rs6000/mma.md
index 575751d477e..fc7e95bc167 100644
--- a/gcc/config/rs6000/mma.md
+++ b/gcc/config/rs6000/mma.md
@@ -91,6 +91,7 @@  (define_c_enum "unspec"
    UNSPEC_MMA_XVI8GER4SPP
    UNSPEC_MMA_XXMFACC
    UNSPEC_MMA_XXMTACC
+   UNSPEC_MMA_VECTOR_PAIR_MEMORY
   ])
 
 (define_c_enum "unspecv"
@@ -298,6 +299,49 @@  (define_insn_and_split "*movoo"
   "TARGET_MMA
    && (gpc_reg_operand (operands[0], OOmode)
        || gpc_reg_operand (operands[1], OOmode))"
+{
+  if (MEM_P (operands[0]))
+    return TARGET_STORE_VECTOR_PAIR ? "stxvp%X0 %x1,%0" : "#";
+
+  if (MEM_P (operands[1]))
+    return TARGET_LOAD_VECTOR_PAIR ? "lxvp%X1 %x0,%1" : "#";
+
+  return "#";
+}
+  "&& reload_completed
+   && ((MEM_P (operands[0]) && !TARGET_STORE_VECTOR_PAIR)
+       || (MEM_P (operands[1]) && !TARGET_LOAD_VECTOR_PAIR)
+       || (!MEM_P (operands[0]) && !MEM_P (operands[1])))"
+  [(const_int 0)]
+{
+  rs6000_split_multireg_move (operands[0], operands[1]);
+  DONE;
+}
+  [(set_attr "type" "vecload,vecstore,veclogical")
+   (set_attr "size" "256")
+   (set_attr "length" "*,*,8")])
+
+;; Normally __builtin_vsx_lxvp and __builtin_vsx_stxvp are converted to a
+;; direct move insns, but if -mno-load-vector-pair or -mno-store-vector-pair
+;; are used, we use these insns to guarantee that the load vector pair is
+;; generated when the user explicitly uses the built-in function.
+(define_expand "lxvp_internal"
+  [(set (match_operand:OO 0 "gpc_reg_operand")
+	(unspec:OO [(mem:OO (match_operand 1 "address_operand"))]
+		    UNSPEC_MMA_VECTOR_PAIR_MEMORY))]
+  "TARGET_MMA")
+
+(define_expand "stxvp_internal"
+  [(set (mem:OO (match_operand 0 "address_operand"))
+	(unspec:OO [(match_operand:OO 1 "gpc_reg_operand")]
+		    UNSPEC_MMA_VECTOR_PAIR_MEMORY))]
+  "TARGET_MMA")
+
+(define_insn_and_split "*vector_pair_memory_builtin"
+  [(set (match_operand:OO 0 "nonimmediate_operand" "=wa,ZwO,wa")
+	(unspec:OO [(match_operand:OO 1 "input_operand" "ZwO,wa,wa")]
+		   UNSPEC_MMA_VECTOR_PAIR_MEMORY))]
+  "TARGET_MMA"
   "@
    lxvp%X1 %x0,%1
    stxvp%X0 %x1,%0
diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs6000-builtin.cc
index 82cc3a19447..f44427d116e 100644
--- a/gcc/config/rs6000/rs6000-builtin.cc
+++ b/gcc/config/rs6000/rs6000-builtin.cc
@@ -1,4 +1,4 @@ 
-/* Target-specific built-in function support for the Power architecture.
+ /* Target-specific built-in function support for the Power architecture.
    See also rs6000-c.c, rs6000-gen-builtins.c, rs6000-builtins.def, and
    rs6000-overloads.def.
    Note that "normal" builtins (generic math functions, etc.) are handled
@@ -1165,9 +1165,23 @@  rs6000_gimple_fold_mma_builtin (gimple_stmt_iterator *gsi,
       if (TREE_TYPE (TREE_TYPE (ptr)) != vector_pair_type_node)
 	ptr = build1 (NOP_EXPR,
 		      build_pointer_type (vector_pair_type_node), ptr);
-      tree mem = build_simple_mem_ref (build2 (POINTER_PLUS_EXPR,
-					       TREE_TYPE (ptr), ptr, offset));
-      gimplify_assign (lhs, mem, &new_seq);
+      tree addr = build2 (POINTER_PLUS_EXPR, TREE_TYPE (ptr), ptr, offset);
+
+      if (TARGET_LOAD_VECTOR_PAIR)
+	gimplify_assign (lhs, build_simple_mem_ref (addr), &new_seq);
+      else
+	{
+	  tree ptrtype = build_pointer_type (vector_pair_type_node);
+	  tree addrssa = create_tmp_reg_or_ssa_name (ptrtype);
+	  tree lhsssa = create_tmp_reg_or_ssa_name (vector_pair_type_node);
+	  gimplify_assign (addrssa, addr, &new_seq);
+	  new_decl = rs6000_builtin_decls[RS6000_BIF_LXVP_INTERNAL];
+	  new_call = gimple_build_call (new_decl, 1, addrssa);
+	  gimple_call_set_lhs (new_call, lhsssa);
+	  gimple_seq_add_stmt (&new_seq, new_call);
+	  gimplify_assign (lhs, lhsssa, &new_seq);
+	}
+
       pop_gimplify_context (NULL);
       gsi_replace_with_seq (gsi, new_seq, true);
       return true;
@@ -1182,9 +1196,20 @@  rs6000_gimple_fold_mma_builtin (gimple_stmt_iterator *gsi,
       if (TREE_TYPE (TREE_TYPE (ptr)) != vector_pair_type_node)
 	ptr = build1 (NOP_EXPR,
 		      build_pointer_type (vector_pair_type_node), ptr);
-      tree mem = build_simple_mem_ref (build2 (POINTER_PLUS_EXPR,
-					       TREE_TYPE (ptr), ptr, offset));
-      gimplify_assign (mem, src, &new_seq);
+      tree addr = build2 (POINTER_PLUS_EXPR, TREE_TYPE (ptr), ptr, offset);
+
+      if (TARGET_STORE_VECTOR_PAIR)
+	gimplify_assign (build_simple_mem_ref (addr), src, &new_seq);
+      else
+	{
+	  tree ptrtype = build_pointer_type (vector_pair_type_node);
+	  tree addrssa = create_tmp_reg_or_ssa_name (ptrtype);
+	  gimplify_assign (addrssa, ptr, &new_seq);
+	  new_decl = rs6000_builtin_decls[RS6000_BIF_STXVP_INTERNAL];
+	  new_call = gimple_build_call (new_decl, 2, addrssa, src);
+	  gimple_seq_add_stmt (&new_seq, new_call);
+	}
+
       pop_gimplify_context (NULL);
       gsi_replace_with_seq (gsi, new_seq, true);
       return true;
@@ -3002,8 +3027,13 @@  mma_expand_builtin (tree exp, rtx target, insn_code icode,
       rtx opnd;
       const struct insn_operand_data *insn_op;
       insn_op = &insn_data[icode].operand[nopnds];
+      /* The internal built-in functions for lxvp and stxvp must use normal
+	 expansion to allow passing the address of a variable to the
+	 built-in.  */
       if (TREE_CODE (arg) == ADDR_EXPR
-	  && MEM_P (DECL_RTL (TREE_OPERAND (arg, 0))))
+	  && MEM_P (DECL_RTL (TREE_OPERAND (arg, 0)))
+	  && fcode != RS6000_BIF_LXVP_INTERNAL
+	  && fcode != RS6000_BIF_STXVP_INTERNAL)
 	opnd = DECL_RTL (TREE_OPERAND (arg, 0));
       else
 	opnd = expand_normal (arg);
diff --git a/gcc/config/rs6000/rs6000-builtins.def b/gcc/config/rs6000/rs6000-builtins.def
index ce40600e803..b661a226843 100644
--- a/gcc/config/rs6000/rs6000-builtins.def
+++ b/gcc/config/rs6000/rs6000-builtins.def
@@ -4129,5 +4129,11 @@ 
   v256 __builtin_vsx_lxvp (unsigned long, const v256 *);
     LXVP nothing {mma}
 
+  v256 __builtin_vsx_lxvp_internal (const v256 *);
+    LXVP_INTERNAL lxvp_internal {mma}
+
   void __builtin_vsx_stxvp (v256, unsigned long, const v256 *);
     STXVP nothing {mma,pair}
+
+  void __builtin_vsx_stxvp_internal (v256 *, v256);
+    STXVP_INTERNAL stxvp_internal {mma}
diff --git a/gcc/config/rs6000/rs6000-cpus.def b/gcc/config/rs6000/rs6000-cpus.def
index 4f350da378c..8c530a22da8 100644
--- a/gcc/config/rs6000/rs6000-cpus.def
+++ b/gcc/config/rs6000/rs6000-cpus.def
@@ -77,10 +77,12 @@ 
 /* Flags that need to be turned off if -mno-power10.  */
 /* We comment out PCREL_OPT here to disable it by default because SPEC2017
    performance was degraded by it.  */
-#define OTHER_POWER10_MASKS	(OPTION_MASK_MMA			\
+#define OTHER_POWER10_MASKS	(OPTION_MASK_LOAD_VECTOR_PAIR		\
+				 | OPTION_MASK_MMA			\
 				 | OPTION_MASK_PCREL			\
 				 /* | OPTION_MASK_PCREL_OPT */		\
-				 | OPTION_MASK_PREFIXED)
+				 | OPTION_MASK_PREFIXED			\
+				 | OPTION_MASK_STORE_VECTOR_PAIR)
 
 #define ISA_3_1_MASKS_SERVER	(ISA_3_0_MASKS_SERVER			\
 				 | OPTION_MASK_POWER10			\
@@ -134,6 +136,7 @@ 
 				 | OPTION_MASK_P10_FUSION		\
 				 | OPTION_MASK_HTM			\
 				 | OPTION_MASK_ISEL			\
+				 | OPTION_MASK_LOAD_VECTOR_PAIR		\
 				 | OPTION_MASK_MFCRF			\
 				 | OPTION_MASK_MMA			\
 				 | OPTION_MASK_MODULO			\
@@ -156,6 +159,7 @@ 
 				 | OPTION_MASK_QUAD_MEMORY_ATOMIC	\
 				 | OPTION_MASK_RECIP_PRECISION		\
 				 | OPTION_MASK_SOFT_FLOAT		\
+				 | OPTION_MASK_STORE_VECTOR_PAIR	\
 				 | OPTION_MASK_STRICT_ALIGN_OPTIONAL	\
 				 | OPTION_MASK_VSX)
 
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index cc24dd5301e..8f06b37171a 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -2711,7 +2711,9 @@  rs6000_setup_reg_addr_masks (void)
 	  /* Vector pairs can do both indexed and offset loads if the
 	     instructions are enabled, otherwise they can only do offset loads
 	     since it will be broken into two vector moves.  Vector quads can
-	     only do offset loads.  */
+	     only do offset loads.  If the user restricted generation of either
+	     of the LXVP or STXVP instructions, do not allow indexed mode so
+	     that we can split the load/store.  */
 	  else if ((addr_mask != 0) && TARGET_MMA
 		   && (m2 == OOmode || m2 == XOmode))
 	    {
@@ -2719,7 +2721,9 @@  rs6000_setup_reg_addr_masks (void)
 	      if (rc == RELOAD_REG_FPR || rc == RELOAD_REG_VMX)
 		{
 		  addr_mask |= RELOAD_REG_QUAD_OFFSET;
-		  if (m2 == OOmode)
+		  if (m2 == OOmode
+		      && TARGET_LOAD_VECTOR_PAIR
+		      && TARGET_STORE_VECTOR_PAIR)
 		    addr_mask |= RELOAD_REG_INDEXED;
 		}
 	    }
@@ -4405,6 +4409,26 @@  rs6000_option_override_internal (bool global_init_p)
       rs6000_isa_flags &= ~OPTION_MASK_MMA;
     }
 
+  /* Warn if -m-load-vector-pair or -m-store-vector-pair are used and MMA is
+     not set.  */
+  if (!TARGET_MMA && TARGET_LOAD_VECTOR_PAIR)
+    {
+      if ((rs6000_isa_flags_explicit & OPTION_MASK_LOAD_VECTOR_PAIR) != 0)
+	warning (0, "%qs should not be used unless you use %qs",
+		 "-mload-vector-pair", "-mmma");
+
+      rs6000_isa_flags &= ~OPTION_MASK_LOAD_VECTOR_PAIR;
+    }
+
+  if (!TARGET_MMA && TARGET_STORE_VECTOR_PAIR)
+    {
+      if ((rs6000_isa_flags_explicit & OPTION_MASK_STORE_VECTOR_PAIR) != 0)
+	warning (0, "%qs should not be used unless you use %qs",
+		 "-mstore-vector-pair", "-mmma");
+
+      rs6000_isa_flags &= OPTION_MASK_STORE_VECTOR_PAIR;
+    }
+
   /* Enable power10 fusion if we are tuning for power10, even if we aren't
      generating power10 instructions.  */
   if (!(rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION))
@@ -24437,6 +24461,7 @@  static struct rs6000_opt_mask const rs6000_opt_masks[] =
   { "hard-dfp",			OPTION_MASK_DFP,		false, true  },
   { "htm",			OPTION_MASK_HTM,		false, true  },
   { "isel",			OPTION_MASK_ISEL,		false, true  },
+  { "load-vector-pair",		OPTION_MASK_LOAD_VECTOR_PAIR,	false, true  },
   { "mfcrf",			OPTION_MASK_MFCRF,		false, true  },
   { "mfpgpr",			0,				false, true  },
   { "mma",			OPTION_MASK_MMA,		false, true  },
@@ -24461,6 +24486,7 @@  static struct rs6000_opt_mask const rs6000_opt_masks[] =
   { "quad-memory-atomic",	OPTION_MASK_QUAD_MEMORY_ATOMIC,	false, true  },
   { "recip-precision",		OPTION_MASK_RECIP_PRECISION,	false, true  },
   { "save-toc-indirect",	OPTION_MASK_SAVE_TOC_INDIRECT,	false, true  },
+  { "store-vector-pair",	OPTION_MASK_STORE_VECTOR_PAIR,	false, true  },
   { "string",			0,				false, true  },
   { "update",			OPTION_MASK_NO_UPDATE,		true , true  },
   { "vsx",			OPTION_MASK_VSX,		false, true  },
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index bde6d3ff664..369095df9ed 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -597,6 +597,14 @@  mmma
 Target Mask(MMA) Var(rs6000_isa_flags)
 Generate (do not generate) MMA instructions.
 
+mload-vector-pair
+Target Undocumented Mask(LOAD_VECTOR_PAIR) Var(rs6000_isa_flags)
+Generate (do not generate) load vector pair instructions.
+
+mstore-vector-pair
+Target Undocumented Mask(STORE_VECTOR_PAIR) Var(rs6000_isa_flags)
+Generate (do not generate) store vector pair instructions.
+
 mrelative-jumptables
 Target Undocumented Var(rs6000_relative_jumptables) Init(1) Save
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vector-pair-attribute.c b/gcc/testsuite/gcc.target/powerpc/vector-pair-attribute.c
new file mode 100644
index 00000000000..985a44aca85
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/vector-pair-attribute.c
@@ -0,0 +1,39 @@ 
+/* { dg-do compile } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
+
+/* Test if we can control generating load and store vector pair via the target
+   attribute.  */
+
+__attribute__((__target__("load-vector-pair,store-vector-pair")))
+void
+test_load_store (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 1 lxvp, 1 stxvp.  */
+}
+
+__attribute__((__target__("load-vector-pair,no-store-vector-pair")))
+void
+test_load_no_store (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 1 lxvp, 2 stxv.  */
+}
+
+__attribute__((__target__("no-load-vector-pair,store-vector-pair")))
+void
+test_store_no_load (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 2 lxv, 1 stxvp.  */
+}
+
+__attribute__((__target__("no-load-vector-pair,no-store-vector-pair")))
+void
+test_no_load_or_store (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 2 lxv, 2 stxv.  */
+}
+
+/* { dg-final { scan-assembler-times {\mp?lxvpx?\M}  2 } } */
+/* { dg-final { scan-assembler-times {\mp?stxvpx?\M} 2 } } */
+/* { dg-final { scan-assembler-times {\mp?lxvx?\M}   4 } } */
+/* { dg-final { scan-assembler-times {\mp?stxvx?\M}  4 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vector-pair-builtin.c b/gcc/testsuite/gcc.target/powerpc/vector-pair-builtin.c
new file mode 100644
index 00000000000..82790b116b9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/vector-pair-builtin.c
@@ -0,0 +1,40 @@ 
+/* { dg-do compile } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2 -mno-load-vector-pair -mno-store-vector-pair" } */
+
+/* Test if we do not generate load and store vector pair if directed to on
+   power 10 for normal loads and stores, but the built-in versions still
+   generate the load/store vector pair instructions.  Also check that the
+   prefixed plxvp or pstxvp are generated when appropriate.  */
+
+static __vector_pair vp;
+
+void foo_assign (__vector_pair *p, const __vector_pair *q)
+{
+  *p = *q;	/* 2 lxv, 2 stxv.  */
+}
+
+void foo_builtin (__vector_pair *p, const __vector_pair *q)
+{
+  /* 1 lxvp, 1 stxvp.  */
+  __builtin_vsx_stxvp (__builtin_vsx_lxvp (16, q), 32, p);
+}
+
+void foo_builtin_static_load (__vector_pair *p)
+{
+  /* 1 plxvp, 1 stxvp.  */
+  __builtin_vsx_stxvp (__builtin_vsx_lxvp (0, &vp), 0, p);
+}
+
+void foo_builtin_static_store (const __vector_pair *p)
+{
+  /* 1 lxvp, 1 stxvp.  */
+  __builtin_vsx_stxvp (__builtin_vsx_lxvp (0, p), 0, &vp);
+}
+
+/* { dg-final { scan-assembler-times {\mlxvx?\M}   2 } } */
+/* { dg-final { scan-assembler-times {\mlxvpx?\M}  2 } } */
+/* { dg-final { scan-assembler-times {\mplxvp\M}   1 } } */
+/* { dg-final { scan-assembler-times {\mpstxvp\M}  1 } } */
+/* { dg-final { scan-assembler-times {\mstxvx?\M}  2 } } */
+/* { dg-final { scan-assembler-times {\mstxvpx?\M} 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vector-pair-pragma.c b/gcc/testsuite/gcc.target/powerpc/vector-pair-pragma.c
new file mode 100644
index 00000000000..74c6baf8185
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/vector-pair-pragma.c
@@ -0,0 +1,55 @@ 
+/* { dg-do compile } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
+
+/* Test if we can control generating load and store vector pair via the #pragma
+   directive.  */
+
+#pragma gcc push_options
+#pragma GCC target("load-vector-pair,store-vector-pair")
+
+void
+test_load_store (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 1 lxvp, 1 stxvp.  */
+}
+
+#pragma gcc pop_options
+
+#pragma gcc push_options
+#pragma GCC target("load-vector-pair,no-store-vector-pair")
+
+void
+test_load_no_store (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 1 lxvp, 2 stxv.  */
+}
+
+#pragma gcc pop_options
+
+#pragma gcc push_options
+#pragma GCC target("no-load-vector-pair,store-vector-pair")
+
+void
+test_store_no_load (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 2 lxv, 1 stxvp.  */
+}
+
+#pragma gcc pop_options
+
+#pragma gcc push_options
+#pragma GCC target("no-load-vector-pair,no-store-vector-pair")
+
+void
+test_no_load_or_store (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 2 lxv, 2 stxv.  */
+}
+
+#pragma gcc pop_options
+
+/* { dg-final { scan-assembler-times {\mp?lxvpx?\M}  2 } } */
+/* { dg-final { scan-assembler-times {\mp?stxvpx?\M} 2 } } */
+/* { dg-final { scan-assembler-times {\mp?lxvx?\M}   4 } } */
+/* { dg-final { scan-assembler-times {\mp?stxvx?\M}  4 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vector-pair-switch1.c b/gcc/testsuite/gcc.target/powerpc/vector-pair-switch1.c
new file mode 100644
index 00000000000..48e433b378e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/vector-pair-switch1.c
@@ -0,0 +1,16 @@ 
+/* { dg-do compile } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
+
+/* Test if we generate load and store vector pair by default on power 10.  */
+
+void
+test (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 1 lxvp, 1 stxvp.  */
+}
+
+/* { dg-final { scan-assembler-times {\mp?lxvpx?\M}  1 } } */
+/* { dg-final { scan-assembler-times {\mp?stxvpx?\M} 1 } } */
+/* { dg-final { scan-assembler-not   {\mp?lxvx?\M}     } } */
+/* { dg-final { scan-assembler-not   {\mp?stxvx?\M}    } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vector-pair-switch2.c b/gcc/testsuite/gcc.target/powerpc/vector-pair-switch2.c
new file mode 100644
index 00000000000..2a38c2f2aae
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/vector-pair-switch2.c
@@ -0,0 +1,17 @@ 
+/* { dg-do compile } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2 -mno-store-vector-pair" } */
+
+/* Test if we generate load vector pair but not store vector pair if
+   -mno-store-vector-pair is used on power10.  */
+
+void
+test (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 1 lxvp, 2 stxv.  */
+}
+
+/* { dg-final { scan-assembler-times {\mp?lxvpx?\M}  1 } } */
+/* { dg-final { scan-assembler-not   {\mp?stxvpx?\M}   } } */
+/* { dg-final { scan-assembler-not   {\mp?lxvx?\M}     } } */
+/* { dg-final { scan-assembler-times {\mp?stxvx?\M}  2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vector-pair-switch3.c b/gcc/testsuite/gcc.target/powerpc/vector-pair-switch3.c
new file mode 100644
index 00000000000..fd273056b8f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/vector-pair-switch3.c
@@ -0,0 +1,17 @@ 
+/* { dg-do compile } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2 -mno-load-vector-pair" } */
+
+/* Test if we do not generate load vector pair but generate store vector pair
+   if -mno-load-vector-pair is used on power10.  */
+
+void
+test (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 2 lxv, 1 stxvp.  */
+}
+
+/* { dg-final { scan-assembler-not   {\mp?lxvpx?\M}    } } */
+/* { dg-final { scan-assembler-times {\mp?stxvpx?\M} 1 } } */
+/* { dg-final { scan-assembler-times {\mp?lxvx?\M}   2 } } */
+/* { dg-final { scan-assembler-not   {\mp?stxvx?\M}    } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vector-pair-switch4.c b/gcc/testsuite/gcc.target/powerpc/vector-pair-switch4.c
new file mode 100644
index 00000000000..01686e073fe
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/vector-pair-switch4.c
@@ -0,0 +1,17 @@ 
+/* { dg-do compile } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2 -mno-load-vector-pair -mno-store-vector-pair" } */
+
+/* Test if we do not generate load and store vector pair if directed to on
+   power 10.  */
+
+void
+test (__vector_pair *p, __vector_pair *q)
+{
+  *p = *q;	/* 2 lxv, 2 stxv.  */
+}
+
+/* { dg-final { scan-assembler-not   {\mp?lxvpx?\M}    } } */
+/* { dg-final { scan-assembler-not   {\mp?stxvpx?\M}   } } */
+/* { dg-final { scan-assembler-times {\mp?lxvx?\M}   2 } } */
+/* { dg-final { scan-assembler-times {\mp?stxvx?\M}  2 } } */