From: Segher Boessenkool <segher@kernel.crashing.org>
Date: Mon, 22 Jun 2020 20:16:37 +0000 (+0000)
Subject: rs6000: Testsuite changes to go with the previous commit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67f6ef3b3804a0ddc6926e992f6020ed95e11ea6;p=gcc.git

rs6000: Testsuite changes to go with the previous commit

The "sanity checker" thinks it knows better than maintainers, and there
is no override.

2020-06-22  Segher Boessenkool  <segher@kernel.crashing.org>

gcc/testsuite/ChangeLog:

	* gcc.target/powerpc/cfuged-0.c: I protest.
	* gcc.target/powerpc/cfuged-1.c: I protest.
	* gcc.target/powerpc/clone3.c: I protest.
	* gcc.target/powerpc/cntlzdm-0.c: I protest.
	* gcc.target/powerpc/cntlzdm-1.c: I protest.
	* gcc.target/powerpc/cnttzdm-0.c: I protest.
	* gcc.target/powerpc/cnttzdm-1.c: I protest.
	* gcc.target/powerpc/cpu-future.c: I protest.
	* gcc.target/powerpc/dg-future-0.c: I protest.
	* gcc.target/powerpc/dg-future-1.c: I protest.
	* gcc.target/powerpc/localentry-1.c: I protest.
	* gcc.target/powerpc/localentry-detect-1.c: I protest.
	* gcc.target/powerpc/mma-builtin-1.c: I protest.
	* gcc.target/powerpc/mma-builtin-2.c: I protest.
	* gcc.target/powerpc/mma-builtin-3.c: I protest.
	* gcc.target/powerpc/mma-builtin-4.c: I protest.
	* gcc.target/powerpc/mma-builtin-5.c: I protest.
	* gcc.target/powerpc/mma-builtin-6.c: I protest.
	* gcc.target/powerpc/notoc-direct-1.c: I protest.
	* gcc.target/powerpc/pcrel-sibcall-1.c: I protest.
	* gcc.target/powerpc/pdep-0.c: I protest.
	* gcc.target/powerpc/pdep-1.c: I protest.
	* gcc.target/powerpc/pextd-0.c: I protest.
	* gcc.target/powerpc/pextd-1.c: I protest.
	* gcc.target/powerpc/pr93122.c: I protest.
	* gcc.target/powerpc/pr94740.c: I protest.
	* gcc.target/powerpc/setbceq.c: I protest.
	* gcc.target/powerpc/setbcge.c: I protest.
	* gcc.target/powerpc/setbcgt.c: I protest.
	* gcc.target/powerpc/setbcle.c: I protest.
	* gcc.target/powerpc/setbclt.c: I protest.
	* gcc.target/powerpc/setbcne.c: I protest.
	* gcc.target/powerpc/setnbceq.c: I protest.
	* gcc.target/powerpc/setnbcge.c: I protest.
	* gcc.target/powerpc/setnbcgt.c: I protest.
	* gcc.target/powerpc/setnbcle.c: I protest.
	* gcc.target/powerpc/setnbclt.c: I protest.
	* gcc.target/powerpc/setnbcne.c: I protest.
	* gcc.target/powerpc/vec-cfuged-0.c: I protest.
	* gcc.target/powerpc/vec-cfuged-1.c: I protest.
	* gcc.target/powerpc/vec-clrl-0.c: I protest.
	* gcc.target/powerpc/vec-clrl-1.c: I protest.
	* gcc.target/powerpc/vec-clrl-2.c: I protest.
	* gcc.target/powerpc/vec-clrl-3.c: I protest.
	* gcc.target/powerpc/vec-clrr-0.c: I protest.
	* gcc.target/powerpc/vec-clrr-1.c: I protest.
	* gcc.target/powerpc/vec-clrr-2.c: I protest.
	* gcc.target/powerpc/vec-clrr-3.c: I protest.
	* gcc.target/powerpc/vec-cntlzm-0.c: I protest.
	* gcc.target/powerpc/vec-cntlzm-1.c: I protest.
	* gcc.target/powerpc/vec-cnttzm-0.c: I protest.
	* gcc.target/powerpc/vec-cnttzm-1.c: I protest.
	* gcc.target/powerpc/vec-extracth-0.c: I protest.
	* gcc.target/powerpc/vec-extracth-1.c: I protest.
	* gcc.target/powerpc/vec-extracth-2.c: I protest.
	* gcc.target/powerpc/vec-extracth-3.c: I protest.
	* gcc.target/powerpc/vec-extracth-4.c: I protest.
	* gcc.target/powerpc/vec-extracth-5.c: I protest.
	* gcc.target/powerpc/vec-extracth-6.c: I protest.
	* gcc.target/powerpc/vec-extracth-7.c: I protest.
	* gcc.target/powerpc/vec-extracth-be-0.c: I protest.
	* gcc.target/powerpc/vec-extracth-be-1.c: I protest.
	* gcc.target/powerpc/vec-extracth-be-2.c: I protest.
	* gcc.target/powerpc/vec-extracth-be-3.c: I protest.
	* gcc.target/powerpc/vec-extractl-0.c: I protest.
	* gcc.target/powerpc/vec-extractl-1.c: I protest.
	* gcc.target/powerpc/vec-extractl-2.c: I protest.
	* gcc.target/powerpc/vec-extractl-3.c: I protest.
	* gcc.target/powerpc/vec-extractl-4.c: I protest.
	* gcc.target/powerpc/vec-extractl-5.c: I protest.
	* gcc.target/powerpc/vec-extractl-6.c: I protest.
	* gcc.target/powerpc/vec-extractl-7.c: I protest.
	* gcc.target/powerpc/vec-extractl-be-0.c: I protest.
	* gcc.target/powerpc/vec-extractl-be-1.c: I protest.
	* gcc.target/powerpc/vec-extractl-be-2.c: I protest.
	* gcc.target/powerpc/vec-extractl-be-3.c: I protest.
	* gcc.target/powerpc/vec-gnb-0.c: I protest.
	* gcc.target/powerpc/vec-gnb-1.c: I protest.
	* gcc.target/powerpc/vec-gnb-2.c: I protest.
	* gcc.target/powerpc/vec-pdep-0.c: I protest.
	* gcc.target/powerpc/vec-pdep-1.c: I protest.
	* gcc.target/powerpc/vec-pext-0.c: I protest.
	* gcc.target/powerpc/vec-pext-1.c: I protest.
	* gcc.target/powerpc/vec-stril-0.c: I protest.
	* gcc.target/powerpc/vec-stril-1.c: I protest.
	* gcc.target/powerpc/vec-stril-10.c: I protest.
	* gcc.target/powerpc/vec-stril-11.c: I protest.
	* gcc.target/powerpc/vec-stril-12.c: I protest.
	* gcc.target/powerpc/vec-stril-13.c: I protest.
	* gcc.target/powerpc/vec-stril-14.c: I protest.
	* gcc.target/powerpc/vec-stril-15.c: I protest.
	* gcc.target/powerpc/vec-stril-16.c: I protest.
	* gcc.target/powerpc/vec-stril-17.c: I protest.
	* gcc.target/powerpc/vec-stril-18.c: I protest.
	* gcc.target/powerpc/vec-stril-19.c: I protest.
	* gcc.target/powerpc/vec-stril-2.c: I protest.
	* gcc.target/powerpc/vec-stril-20.c: I protest.
	* gcc.target/powerpc/vec-stril-21.c: I protest.
	* gcc.target/powerpc/vec-stril-22.c: I protest.
	* gcc.target/powerpc/vec-stril-23.c: I protest.
	* gcc.target/powerpc/vec-stril-3.c: I protest.
	* gcc.target/powerpc/vec-stril-4.c: I protest.
	* gcc.target/powerpc/vec-stril-5.c: I protest.
	* gcc.target/powerpc/vec-stril-6.c: I protest.
	* gcc.target/powerpc/vec-stril-7.c: I protest.
	* gcc.target/powerpc/vec-stril-8.c: I protest.
	* gcc.target/powerpc/vec-stril-9.c: I protest.
	* gcc.target/powerpc/vec-stril_p-0.c: I protest.
	* gcc.target/powerpc/vec-stril_p-1.c: I protest.
	* gcc.target/powerpc/vec-stril_p-10.c: I protest.
	* gcc.target/powerpc/vec-stril_p-11.c: I protest.
	* gcc.target/powerpc/vec-stril_p-2.c: I protest.
	* gcc.target/powerpc/vec-stril_p-3.c: I protest.
	* gcc.target/powerpc/vec-stril_p-4.c: I protest.
	* gcc.target/powerpc/vec-stril_p-5.c: I protest.
	* gcc.target/powerpc/vec-stril_p-6.c: I protest.
	* gcc.target/powerpc/vec-stril_p-7.c: I protest.
	* gcc.target/powerpc/vec-stril_p-8.c: I protest.
	* gcc.target/powerpc/vec-stril_p-9.c: I protest.
	* gcc.target/powerpc/vec-strir-0.c: I protest.
	* gcc.target/powerpc/vec-strir-1.c: I protest.
	* gcc.target/powerpc/vec-strir-10.c: I protest.
	* gcc.target/powerpc/vec-strir-11.c: I protest.
	* gcc.target/powerpc/vec-strir-12.c: I protest.
	* gcc.target/powerpc/vec-strir-13.c: I protest.
	* gcc.target/powerpc/vec-strir-14.c: I protest.
	* gcc.target/powerpc/vec-strir-15.c: I protest.
	* gcc.target/powerpc/vec-strir-16.c: I protest.
	* gcc.target/powerpc/vec-strir-17.c: I protest.
	* gcc.target/powerpc/vec-strir-18.c: I protest.
	* gcc.target/powerpc/vec-strir-19.c: I protest.
	* gcc.target/powerpc/vec-strir-2.c: I protest.
	* gcc.target/powerpc/vec-strir-20.c: I protest.
	* gcc.target/powerpc/vec-strir-21.c: I protest.
	* gcc.target/powerpc/vec-strir-22.c: I protest.
	* gcc.target/powerpc/vec-strir-23.c: I protest.
	* gcc.target/powerpc/vec-strir-3.c: I protest.
	* gcc.target/powerpc/vec-strir-4.c: I protest.
	* gcc.target/powerpc/vec-strir-5.c: I protest.
	* gcc.target/powerpc/vec-strir-6.c: I protest.
	* gcc.target/powerpc/vec-strir-7.c: I protest.
	* gcc.target/powerpc/vec-strir-8.c: I protest.
	* gcc.target/powerpc/vec-strir-9.c: I protest.
	* gcc.target/powerpc/vec-strir_p-0.c: I protest.
	* gcc.target/powerpc/vec-strir_p-1.c: I protest.
	* gcc.target/powerpc/vec-strir_p-10.c: I protest.
	* gcc.target/powerpc/vec-strir_p-11.c: I protest.
	* gcc.target/powerpc/vec-strir_p-2.c: I protest.
	* gcc.target/powerpc/vec-strir_p-3.c: I protest.
	* gcc.target/powerpc/vec-strir_p-4.c: I protest.
	* gcc.target/powerpc/vec-strir_p-5.c: I protest.
	* gcc.target/powerpc/vec-strir_p-6.c: I protest.
	* gcc.target/powerpc/vec-strir_p-7.c: I protest.
	* gcc.target/powerpc/vec-strir_p-8.c: I protest.
	* gcc.target/powerpc/vec-strir_p-9.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-0.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-1.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-10.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-2.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-3.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-4.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-5.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-6.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-7.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-8.c: I protest.
	* gcc.target/powerpc/vec-ternarylogic-9.c: I protest.
	* gcc.target/powerpc/xxgenpc-runnable.c: I protest.
	* lib/target-supports.exp: Stuff.
---

diff --git a/gcc/testsuite/gcc.target/powerpc/cfuged-0.c b/gcc/testsuite/gcc.target/powerpc/cfuged-0.c
index 6c2d5c7a55e..7295f033a5b 100644
--- a/gcc/testsuite/gcc.target/powerpc/cfuged-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/cfuged-0.c
@@ -1,5 +1,5 @@
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/cfuged-1.c b/gcc/testsuite/gcc.target/powerpc/cfuged-1.c
index 83bf2ae1499..198d541ef05 100644
--- a/gcc/testsuite/gcc.target/powerpc/cfuged-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/cfuged-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/clone3.c b/gcc/testsuite/gcc.target/powerpc/clone3.c
index 93ee41dddae..911b88b781d 100644
--- a/gcc/testsuite/gcc.target/powerpc/clone3.c
+++ b/gcc/testsuite/gcc.target/powerpc/clone3.c
@@ -16,7 +16,7 @@
 static long s;
 long *p = &s;
 
-__attribute__((target_clones("cpu=future,cpu=power9,default")))
+__attribute__((target_clones("cpu=power10,cpu=power9,default")))
 long mod_func (long a, long b)
 {
   return (a % b) + s;
diff --git a/gcc/testsuite/gcc.target/powerpc/cntlzdm-0.c b/gcc/testsuite/gcc.target/powerpc/cntlzdm-0.c
index 45e7d78e636..c11800d9bee 100644
--- a/gcc/testsuite/gcc.target/powerpc/cntlzdm-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/cntlzdm-0.c
@@ -1,5 +1,5 @@
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/cntlzdm-1.c b/gcc/testsuite/gcc.target/powerpc/cntlzdm-1.c
index 3239c386bb7..e9ee8354b59 100644
--- a/gcc/testsuite/gcc.target/powerpc/cntlzdm-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/cntlzdm-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
+/* { dg-require-effective-target power10_hw } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/cnttzdm-0.c b/gcc/testsuite/gcc.target/powerpc/cnttzdm-0.c
index 0b434bef949..80b4f15bab4 100644
--- a/gcc/testsuite/gcc.target/powerpc/cnttzdm-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/cnttzdm-0.c
@@ -1,5 +1,5 @@
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/cnttzdm-1.c b/gcc/testsuite/gcc.target/powerpc/cnttzdm-1.c
index d04b1192d15..4c05c1bc65d 100644
--- a/gcc/testsuite/gcc.target/powerpc/cnttzdm-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/cnttzdm-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
+/* { dg-require-effective-target power10_hw } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/cpu-future.c b/gcc/testsuite/gcc.target/powerpc/cpu-future.c
index ae406d08b23..723a8fb88ff 100644
--- a/gcc/testsuite/gcc.target/powerpc/cpu-future.c
+++ b/gcc/testsuite/gcc.target/powerpc/cpu-future.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
 
-/* Ensure -mcpu=future compiles cleanly.  */
+/* Ensure -mcpu=power10 compiles cleanly.  */
 
 void x (void) { }
diff --git a/gcc/testsuite/gcc.target/powerpc/dg-future-0.c b/gcc/testsuite/gcc.target/powerpc/dg-future-0.c
index a44b4771da0..cc068cff36a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dg-future-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/dg-future-0.c
@@ -1,6 +1,6 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
-/* This tests that powerpc_future_ok works.  */
+/* This tests that power10_ok works.  */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dg-future-1.c b/gcc/testsuite/gcc.target/powerpc/dg-future-1.c
index 6087fe7c894..0dbfb06fa32 100644
--- a/gcc/testsuite/gcc.target/powerpc/dg-future-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/dg-future-1.c
@@ -1,8 +1,8 @@
 /* { dg-do run { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
-/* This tests that powerpc_future_hw works.  */
+/* This tests that power10_hw works.  */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/localentry-1.c b/gcc/testsuite/gcc.target/powerpc/localentry-1.c
index 068b0c080bb..c3c51680cfe 100644
--- a/gcc/testsuite/gcc.target/powerpc/localentry-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/localentry-1.c
@@ -1,10 +1,10 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future -O2 -mpcrel" } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2 -mpcrel" } */
 /* { dg-require-effective-target powerpc_elfv2 } */
-/* { dg-require-effective-target powerpc_future_ok } */
+/* { dg-require-effective-target power10_ok } */
 
 /* Ensure we generate ".localentry fn,1" for both leaf and non-leaf functions.
-   At present, -mcpu=future does not enable pc-relative mode, so make sure we
+   At present, -mcpu=power10 does not enable pc-relative mode, so make sure we
    enable it to be able to check for .localentry.  */
 
 extern int y (int);
diff --git a/gcc/testsuite/gcc.target/powerpc/localentry-detect-1.c b/gcc/testsuite/gcc.target/powerpc/localentry-detect-1.c
index e67e7f824f8..9023b318bd4 100644
--- a/gcc/testsuite/gcc.target/powerpc/localentry-detect-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/localentry-detect-1.c
@@ -1,11 +1,11 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target powerpc_elfv2 } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
-/* At present, -mcpu=future does not enable pc-relative mode.  Enable it here
+/* At present, -mcpu=power10 does not enable pc-relative mode.  Enable it here
    explicitly until it is turned on by default.  */
-#pragma GCC target ("cpu=future,pcrel")
+#pragma GCC target ("cpu=power10,pcrel")
 int localentry1 () { return 5; }
 
 #pragma GCC target ("cpu=power9,no-pcrel")
diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-1.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-1.c
index a971c869095..69ee826e1be 100644
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 typedef unsigned char  vec_t __attribute__((vector_size(16)));
 
diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-2.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-2.c
index cb8b30dd992..0230d727657 100644
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-2.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 typedef unsigned char  vec_t __attribute__((vector_size(16)));
 
diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-3.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-3.c
index 5406707061e..29eb2754999 100644
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-3.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 void
 foo0 (void)
diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-4.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-4.c
index 138d1b46bc4..f3a857bb8c1 100644
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-4.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 typedef unsigned char vec_t __attribute__((vector_size(16)));
 
diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-5.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-5.c
index 0ee45b6bdfd..43b6d3ac91e 100644
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-5.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 typedef unsigned char vec_t __attribute__((vector_size(16)));
 
diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-6.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-6.c
index c0b5eedd3d1..0c6517211e3 100644
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-6.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 void
 foo (__vector_quad *dst)
diff --git a/gcc/testsuite/gcc.target/powerpc/notoc-direct-1.c b/gcc/testsuite/gcc.target/powerpc/notoc-direct-1.c
index 8603ff7706b..74187e1d5dc 100644
--- a/gcc/testsuite/gcc.target/powerpc/notoc-direct-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/notoc-direct-1.c
@@ -1,10 +1,10 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future -O2 -mpcrel" } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2 -mpcrel" } */
 /* { dg-require-effective-target powerpc_elfv2 } */
-/* { dg-require-effective-target powerpc_future_ok } */
+/* { dg-require-effective-target power10_ok } */
 
 /* Test that calls generated from PC-relative code are annotated with @notoc.
-   At present, -mcpu=future does not enable pc-relative mode.  Enable it here
+   At present, -mcpu=power10 does not enable pc-relative mode.  Enable it here
    explicitly until it is turned on by default.  */
 
 extern int yy0 (int);
diff --git a/gcc/testsuite/gcc.target/powerpc/pcrel-sibcall-1.c b/gcc/testsuite/gcc.target/powerpc/pcrel-sibcall-1.c
index 0cb40d45ace..dfcf8183ccd 100644
--- a/gcc/testsuite/gcc.target/powerpc/pcrel-sibcall-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pcrel-sibcall-1.c
@@ -1,14 +1,14 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future -O2" } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
 /* { dg-require-effective-target powerpc_elfv2 } */
-/* { dg-require-effective-target powerpc_future_ok } */
+/* { dg-require-effective-target power10_ok } */
 
 /* Test that potential sibcalls are not generated when the caller preserves the
-   TOC and the callee doesn't, or vice versa.  At present, -mcpu=future does
+   TOC and the callee doesn't, or vice versa.  At present, -mcpu=power10 does
    not enable pc-relative mode.  Enable it here explicitly until it is turned
    on by default.  */
 
-#pragma GCC target ("cpu=future,pcrel")
+#pragma GCC target ("cpu=power10,pcrel")
 int x (void) __attribute__((noinline));
 int y (void) __attribute__((noinline));
 int xx (void) __attribute__((noinline));
@@ -39,7 +39,7 @@ int xx (void)
   return 1;
 }
 
-#pragma GCC target ("cpu=future,pcrel")
+#pragma GCC target ("cpu=power10,pcrel")
 int notoc_call (void)
 {
   return xx ();
diff --git a/gcc/testsuite/gcc.target/powerpc/pdep-0.c b/gcc/testsuite/gcc.target/powerpc/pdep-0.c
index b75b2a85229..490a4ace930 100644
--- a/gcc/testsuite/gcc.target/powerpc/pdep-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/pdep-0.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pdep-1.c b/gcc/testsuite/gcc.target/powerpc/pdep-1.c
index e2c7615ca34..ab0efd25b09 100644
--- a/gcc/testsuite/gcc.target/powerpc/pdep-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pdep-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
+/* { dg-require-effective-target power10_hw } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pextd-0.c b/gcc/testsuite/gcc.target/powerpc/pextd-0.c
index 47a230d72f3..5be9f9e7a33 100644
--- a/gcc/testsuite/gcc.target/powerpc/pextd-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/pextd-0.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pextd-1.c b/gcc/testsuite/gcc.target/powerpc/pextd-1.c
index 004d2dd7e43..ab081423a95 100644
--- a/gcc/testsuite/gcc.target/powerpc/pextd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pextd-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
+/* { dg-require-effective-target power10_hw } */
 /* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr93122.c b/gcc/testsuite/gcc.target/powerpc/pr93122.c
index a440a05c98a..8ea4eb6a48b 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr93122.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr93122.c
@@ -1,7 +1,7 @@
 /* PR target/93122 */
-/* { dg-require-effective-target powerpc_future_ok } */
+/* { dg-require-effective-target power10_ok } */
 /* { dg-do compile { target lp64 } } */
-/* { dg-options "-fstack-clash-protection -mprefixed -mfuture" } */
+/* { dg-options "-fstack-clash-protection -mprefixed -mcpu=power10" } */
 
 void bar (char *);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr94740.c b/gcc/testsuite/gcc.target/powerpc/pr94740.c
index 78e40fc84da..9c2b4644701 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr94740.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr94740.c
@@ -1,7 +1,7 @@
 /* PR rtl-optimization/94740 */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=future -mpcrel" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10 -mpcrel" } */
 
 int array[8];
 int
diff --git a/gcc/testsuite/gcc.target/powerpc/setbceq.c b/gcc/testsuite/gcc.target/powerpc/setbceq.c
index 32ed0378447..63ea8ad5ee0 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbceq.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbceq.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME eq
 #define CODE ==
diff --git a/gcc/testsuite/gcc.target/powerpc/setbcge.c b/gcc/testsuite/gcc.target/powerpc/setbcge.c
index 809e59b5932..1b66301b0e2 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbcge.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbcge.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME ge
 #define CODE >=
diff --git a/gcc/testsuite/gcc.target/powerpc/setbcgt.c b/gcc/testsuite/gcc.target/powerpc/setbcgt.c
index 79b92efb754..f8862a41b4a 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbcgt.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbcgt.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME gt
 #define CODE >
diff --git a/gcc/testsuite/gcc.target/powerpc/setbcle.c b/gcc/testsuite/gcc.target/powerpc/setbcle.c
index 91da7d74335..29cf4743758 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbcle.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbcle.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME le
 #define CODE <=
diff --git a/gcc/testsuite/gcc.target/powerpc/setbclt.c b/gcc/testsuite/gcc.target/powerpc/setbclt.c
index add90ced6af..7b56ba726a0 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbclt.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbclt.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME lt
 #define CODE <
diff --git a/gcc/testsuite/gcc.target/powerpc/setbcne.c b/gcc/testsuite/gcc.target/powerpc/setbcne.c
index 5191384aa10..787a0cd92c9 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbcne.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbcne.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME ne
 #define CODE !=
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbceq.c b/gcc/testsuite/gcc.target/powerpc/setnbceq.c
index b97301b90af..a5233794395 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbceq.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbceq.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME eq
 #define CODE ==
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbcge.c b/gcc/testsuite/gcc.target/powerpc/setnbcge.c
index e13d5d24ff0..2615e7297be 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbcge.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbcge.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME ge
 #define CODE >=
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbcgt.c b/gcc/testsuite/gcc.target/powerpc/setnbcgt.c
index 7dbd6c0c8f0..ba878404f20 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbcgt.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbcgt.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME gt
 #define CODE >
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbcle.c b/gcc/testsuite/gcc.target/powerpc/setnbcle.c
index a0d739b2c79..8b55e44b455 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbcle.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbcle.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME le
 #define CODE <=
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbclt.c b/gcc/testsuite/gcc.target/powerpc/setnbclt.c
index 3f55c382cdb..4755aa82f07 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbclt.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbclt.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME lt
 #define CODE <
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbcne.c b/gcc/testsuite/gcc.target/powerpc/setnbcne.c
index f6a5e94bb2d..c4c1b6f30c9 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbcne.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbcne.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #define NAME ne
 #define CODE !=
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cfuged-0.c b/gcc/testsuite/gcc.target/powerpc/vec-cfuged-0.c
index 74528a4f762..26084a6bc14 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cfuged-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cfuged-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cfuged-1.c b/gcc/testsuite/gcc.target/powerpc/vec-cfuged-1.c
index 2c8013544e2..2a6f5ed8c8e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cfuged-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cfuged-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-clrl-0.c b/gcc/testsuite/gcc.target/powerpc/vec-clrl-0.c
index d84f672c32e..d0b183ebfaf 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-clrl-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-clrl-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-clrl-1.c b/gcc/testsuite/gcc.target/powerpc/vec-clrl-1.c
index d039384203e..7f7d28b04d5 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-clrl-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-clrl-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-clrl-2.c b/gcc/testsuite/gcc.target/powerpc/vec-clrl-2.c
index 265fe7817f6..b9676b8b04c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-clrl-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-clrl-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-clrl-3.c b/gcc/testsuite/gcc.target/powerpc/vec-clrl-3.c
index 582eb1cfd12..26eae792f27 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-clrl-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-clrl-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-clrr-0.c b/gcc/testsuite/gcc.target/powerpc/vec-clrr-0.c
index 59a2cf1017c..2aa1454d140 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-clrr-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-clrr-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-clrr-1.c b/gcc/testsuite/gcc.target/powerpc/vec-clrr-1.c
index f8a3406a651..307617ece64 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-clrr-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-clrr-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-clrr-2.c b/gcc/testsuite/gcc.target/powerpc/vec-clrr-2.c
index 5c972ca7cf3..f09be49e0ab 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-clrr-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-clrr-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-clrr-3.c b/gcc/testsuite/gcc.target/powerpc/vec-clrr-3.c
index 678106a2283..b46995d4ffe 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-clrr-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-clrr-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cntlzm-0.c b/gcc/testsuite/gcc.target/powerpc/vec-cntlzm-0.c
index 6fe0cbd8875..1fd578f05bf 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cntlzm-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cntlzm-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cntlzm-1.c b/gcc/testsuite/gcc.target/powerpc/vec-cntlzm-1.c
index 7e058ed8843..b92bccf1d2a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cntlzm-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cntlzm-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cnttzm-0.c b/gcc/testsuite/gcc.target/powerpc/vec-cnttzm-0.c
index 94fac3bf817..aac9a6f8113 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cnttzm-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cnttzm-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cnttzm-1.c b/gcc/testsuite/gcc.target/powerpc/vec-cnttzm-1.c
index 27ff3bd4961..83bdd954e54 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cnttzm-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cnttzm-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-0.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-0.c
index 953b148d8e8..0c911f7d1bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-0.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-1.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-1.c
index ec55f0ed8e2..13618cef26c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-2.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-2.c
index 0520546ba39..e369c3c316c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-2.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-3.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-3.c
index 962b2fd3035..1d8a690979c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-4.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-4.c
index 0f6d1bf9a9d..f8c8182d4ba 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-4.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-5.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-5.c
index 94ed061725f..17229f40389 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-5.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-6.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-6.c
index 27acaa192cc..4cbc3f03962 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-6.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-7.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-7.c
index 30c4d3a5cf0..64ca22e85e6 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-7.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-0.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-0.c
index 934c5f4bf31..0535a741b73 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-0.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 /* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-1.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-1.c
index 8dfe8d1d652..a97ffdb16b8 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-1.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 /* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-2.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-2.c
index 4a9d3cb55b1..26c77fe4b7e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-2.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 /* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-3.c b/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-3.c
index 71653583268..0e94bf04c95 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extracth-be-3.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 /* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-0.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-0.c
index 7cbd79ca384..95567bcb007 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-0.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-1.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-1.c
index 3a8329abea6..879c253d416 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-2.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-2.c
index 3912b9427bc..e024f522fe1 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-2.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-3.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-3.c
index fd61fdfd077..b3ab43326b3 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-4.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-4.c
index df06570449b..6cbeab32166 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-4.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-5.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-5.c
index dc9b9cce8e5..df239e83e1c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-5.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-6.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-6.c
index 925073b874c..f4b8b627a5f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-6.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-7.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-7.c
index 9d212d28e74..fd1ab604f45 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-7.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-0.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-0.c
index 2816e643286..1ee1d0ef9d7 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-0.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 /* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-1.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-1.c
index 86694c9e5d0..e0cf29e5757 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-1.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 /* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-2.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-2.c
index c5944fddf05..e1f0e7d8c92 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-2.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 /* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-3.c b/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-3.c
index 33a7749ac81..842ea5c4207 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extractl-be-3.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 /* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-gnb-0.c b/gcc/testsuite/gcc.target/powerpc/vec-gnb-0.c
index e4c31eb0c8c..324dd77fb20 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-gnb-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-gnb-0.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-gnb-1.c b/gcc/testsuite/gcc.target/powerpc/vec-gnb-1.c
index 88b509f1a61..527cc3fb06c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-gnb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-gnb-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
+/* { dg-require-effective-target power10_hw } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-gnb-2.c b/gcc/testsuite/gcc.target/powerpc/vec-gnb-2.c
index 89e63c864d8..895bb953b37 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-gnb-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-gnb-2.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-pdep-0.c b/gcc/testsuite/gcc.target/powerpc/vec-pdep-0.c
index 541b0aa6f45..b7c1c25d53c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-pdep-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-pdep-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-pdep-1.c b/gcc/testsuite/gcc.target/powerpc/vec-pdep-1.c
index 75249c50eee..02404a6d316 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-pdep-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-pdep-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-pext-0.c b/gcc/testsuite/gcc.target/powerpc/vec-pext-0.c
index 1d12f048dbd..54073ca267f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-pext-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-pext-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-pext-1.c b/gcc/testsuite/gcc.target/powerpc/vec-pext-1.c
index db1b95e729a..ed289bfbe13 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-pext-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-pext-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-0.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-0.c
index d9ae5e8c39d..5c59cb2076a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-1.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-1.c
index a966ddc1699..98ee29f7c5e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-10.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-10.c
index 8afa5098fdd..10b5d610a9e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-stril-11.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-11.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-11.c
index 7e4ec69371f..00184ffec4c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-12.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-12.c
index 097503ea8ce..e235425ebbc 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-12.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-stril-13.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-13.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-13.c
index 58e91ed5607..1537ed09739 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-13.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-14.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-14.c
index e0211900171..6ba44ae3121 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-14.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-stril-15.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-15.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-15.c
index fa38112b255..11ac940bda3 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-15.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-15.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-16.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-16.c
index 2c5ea7ecc06..6aaad999f4c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-16.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-stril-17.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-17.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-17.c
index 2f82393bf9b..2015aad07ff 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-17.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-17.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-18.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-18.c
index 37c18c1ddb3..fce56937537 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-18.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-18.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-stril-19.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-19.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-19.c
index a0bdd64848a..6226dde0ba7 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-19.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-19.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-2.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-2.c
index baffe92e4ad..0face99d4a7 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-20.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-20.c
index 879b1aea22f..9da116c050b 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-20.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-20.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-stril-21.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-21.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-21.c
index 430ed0bbe4a..b281c45c56d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-21.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-21.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-22.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-22.c
index acc438852fc..a63dab727fa 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-22.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-22.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-stril-23.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-23.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-23.c
index 75d1e10607a..ec0e4836457 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-23.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-23.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-3.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-3.c
index 50f359b6068..970c1a13c82 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-4.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-4.c
index 35447b96b33..186208bb46a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-5.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-5.c
index 16f6bcf6400..c74cad63db4 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-5.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-6.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-6.c
index b40e65b80c5..c07ff0351c6 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-7.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-7.c
index b6f90ce5414..9c5d45421c5 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-7.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-8.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-8.c
index 9f2f3e34a99..3efa404a52e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -mdejagnu-cpu=future -O1" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10 -O1" } */
 /* See vec-stril-9.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril-9.c b/gcc/testsuite/gcc.target/powerpc/vec-stril-9.c
index 56864f4e477..b4dd551b6b9 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-0.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-0.c
index 2ec2e706593..4c55342bd54 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-1.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-1.c
index 0ec3541d810..cd9c468c280 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-10.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-10.c
index 3c4ce86f1fa..af7abf841c7 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-11.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-11.c
index 60f7ccd8c33..0f3f545d6b1 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-2.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-2.c
index 2b0b347c127..96beb86061d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-3.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-3.c
index be477398648..24b0a86372e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-4.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-4.c
index 4be60ac53da..be381d64253 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-5.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-5.c
index 2b520b1745c..2c2ff34fd0e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-5.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-6.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-6.c
index de719f92b00..de98a9d4e36 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-7.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-7.c
index 22f394fa6e0..900aaf17f46 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-7.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-8.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-8.c
index daf322070ef..35be29a35d0 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-9.c b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-9.c
index 85e8ea750fd..e108a56a159 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-stril_p-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-stril_p-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-0.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-0.c
index 6e9e944ca6d..65e0fd8b775 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-1.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-1.c
index 8bf326afbc7..ff09cd3dd92 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-10.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-10.c
index b129168510f..4cccdb870ea 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-strir-11.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-11.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-11.c
index 12d751a62f2..337450e8674 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-12.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-12.c
index 2ee44dabfd9..1634a0e213e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-12.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-strir-13.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-13.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-13.c
index 91ca59bb826..641940cf651 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-13.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-14.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-14.c
index 5f7d4341992..b5b360ab282 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-14.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-strir-15.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-15.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-15.c
index 0a3d8d02ac1..e7e766353e1 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-15.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-15.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-16.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-16.c
index 2418b2f40fe..19e051e06ae 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-16.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-strir-17.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-17.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-17.c
index 1404342d4b4..00f27cc49e6 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-17.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-17.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-18.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-18.c
index ab9592f49ee..d69b474626a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-18.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-18.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-strir-19.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-19.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-19.c
index b0f78df40b3..3728d49421a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-19.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-19.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-2.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-2.c
index a7efde73d56..9459011709c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-20.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-20.c
index 8ac643e1dbf..a635a041edd 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-20.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-20.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-strir-21.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-21.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-21.c
index 47bf0db8946..5557d5de229 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-21.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-21.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-22.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-22.c
index 48a57983860..328a56b619e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-22.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-22.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-strir-23.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-23.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-23.c
index b3b143f3b68..5f05ab28f75 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-23.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-23.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-3.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-3.c
index 25db69c52a6..5fb2306b471 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-4.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-4.c
index 85a3f56d24f..5959285a1be 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-5.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-5.c
index 7047039deab..eabecafa43a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-5.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-6.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-6.c
index 56e81812120..a31dc613767 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-7.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-7.c
index fddee218759..a73efea68ee 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-7.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-8.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-8.c
index 211cdeb8e50..c9db0f9e039 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -mdejagnu-cpu=future" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power10" } */
 /* See vec-strir-9.c for the same test with -O2 optimization.  */
 
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir-9.c b/gcc/testsuite/gcc.target/powerpc/vec-strir-9.c
index b95711c71f4..6af8924e1ed 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-0.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-0.c
index f94703dfe77..e294f869689 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-1.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-1.c
index ce527a7c530..569b8b466e3 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-10.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-10.c
index 5a4c63940e1..86e33645463 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-11.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-11.c
index 786b2798a11..118310c4af6 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-2.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-2.c
index becb3220567..5c8cfab4a7d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-3.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-3.c
index 42777702b3a..3a411feb409 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-4.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-4.c
index f9b214caa29..16ebab1b3a0 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-5.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-5.c
index 337f2d08875..0edff34737b 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-5.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-6.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-6.c
index d1b79ee1250..0c635d03a38 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-7.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-7.c
index a6794d29fd1..18926b0d738 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-7.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-8.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-8.c
index f25528c7b46..0338ad8df3f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-9.c b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-9.c
index 42831a4cbed..818b76cc8ab 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-strir_p-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-strir_p-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-0.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-0.c
index bc1d05c008d..bf97dd0034c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-0.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-1.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-1.c
index 8beb80fe60a..052d99de834 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run} */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-10.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-10.c
index d8aaebba52e..35700fcb364 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-10.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-2.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-2.c
index 0d482b8e672..ec53ff29102 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-3.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-3.c
index a7245e51da2..411bafe7e16 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-4.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-4.c
index dbd9ffb856e..49767e9d90e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-5.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-5.c
index 4d5d8e5e0d6..527e8f2f8bc 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-5.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-6.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-6.c
index 0114bacd5fc..ffafb499614 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-7.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-7.c
index 27ac4a22866..b754195c2dc 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-7.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_hw } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-8.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-8.c
index fc13e77d5e7..6c760ff4e08 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-8.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-9.c b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-9.c
index 65562ce0569..0d9998e6341 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-ternarylogic-9.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
-/* { dg-require-effective-target powerpc_future_hw } */
+/* { dg-require-effective-target power10_hw } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=future" } */
+/* { dg-options "-mdejagnu-cpu=power10" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/xxgenpc-runnable.c b/gcc/testsuite/gcc.target/powerpc/xxgenpc-runnable.c
index 199513b4ffb..244c57365d4 100644
--- a/gcc/testsuite/gcc.target/powerpc/xxgenpc-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/xxgenpc-runnable.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-mdejagnu-cpu=future -O2" } */
-/* { dg-require-effective-target powerpc_future_hw } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
+/* { dg-require-effective-target power10_hw } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index ab0ee32fc91..cf0cfa11eb9 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -2176,7 +2176,7 @@ proc check_effective_target_powerpc_pcrel { } {
 	{\mpla\M} assembly {
 	    static unsigned short s;
 	    unsigned short *p_foo (void) { return &s; }
-	} {-O2 -mcpu=future}]
+	} {-O2 -mcpu=power10}]
 }
 
 # Return 1 if the PowerPC target generates prefixed instructions automatically
@@ -2185,7 +2185,7 @@ proc check_effective_target_powerpc_prefixed_addr { } {
     return [check_no_messages_and_pattern powerpc_prefixed_addr \
 	{\mplwz\M} assembly {
 	    unsigned int foo (unsigned int *p) { return p[0x12345]; }
-	} {-O2 -mcpu=future}]
+	} {-O2 -mcpu=power10}]
 }
 
 # Return 1 if the target supports executing power9 modulo instructions, 0
@@ -2214,13 +2214,13 @@ proc check_p9modulo_hw_available { } {
 }
 
 
-# Return 1 if the target supports executing FUTURE instructions, 0 otherwise.
+# Return 1 if the target supports executing power10 instructions, 0 otherwise.
 # Cache the result.  It is assumed that if a simulator does not support the
-# FUTURE instructions, that it will generate an error and this test will fail.
+# power10 instructions, that it will generate an error and this test will fail.
 
-proc check_powerpc_future_hw_available { } {
-    return [check_cached_effective_target powerpc_future_hw_available {
-	check_runtime_nocache powerpc_future_hw_available {
+proc check_power10_hw_available { } {
+    return [check_cached_effective_target power10_hw_available {
+	check_runtime_nocache power10_hw_available {
 	    int main()
 	    {
 		/* Set e first and use +r to check if pli actually works.  */
@@ -2228,7 +2228,7 @@ proc check_powerpc_future_hw_available { } {
 		asm ("pli %0,%1" : "+r" (e) : "n" (0x12345));
 		return (e == 0x12345);
 	    }
-	} "-mcpu=future"
+	} "-mcpu=power10"
     }]
 }
 
@@ -2670,7 +2670,7 @@ proc check_effective_target_p8 {  } {
   } ""]
 }
 
-# Return 1 if we're generating code for power9 and future platforms.
+# Return 1 if we're generating code for power9 or later platforms.
 
 proc check_effective_target_p9+ {  } {
   return [check_no_compiler_messages_nocache p9+ assembly {
@@ -5874,19 +5874,19 @@ proc check_effective_target_has_arch_pwr9 { } {
 	}]
 }
 
-# Return 1 if this is a PowerPC target supporting -mfuture.
-# Limit this to 64-bit linux systems for now until other
-# targets support FUTURE.
+# Return 1 if this is a PowerPC target supporting -mcpu=power10.
+# Limit this to 64-bit linux systems for now until other targets support
+# power10.
 
-proc check_effective_target_powerpc_future_ok { } {
+proc check_effective_target_power10_ok { } {
     if { ([istarget powerpc64*-*-linux*]) } {
-	return [check_no_compiler_messages powerpc_future_ok object {
+	return [check_no_compiler_messages power10_ok object {
 	    int main (void) {
 		long e;
 		asm ("pli %0,%1" : "=r" (e) : "n" (0x12345));
 		return e;
 	    }
-	} "-mcpu=future"]
+	} "-mcpu=power10"]
     } else {
 	return 0
     }
@@ -7833,7 +7833,7 @@ proc is-effective-target { arg } {
 	  "named_sections" { set selected [check_named_sections_available] }
 	  "gc_sections"    { set selected [check_gc_sections_available] }
 	  "cxa_atexit"     { set selected [check_cxa_atexit_available] }
-	  "powerpc_future_hw" { set selected [check_powerpc_future_hw_available] }
+	  "power10_hw" { set selected [check_power10_hw_available] }
 	  default          { error "unknown effective target keyword `$arg'" }
 	}
     }