* [PATCH 1/2] testsuite, rs6000: Make powerpc_vsx consider current_compiler_flags [PR114842]
@ 2024-05-08 6:44 Kewen.Lin
2024-05-08 6:56 ` [PATCH 2/2] testsuite, rs6000: Replace powerpc_vsx_ok with, powerpc_vsx [PR114842] Kewen.Lin
0 siblings, 1 reply; 2+ messages in thread
From: Kewen.Lin @ 2024-05-08 6:44 UTC (permalink / raw)
To: GCC Patches; +Cc: Segher Boessenkool, David Edelsohn, Peter Bergner
Hi,
As noted in PR114842, most of the test cases which require
effective target check powerpc_vsx_ok actually care about
if VSX feature is enabled, and they should adopt effective
target powerpc_vsx instead. By considering we already have
a number of test cases having explicit -mvsx in dg-options
etc., to keep them still be tested as before even without
vsx enabled by default, this patch is to make powerpc_vsx
consider current_compiler_flags.
Regtested on powerpc64-linux-gnu P8/P9 and
powerpc64le-linux-gnu P9 and P10.
I'm going to push this soon if no objections.
BR,
Kewen
-----
PR testsuite/114842
gcc/testsuite/ChangeLog:
* lib/target-supports.exp (check_effective_target_powerpc_vsx): Take
current_compiler_flags into account.
---
gcc/testsuite/lib/target-supports.exp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 969456281c7..713898d5554 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -7144,7 +7144,7 @@ proc check_effective_target_powerpc_vsx { } {
nope no vsx
#endif
}
- }]
+ } [current_compiler_flags]]
}
# Return 1 if this is a PowerPC target supporting -mvsx
--
2.39.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] testsuite, rs6000: Replace powerpc_vsx_ok with, powerpc_vsx [PR114842]
2024-05-08 6:44 [PATCH 1/2] testsuite, rs6000: Make powerpc_vsx consider current_compiler_flags [PR114842] Kewen.Lin
@ 2024-05-08 6:56 ` Kewen.Lin
0 siblings, 0 replies; 2+ messages in thread
From: Kewen.Lin @ 2024-05-08 6:56 UTC (permalink / raw)
To: GCC Patches; +Cc: Segher Boessenkool, David Edelsohn, Peter Bergner
Hi,
As noted in PR114842, most of the test cases which require
effective target check powerpc_vsx_ok actually care about
if VSX feature is enabled, and they should adopt effective
target powerpc_vsx instead. Otherwise, when users specifying
extra -mno-vsx like in RUNTESTFLAGS, powerpc_vsx_ok returns
true but the test is tested without VSX and the test case
would fail. With the commit teaching powerpc_vsx consider
current_compiler_flags, dg-{additional-,}options can be taken
into account when evaluating powerpc_vsx, so this patch also
moves dg-{additional-,}options lines before lines with
dg-require-effective-target to make it effective.
There are still a few test cases adopting powerpc_vsx_ok,
some adopt it correctly, some don't neeed it, some need
special handlings, I'll follow up with separated patches
for those which need updates.
Regtested on powerpc64-linux-gnu P8/P9 and
powerpc64le-linux-gnu P9 and P10.
I'm going to push this soon if no objections.
BR,
Kewen
-----
PR testsuite/114842
gcc/testsuite/ChangeLog:
* g++.dg/ext/pr85503.C: Replace powerpc_vsx_ok with powerpc_vsx,
move dg-options and dg-additional-options lines before
dg-require-effective-target lines when it doesn't cause any side
effect like note message.
* g++.dg/pr69667.C: Likewise.
* g++.target/powerpc/altivec-19.C: Likewise.
* g++.target/powerpc/pr101168.C: Likewise.
* g++.target/powerpc/pr65240-1.C: Likewise.
* g++.target/powerpc/pr65240-2.C: Likewise.
* g++.target/powerpc/pr65240-3.C: Likewise.
* g++.target/powerpc/pr65240-4.C: Likewise.
* g++.target/powerpc/pr65242.C: Likewise.
* g++.target/powerpc/pr67211.C: Likewise.
* g++.target/powerpc/pr71294.C: Likewise.
* g++.target/powerpc/pr84279.C: Likewise.
* g++.target/powerpc/pr93974.C: Likewise.
* g++.target/powerpc/undef-bool-1.C: Likewise.
* gcc.dg/gomp/pr82374.c: Likewise.
* gcc.dg/vect/costmodel/ppc/costmodel-slp-perm.c: Likewise.
* gcc.dg/vect/costmodel/ppc/costmodel-vect-reversed.c: Likewise.
* gcc.dg/vect/costmodel/ppc/costmodel-vect-store-2.c: Likewise.
* gcc.dg/vect/pr109011-1.c: Likewise.
* gcc.dg/vect/pr109011-2.c: Likewise.
* gcc.dg/vect/pr109011-3.c: Likewise.
* gcc.dg/vect/pr109011-4.c: Likewise.
* gcc.dg/vect/pr109011-5.c: Likewise.
* gcc.dg/vmx/extract-vsx.c: Likewise.
* gcc.dg/vmx/insert-vsx.c: Likewise.
* gcc.dg/vmx/ld-vsx.c: Likewise.
* gcc.dg/vmx/ldl-vsx.c: Likewise.
* gcc.dg/vmx/merge-vsx.c: Likewise.
* gcc.dg/vmx/splat-vsx.c: Likewise.
* gcc.dg/vmx/st-vsx.c: Likewise.
* gcc.dg/vmx/stl-vsx.c: Likewise.
* gcc.target/powerpc/altivec-2-runnable.c: Likewise.
* gcc.target/powerpc/altivec-37.c: Likewise.
* gcc.target/powerpc/altivec_vld_vst_addr-2.c: Likewise.
* gcc.target/powerpc/amo1.c: Likewise.
* gcc.target/powerpc/atomic-p7.c: Likewise.
* gcc.target/powerpc/atomic-p8.c: Likewise.
* gcc.target/powerpc/atomic_load_store-p8.c: Likewise.
* gcc.target/powerpc/bcd-1.c: Likewise.
* gcc.target/powerpc/bcd-2.c: Likewise.
* gcc.target/powerpc/bcd-3.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-eq-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-gt-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-lt-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-exp-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-exp-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-exp-3.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-exp-4.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-exp-5.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-sig-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-sig-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-sig-3.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-sig-4.c: Likewise.
* gcc.target/powerpc/bfp/scalar-extract-sig-5.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-10.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-11.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-3.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-4.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-6.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-7.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Likewise.
* gcc.target/powerpc/bfp/scalar-insert-exp-9.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-10.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-11.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-2.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-3.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-4.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-5.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-6.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-7.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-8.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-data-class-9.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-neg-0.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-neg-1.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-neg-2.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-neg-3.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-neg-4.c: Likewise.
* gcc.target/powerpc/bfp/scalar-test-neg-5.c: Likewise.
* gcc.target/powerpc/bfp/vec-extract-exp-0.c: Likewise.
* gcc.target/powerpc/bfp/vec-extract-exp-1.c: Likewise.
* gcc.target/powerpc/bfp/vec-extract-exp-2.c: Likewise.
* gcc.target/powerpc/bfp/vec-extract-exp-3.c: Likewise.
* gcc.target/powerpc/bfp/vec-extract-sig-0.c: Likewise.
* gcc.target/powerpc/bfp/vec-extract-sig-1.c: Likewise.
* gcc.target/powerpc/bfp/vec-extract-sig-2.c: Likewise.
* gcc.target/powerpc/bfp/vec-extract-sig-3.c: Likewise.
* gcc.target/powerpc/bfp/vec-insert-exp-0.c: Likewise.
* gcc.target/powerpc/bfp/vec-insert-exp-1.c: Likewise.
* gcc.target/powerpc/bfp/vec-insert-exp-2.c: Likewise.
* gcc.target/powerpc/bfp/vec-insert-exp-3.c: Likewise.
* gcc.target/powerpc/bfp/vec-insert-exp-4.c: Likewise.
* gcc.target/powerpc/bfp/vec-insert-exp-5.c: Likewise.
* gcc.target/powerpc/bfp/vec-insert-exp-6.c: Likewise.
* gcc.target/powerpc/bfp/vec-insert-exp-7.c: Likewise.
* gcc.target/powerpc/bfp/vec-test-data-class-0.c: Likewise.
* gcc.target/powerpc/bfp/vec-test-data-class-1.c: Likewise.
* gcc.target/powerpc/bfp/vec-test-data-class-2.c: Likewise.
* gcc.target/powerpc/bfp/vec-test-data-class-3.c: Likewise.
* gcc.target/powerpc/bfp/vec-test-data-class-4.c: Likewise.
* gcc.target/powerpc/bfp/vec-test-data-class-5.c: Likewise.
* gcc.target/powerpc/bfp/vec-test-data-class-6.c: Likewise.
* gcc.target/powerpc/bfp/vec-test-data-class-7.c: Likewise.
* gcc.target/powerpc/bmi2-pext64-1a.c: Likewise.
* gcc.target/powerpc/bool2-p7.c: Likewise.
* gcc.target/powerpc/bool2-p8.c: Likewise.
* gcc.target/powerpc/bool3-p7.c: Likewise.
* gcc.target/powerpc/bool3-p8.c: Likewise.
* gcc.target/powerpc/builtins-1.c: Likewise.
* gcc.target/powerpc/builtins-3-p8.c: Likewise.
* gcc.target/powerpc/builtins-3-p9.c: Likewise.
* gcc.target/powerpc/builtins-4.c: Likewise.
* gcc.target/powerpc/builtins-5.c: Likewise.
* gcc.target/powerpc/builtins-9.c: Likewise.
* gcc.target/powerpc/byte-in-either-range-0.c: Likewise.
* gcc.target/powerpc/byte-in-either-range-1.c: Likewise.
* gcc.target/powerpc/byte-in-range-0.c: Likewise.
* gcc.target/powerpc/byte-in-range-1.c: Likewise.
* gcc.target/powerpc/byte-in-set-0.c: Likewise.
* gcc.target/powerpc/byte-in-set-1.c: Likewise.
* gcc.target/powerpc/byte-in-set-2.c: Likewise.
* gcc.target/powerpc/clone1.c: Likewise.
* gcc.target/powerpc/conv-vectorize-1.c: Likewise.
* gcc.target/powerpc/conv-vectorize-2.c: Likewise.
* gcc.target/powerpc/crypto-builtin-1.c: Likewise.
* gcc.target/powerpc/crypto-builtin-2.c: Likewise.
* gcc.target/powerpc/ctz-3.c: Likewise.
* gcc.target/powerpc/ctz-4.c: Likewise.
* gcc.target/powerpc/darn-0.c: Likewise.
* gcc.target/powerpc/darn-1.c: Likewise.
* gcc.target/powerpc/darn-2.c: Likewise.
* gcc.target/powerpc/dform-1.c: Likewise.
* gcc.target/powerpc/dform-2.c: Likewise.
* gcc.target/powerpc/dform-3.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-0.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-1.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-10.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-11.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-12.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-13.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-14.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-15.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-16.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-17.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-18.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-19.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-2.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-20.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-21.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-22.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-23.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-24.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-25.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-26.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-27.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-28.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-29.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-3.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-30.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-31.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-32.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-33.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-34.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-35.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-36.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-37.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-38.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-39.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-4.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-40.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-41.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-42.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-43.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-44.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-45.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-46.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-47.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-48.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-49.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-5.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-50.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-51.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-52.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-53.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-54.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-55.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-56.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-57.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-58.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-59.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-6.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-60.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-61.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-62.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-63.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-64.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-65.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-66.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-67.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-68.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-69.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-7.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-70.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-71.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-72.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-73.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-74.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-75.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-76.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-77.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-78.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-79.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-8.c: Likewise.
* gcc.target/powerpc/dfp/dtstsfi-9.c: Likewise.
* gcc.target/powerpc/direct-move-double1.c: Likewise.
* gcc.target/powerpc/direct-move-float1.c: Likewise.
* gcc.target/powerpc/direct-move-float3.c: Likewise.
* gcc.target/powerpc/direct-move-long1.c: Likewise.
* gcc.target/powerpc/direct-move-vector.c: Likewise.
* gcc.target/powerpc/direct-move-vint1.c: Likewise.
* gcc.target/powerpc/divkc3-2.c: Likewise.
* gcc.target/powerpc/divkc3-3.c: Likewise.
* gcc.target/powerpc/extend-divide-1.c: Likewise.
* gcc.target/powerpc/extend-divide-2.c: Likewise.
* gcc.target/powerpc/float128-3.c: Likewise.
* gcc.target/powerpc/float128-3b.c: Likewise.
* gcc.target/powerpc/float128-5.c: Likewise.
* gcc.target/powerpc/float128-fma1.c: Likewise.
* gcc.target/powerpc/float128-hw.c: Likewise.
* gcc.target/powerpc/float128-hw10.c: Likewise.
* gcc.target/powerpc/float128-hw2.c: Likewise.
* gcc.target/powerpc/float128-hw3.c: Likewise.
* gcc.target/powerpc/float128-hw4.c: Likewise.
* gcc.target/powerpc/float128-hw5.c: Likewise.
* gcc.target/powerpc/float128-hw6.c: Likewise.
* gcc.target/powerpc/float128-hw7.c: Likewise.
* gcc.target/powerpc/float128-hw8.c: Likewise.
* gcc.target/powerpc/float128-hw9.c: Likewise.
* gcc.target/powerpc/float128-odd.c: Likewise.
* gcc.target/powerpc/float128-sqrt1.c: Likewise.
* gcc.target/powerpc/float128-type-1.c: Likewise.
* gcc.target/powerpc/float128-type-2.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-int-fwrapv.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-int.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-add-4.c: Likewise.
* gcc.target/powerpc/fold-vec-add-6.c: Likewise.
* gcc.target/powerpc/fold-vec-add-7.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-char.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-char.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-double.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-float.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-int.h: Likewise.
* gcc.target/powerpc/fold-vec-cmp-int.p7.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-int.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-int.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-short.h: Likewise.
* gcc.target/powerpc/fold-vec-cmp-short.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-short.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-cntlz-char.c: Likewise.
* gcc.target/powerpc/fold-vec-cntlz-int.c: Likewise.
* gcc.target/powerpc/fold-vec-cntlz-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-cntlz-short.c: Likewise.
* gcc.target/powerpc/fold-vec-div-float.c: Likewise.
* gcc.target/powerpc/fold-vec-div-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-div-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-char.p7.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-char.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-char.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-double.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-float.p7.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-float.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-float.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-int.p7.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-int.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-int.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-longlong.p7.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-longlong.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-longlong.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-short.p7.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-short.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-short.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-char-p8.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-char-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-double.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-float-p8.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-float-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-int-p8.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-int-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-short-p8.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-short-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-ld-double.c: Likewise.
* gcc.target/powerpc/fold-vec-ld-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-ld-misc.c: Likewise.
* gcc.target/powerpc/fold-vec-load-builtin_vec_xl-char.c: Likewise.
* gcc.target/powerpc/fold-vec-load-builtin_vec_xl-double.c: Likewise.
* gcc.target/powerpc/fold-vec-load-builtin_vec_xl-float.c: Likewise.
* gcc.target/powerpc/fold-vec-load-builtin_vec_xl-int.c: Likewise.
* gcc.target/powerpc/fold-vec-load-builtin_vec_xl-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-load-builtin_vec_xl-short.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_vsx_ld-char.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_vsx_ld-double.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_vsx_ld-float.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_vsx_ld-int.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_vsx_ld-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_vsx_ld-short.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_xl-char.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_xl-double.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_xl-float.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_xl-int.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_xl-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-load-vec_xl-short.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-ands-char.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-ands-int.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-ands-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-ands-short.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-eqv-char.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-eqv-float.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-eqv-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-eqv-int.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-eqv-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-eqv-short.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-ors-char.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-ors-int.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-ors-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-ors-short.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-other-char.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-other-int.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-other-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-logical-other-short.c: Likewise.
* gcc.target/powerpc/fold-vec-madd-double.c: Likewise.
* gcc.target/powerpc/fold-vec-madd-float.c: Likewise.
* gcc.target/powerpc/fold-vec-mergeeo-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-mergeeo-int.c: Likewise.
* gcc.target/powerpc/fold-vec-mergeeo-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-mergehl-double.c: Likewise.
* gcc.target/powerpc/fold-vec-mergehl-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-mergehl-pixel.c: Likewise.
* gcc.target/powerpc/fold-vec-minmax-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-minmax-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-float.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-int.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-int128-p8.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-int128-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-char.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-int.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-int.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-int.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-longlong.h: Likewise.
* gcc.target/powerpc/fold-vec-neg-longlong.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-longlong.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-short.c: Likewise.
* gcc.target/powerpc/fold-vec-pack-double.c: Likewise.
* gcc.target/powerpc/fold-vec-pack-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-perm-double.c: Likewise.
* gcc.target/powerpc/fold-vec-perm-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-select-double.c: Likewise.
* gcc.target/powerpc/fold-vec-select-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-shift-left-longlong-fwrapv.c: Likewise.
* gcc.target/powerpc/fold-vec-shift-left-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-shift-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-splat-16.c: Likewise.
* gcc.target/powerpc/fold-vec-splat-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-splat-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-splat-misc-invalid.c: Likewise.
* gcc.target/powerpc/fold-vec-splat-pixel.c: Likewise.
* gcc.target/powerpc/fold-vec-splats-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-splats-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-st-double.c: Likewise.
* gcc.target/powerpc/fold-vec-st-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-st-pixel.c: Likewise.
* gcc.target/powerpc/fold-vec-store-builtin_vec_xst-char.c: Likewise.
* gcc.target/powerpc/fold-vec-store-builtin_vec_xst-double.c: Likewise.
* gcc.target/powerpc/fold-vec-store-builtin_vec_xst-float.c: Likewise.
* gcc.target/powerpc/fold-vec-store-builtin_vec_xst-int.c: Likewise.
* gcc.target/powerpc/fold-vec-store-builtin_vec_xst-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-store-builtin_vec_xst-short.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_vsx_st-char.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_vsx_st-double.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_vsx_st-float.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_vsx_st-int.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_vsx_st-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_vsx_st-short.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_xst-char.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_xst-double.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_xst-float.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_xst-int.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_xst-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-store-vec_xst-short.c: Likewise.
* gcc.target/powerpc/fold-vec-sub-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-sub-int128.c: Likewise.
* gcc.target/powerpc/fold-vec-sub-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-unpack-float.c: Likewise.
* gcc.target/powerpc/fold-vec-unpack-int.c: Likewise.
* gcc.target/powerpc/fusion.c: Likewise.
* gcc.target/powerpc/fusion2.c: Likewise.
* gcc.target/powerpc/gnuattr1.c: Likewise.
* gcc.target/powerpc/gnuattr2.c: Likewise.
* gcc.target/powerpc/gnuattr3.c: Likewise.
* gcc.target/powerpc/mul-vectorize-1.c: Likewise.
* gcc.target/powerpc/mulkc3-2.c: Likewise.
* gcc.target/powerpc/mulkc3-3.c: Likewise.
* gcc.target/powerpc/p8-vec-xl-xst-v2.c: Likewise.
* gcc.target/powerpc/p8-vec-xl-xst.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-1.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-2.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-3.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-4.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-5.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-6.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-7.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-8.c: Likewise.
* gcc.target/powerpc/p8vector-fp.c: Likewise.
* gcc.target/powerpc/p8vector-int128-1.c: Likewise.
* gcc.target/powerpc/p8vector-ldst.c: Likewise.
* gcc.target/powerpc/p8vector-vbpermq.c: Likewise.
* gcc.target/powerpc/p8vector-vectorize-1.c: Likewise.
* gcc.target/powerpc/p8vector-vectorize-2.c: Likewise.
* gcc.target/powerpc/p8vector-vectorize-3.c: Likewise.
* gcc.target/powerpc/p8vector-vectorize-4.c: Likewise.
* gcc.target/powerpc/p8vector-vectorize-5.c: Likewise.
* gcc.target/powerpc/p9-dimode1.c: Likewise.
* gcc.target/powerpc/p9-dimode2.c: Likewise.
* gcc.target/powerpc/p9-extract-1.c: Likewise.
* gcc.target/powerpc/p9-extract-2.c: Likewise.
* gcc.target/powerpc/p9-extract-3.c: Likewise.
* gcc.target/powerpc/p9-extract-4.c: Likewise.
* gcc.target/powerpc/p9-fpcvt-1.c: Likewise.
* gcc.target/powerpc/p9-fpcvt-2.c: Likewise.
* gcc.target/powerpc/p9-fpcvt-3.c: Likewise.
* gcc.target/powerpc/p9-lxvx-stxvx-1.c: Likewise.
* gcc.target/powerpc/p9-lxvx-stxvx-2.c: Likewise.
* gcc.target/powerpc/p9-lxvx-stxvx-3.c: Likewise.
* gcc.target/powerpc/p9-minmax-1.c: Likewise.
* gcc.target/powerpc/p9-minmax-2.c: Likewise.
* gcc.target/powerpc/p9-minmax-3.c: Likewise.
* gcc.target/powerpc/p9-permute.c: Likewise.
* gcc.target/powerpc/p9-splat-1.c: Likewise.
* gcc.target/powerpc/p9-splat-2.c: Likewise.
* gcc.target/powerpc/p9-splat-3.c: Likewise.
* gcc.target/powerpc/p9-splat-4.c: Likewise.
* gcc.target/powerpc/p9-splat-5.c: Likewise.
* gcc.target/powerpc/p9-vbpermd.c: Likewise.
* gcc.target/powerpc/p9-vec-length-epil-1.c: Likewise.
* gcc.target/powerpc/p9-vec-length-epil-2.c: Likewise.
* gcc.target/powerpc/p9-vec-length-epil-3.c: Likewise.
* gcc.target/powerpc/p9-vec-length-epil-4.c: Likewise.
* gcc.target/powerpc/p9-vec-length-epil-5.c: Likewise.
* gcc.target/powerpc/p9-vec-length-epil-6.c: Likewise.
* gcc.target/powerpc/p9-vec-length-epil-7.c: Likewise.
* gcc.target/powerpc/p9-vec-length-epil-8.c: Likewise.
* gcc.target/powerpc/p9-vec-length-full-1.c: Likewise.
* gcc.target/powerpc/p9-vec-length-full-2.c: Likewise.
* gcc.target/powerpc/p9-vec-length-full-3.c: Likewise.
* gcc.target/powerpc/p9-vec-length-full-4.c: Likewise.
* gcc.target/powerpc/p9-vec-length-full-5.c: Likewise.
* gcc.target/powerpc/p9-vec-length-full-6.c: Likewise.
* gcc.target/powerpc/p9-vec-length-full-7.c: Likewise.
* gcc.target/powerpc/p9-vec-length-full-8.c: Likewise.
* gcc.target/powerpc/p9-vneg.c: Likewise.
* gcc.target/powerpc/p9-vparity.c: Likewise.
* gcc.target/powerpc/p9-vpermr.c: Likewise.
* gcc.target/powerpc/p9-xxbr-1.c: Likewise.
* gcc.target/powerpc/p9-xxbr-2.c: Likewise.
* gcc.target/powerpc/p9-xxbr-3.c: Likewise.
* gcc.target/powerpc/ppc-fma-1.c: Likewise.
* gcc.target/powerpc/ppc-fma-2.c: Likewise.
* gcc.target/powerpc/ppc-fortran/pr102767.f90: Likewise.
* gcc.target/powerpc/ppc-fpconv-1.c: Likewise.
* gcc.target/powerpc/ppc-fpconv-10.c: Likewise.
* gcc.target/powerpc/ppc-fpconv-5.c: Likewise.
* gcc.target/powerpc/ppc-fpconv-9.c: Likewise.
* gcc.target/powerpc/ppc-round.c: Likewise.
* gcc.target/powerpc/ppc-round2.c: Likewise.
* gcc.target/powerpc/ppc-round3.c: Likewise.
* gcc.target/powerpc/pr100866-1.c: Likewise.
* gcc.target/powerpc/pr100866-2.c: Likewise.
* gcc.target/powerpc/pr102868.c: Likewise.
* gcc.target/powerpc/pr103124.c: Likewise.
* gcc.target/powerpc/pr103605-1.c: Likewise.
* gcc.target/powerpc/pr103605-2.c: Likewise.
* gcc.target/powerpc/pr104015-1.c: Likewise.
* gcc.target/powerpc/pr104124.c: Likewise.
* gcc.target/powerpc/pr104239-1.c: Likewise.
* gcc.target/powerpc/pr104239-2.c: Likewise.
* gcc.target/powerpc/pr104239-3.c: Likewise.
* gcc.target/powerpc/pr104482.c: Likewise.
* gcc.target/powerpc/pr105271.c: Likewise.
* gcc.target/powerpc/pr106769-p8.c: Likewise.
* gcc.target/powerpc/pr106769-p9.c: Likewise.
* gcc.target/powerpc/pr107412.c: Likewise.
* gcc.target/powerpc/pr108396.c: Likewise.
* gcc.target/powerpc/pr109069-2.c: Likewise.
* gcc.target/powerpc/pr109082.c: Likewise.
* gcc.target/powerpc/pr110429.c: Likewise.
* gcc.target/powerpc/pr111449-1.c: Likewise.
* gcc.target/powerpc/pr111449-2.c: Likewise.
* gcc.target/powerpc/pr113950.c: Likewise.
* gcc.target/powerpc/pr42747.c: Likewise.
* gcc.target/powerpc/pr43154.c: Likewise.
* gcc.target/powerpc/pr47755.c: Likewise.
* gcc.target/powerpc/pr47862.c: Likewise.
* gcc.target/powerpc/pr48053-1.c: Likewise.
* gcc.target/powerpc/pr48053-2.c: Likewise.
* gcc.target/powerpc/pr48053-3.c: Likewise.
* gcc.target/powerpc/pr48192.c: Likewise.
* gcc.target/powerpc/pr48226.c: Likewise.
* gcc.target/powerpc/pr48258-1.c: Likewise.
* gcc.target/powerpc/pr48258-2.c: Likewise.
* gcc.target/powerpc/pr48857.c: Likewise.
* gcc.target/powerpc/pr52199.c: Likewise.
* gcc.target/powerpc/pr53487.c: Likewise.
* gcc.target/powerpc/pr56605.c: Likewise.
* gcc.target/powerpc/pr57150.c: Likewise.
* gcc.target/powerpc/pr58673-1.c: Likewise.
* gcc.target/powerpc/pr58673-2.c: Likewise.
* gcc.target/powerpc/pr59054.c: Likewise.
* gcc.target/powerpc/pr60203.c: Likewise.
* gcc.target/powerpc/pr60676.c: Likewise.
* gcc.target/powerpc/pr64019.c: Likewise.
* gcc.target/powerpc/pr66144-1.c: Likewise.
* gcc.target/powerpc/pr66144-2.c: Likewise.
* gcc.target/powerpc/pr66144-3.c: Likewise.
* gcc.target/powerpc/pr67808.c: Likewise.
* gcc.target/powerpc/pr68163.c: Likewise.
* gcc.target/powerpc/pr70243.c: Likewise.
* gcc.target/powerpc/pr70669.c: Likewise.
* gcc.target/powerpc/pr71186.c: Likewise.
* gcc.target/powerpc/pr71309.c: Likewise.
* gcc.target/powerpc/pr71656-1.c: Likewise.
* gcc.target/powerpc/pr71656-2.c: Likewise.
* gcc.target/powerpc/pr71670.c: Likewise.
* gcc.target/powerpc/pr71680.c: Likewise.
* gcc.target/powerpc/pr71698.c: Likewise.
* gcc.target/powerpc/pr71720.c: Likewise.
* gcc.target/powerpc/pr71763.c: Likewise.
* gcc.target/powerpc/pr71977-1.c: Likewise.
* gcc.target/powerpc/pr71977-2.c: Likewise.
* gcc.target/powerpc/pr72717.c: Likewise.
* gcc.target/powerpc/pr72804.c: Likewise.
* gcc.target/powerpc/pr72853.c: Likewise.
* gcc.target/powerpc/pr77289.c: Likewise.
* gcc.target/powerpc/pr78056-1.c: Likewise.
* gcc.target/powerpc/pr78056-3.c: Likewise.
* gcc.target/powerpc/pr78102.c: Likewise.
* gcc.target/powerpc/pr78543.c: Likewise.
* gcc.target/powerpc/pr78604.c: Likewise.
* gcc.target/powerpc/pr78658.c: Likewise.
* gcc.target/powerpc/pr78953.c: Likewise.
* gcc.target/powerpc/pr79004.c: Likewise.
* gcc.target/powerpc/pr79038-1.c: Likewise.
* gcc.target/powerpc/pr79179.c: Likewise.
* gcc.target/powerpc/pr79251.p7.c: Likewise.
* gcc.target/powerpc/pr79251.p8.c: Likewise.
* gcc.target/powerpc/pr79251.p9.c: Likewise.
* gcc.target/powerpc/pr79354.c: Likewise.
* gcc.target/powerpc/pr79544.c: Likewise.
* gcc.target/powerpc/pr79799-1.c: Likewise.
* gcc.target/powerpc/pr79799-2.c: Likewise.
* gcc.target/powerpc/pr79799-3.c: Likewise.
* gcc.target/powerpc/pr79799-5.c: Likewise.
* gcc.target/powerpc/pr79907.c: Likewise.
* gcc.target/powerpc/pr79951.c: Likewise.
* gcc.target/powerpc/pr80315-1.c: Likewise.
* gcc.target/powerpc/pr80315-2.c: Likewise.
* gcc.target/powerpc/pr80315-3.c: Likewise.
* gcc.target/powerpc/pr80315-4.c: Likewise.
* gcc.target/powerpc/pr80510-1.c: Likewise.
* gcc.target/powerpc/pr80510-2.c: Likewise.
* gcc.target/powerpc/pr80695-p8.c: Likewise.
* gcc.target/powerpc/pr80695-p9.c: Likewise.
* gcc.target/powerpc/pr80718.c: Likewise.
* gcc.target/powerpc/pr81348.c: Likewise.
* gcc.target/powerpc/pr81622.c: Likewise.
* gcc.target/powerpc/pr81959.c: Likewise.
* gcc.target/powerpc/pr82015.c: Likewise.
* gcc.target/powerpc/pr82748-1.c: Likewise.
* gcc.target/powerpc/pr82748-2.c: Likewise.
* gcc.target/powerpc/pr83399.c: Likewise.
* gcc.target/powerpc/pr83862.c: Likewise.
* gcc.target/powerpc/pr84154-1.c: Likewise.
* gcc.target/powerpc/pr84154-2.c: Likewise.
* gcc.target/powerpc/pr84154-3.c: Likewise.
* gcc.target/powerpc/pr84220-sld2.c: Likewise.
* gcc.target/powerpc/pr84220-sldw.c: Likewise.
* gcc.target/powerpc/pr84220-xxperm.c: Likewise.
* gcc.target/powerpc/pr84220-xxsld.c: Likewise.
* gcc.target/powerpc/pr84226.c: Likewise.
* gcc.target/powerpc/pr85456.c: Likewise.
* gcc.target/powerpc/pr86731-fwrapv-longlong.c: Likewise.
* gcc.target/powerpc/pr86731-longlong.c: Likewise.
* gcc.target/powerpc/pr88309.c: Likewise.
* gcc.target/powerpc/pr88558-p8.c: Likewise.
* gcc.target/powerpc/pr88845.c: Likewise.
* gcc.target/powerpc/pr88965.c: Likewise.
* gcc.target/powerpc/pr90763.c: Likewise.
* gcc.target/powerpc/pr91903.c: Likewise.
* gcc.target/powerpc/pr92398.p9+.c: Likewise.
* gcc.target/powerpc/pr92398.p9-.c: Likewise.
* gcc.target/powerpc/pr92923-1.c: Likewise.
* gcc.target/powerpc/pr92923-2.c: Likewise.
* gcc.target/powerpc/pr93073.c: Likewise.
* gcc.target/powerpc/pr93658.c: Likewise.
* gcc.target/powerpc/pr96125.c: Likewise.
* gcc.target/powerpc/pr96139-a.c: Likewise.
* gcc.target/powerpc/pr96139-b.c: Likewise.
* gcc.target/powerpc/pr96933-1.c: Likewise.
* gcc.target/powerpc/pr96933-2.c: Likewise.
* gcc.target/powerpc/pr97019.c: Likewise.
* gcc.target/powerpc/pr98914.c: Likewise.
* gcc.target/powerpc/pragma_misc9.c: Likewise.
* gcc.target/powerpc/pure-builtin-redundant-load.c: Likewise.
* gcc.target/powerpc/recip-5.c: Likewise.
* gcc.target/powerpc/sad-vectorize-1.c: Likewise.
* gcc.target/powerpc/sad-vectorize-2.c: Likewise.
* gcc.target/powerpc/sd-vsx.c: Likewise.
* gcc.target/powerpc/signbit-1.c: Likewise.
* gcc.target/powerpc/signbit-2.c: Likewise.
* gcc.target/powerpc/sldoi_to_mov.c: Likewise.
* gcc.target/powerpc/swaps-p8-1.c: Likewise.
* gcc.target/powerpc/swaps-p8-12.c: Likewise.
* gcc.target/powerpc/swaps-p8-14.c: Likewise.
* gcc.target/powerpc/swaps-p8-15.c: Likewise.
* gcc.target/powerpc/swaps-p8-16.c: Likewise.
* gcc.target/powerpc/swaps-p8-17.c: Likewise.
* gcc.target/powerpc/swaps-p8-18.c: Likewise.
* gcc.target/powerpc/swaps-p8-19.c: Likewise.
* gcc.target/powerpc/swaps-p8-2.c: Likewise.
* gcc.target/powerpc/swaps-p8-22.c: Likewise.
* gcc.target/powerpc/swaps-p8-23.c: Likewise.
* gcc.target/powerpc/swaps-p8-24.c: Likewise.
* gcc.target/powerpc/swaps-p8-25.c: Likewise.
* gcc.target/powerpc/swaps-p8-26.c: Likewise.
* gcc.target/powerpc/swaps-p8-27.c: Likewise.
* gcc.target/powerpc/swaps-p8-3.c: Likewise.
* gcc.target/powerpc/swaps-p8-30.c: Likewise.
* gcc.target/powerpc/swaps-p8-33.c: Likewise.
* gcc.target/powerpc/swaps-p8-36.c: Likewise.
* gcc.target/powerpc/swaps-p8-39.c: Likewise.
* gcc.target/powerpc/swaps-p8-4.c: Likewise.
* gcc.target/powerpc/swaps-p8-42.c: Likewise.
* gcc.target/powerpc/swaps-p8-45.c: Likewise.
* gcc.target/powerpc/swaps-p8-5.c: Likewise.
* gcc.target/powerpc/undef-bool-2.c: Likewise.
* gcc.target/powerpc/unpack-vectorize-2.c: Likewise.
* gcc.target/powerpc/unpack-vectorize-3.c: Likewise.
* gcc.target/powerpc/upper-regs-df.c: Likewise.
* gcc.target/powerpc/upper-regs-sf.c: Likewise.
* gcc.target/powerpc/vadsdu-0.c: Likewise.
* gcc.target/powerpc/vadsdu-1.c: Likewise.
* gcc.target/powerpc/vadsdu-2.c: Likewise.
* gcc.target/powerpc/vadsdu-3.c: Likewise.
* gcc.target/powerpc/vadsdu-4.c: Likewise.
* gcc.target/powerpc/vadsdu-5.c: Likewise.
* gcc.target/powerpc/vadsdub-1.c: Likewise.
* gcc.target/powerpc/vadsdub-2.c: Likewise.
* gcc.target/powerpc/vadsduh-1.c: Likewise.
* gcc.target/powerpc/vadsduh-2.c: Likewise.
* gcc.target/powerpc/vadsduw-1.c: Likewise.
* gcc.target/powerpc/vadsduw-2.c: Likewise.
* gcc.target/powerpc/vec-cmp-sel.c: Likewise.
* gcc.target/powerpc/vec-cmp.c: Likewise.
* gcc.target/powerpc/vec-extract-1.c: Likewise.
* gcc.target/powerpc/vec-extract-2.c: Likewise.
* gcc.target/powerpc/vec-extract-3.c: Likewise.
* gcc.target/powerpc/vec-extract-4.c: Likewise.
* gcc.target/powerpc/vec-extract-5.c: Likewise.
* gcc.target/powerpc/vec-extract-6.c: Likewise.
* gcc.target/powerpc/vec-extract-7.c: Likewise.
* gcc.target/powerpc/vec-extract-8.c: Likewise.
* gcc.target/powerpc/vec-extract-9.c: Likewise.
* gcc.target/powerpc/vec-init-10.c: Likewise.
* gcc.target/powerpc/vec-init-3.c: Likewise.
* gcc.target/powerpc/vec-init-6.c: Likewise.
* gcc.target/powerpc/vec-init-7.c: Likewise.
* gcc.target/powerpc/vec-minmax-1.c: Likewise.
* gcc.target/powerpc/vec-minmax-2.c: Likewise.
* gcc.target/powerpc/vec-mul.c: Likewise.
* gcc.target/powerpc/vec-perm-ctor.c: Likewise.
* gcc.target/powerpc/vec-set-char.c: Likewise.
* gcc.target/powerpc/vec-set-int.c: Likewise.
* gcc.target/powerpc/vec-set-short.c: Likewise.
* gcc.target/powerpc/vec_reve_1.c: Likewise.
* gcc.target/powerpc/vec_reve_2.c: Likewise.
* gcc.target/powerpc/vector_float.c: Likewise.
* gcc.target/powerpc/versioned-copy-loop.c: Likewise.
* gcc.target/powerpc/vslv-0.c: Likewise.
* gcc.target/powerpc/vslv-1.c: Likewise.
* gcc.target/powerpc/vsrv-0.c: Likewise.
* gcc.target/powerpc/vsrv-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-10.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-11.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-12.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-13.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-14.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-8.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-ne-9.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-nez-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-nez-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-nez-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-nez-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-nez-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-nez-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-all-nez-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-10.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-11.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-12.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-13.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-14.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-8.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eq-9.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eqz-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eqz-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eqz-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eqz-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eqz-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eqz-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-any-eqz-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-8.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpne-9.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpnez-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpnez-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpnez-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpnez-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpnez-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpnez-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-cmpnez-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-cntlz-lsbb-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-cntlz-lsbb-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-cntlz-lsbb-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-cntlz-lsbb-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-cnttz-lsbb-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-cnttz-lsbb-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-cnttz-lsbb-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-cnttz-lsbb-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-10.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-11.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-12.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-13.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-8.c: Likewise.
* gcc.target/powerpc/vsu/vec-xl-len-9.c: Likewise.
* gcc.target/powerpc/vsu/vec-xlx-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-xlx-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-xlx-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-xlx-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-xlx-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-xlx-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-xlx-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-xlx-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-xrx-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-xrx-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-xrx-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-xrx-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-xrx-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-xrx-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-xrx-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-xrx-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-0.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-1.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-10.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-11.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-12.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-13.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-2.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-3.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-4.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-5.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-6.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-7.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-8.c: Likewise.
* gcc.target/powerpc/vsu/vec-xst-len-9.c: Likewise.
* gcc.target/powerpc/vsx-13.c: Likewise.
* gcc.target/powerpc/vsx-7.c: Likewise.
* gcc.target/powerpc/vsx-builtin-1.c: Likewise.
* gcc.target/powerpc/vsx-builtin-2.c: Likewise.
* gcc.target/powerpc/vsx-builtin-3.c: Likewise.
* gcc.target/powerpc/vsx-builtin-4.c: Likewise.
* gcc.target/powerpc/vsx-builtin-5.c: Likewise.
* gcc.target/powerpc/vsx-builtin-6.c: Likewise.
* gcc.target/powerpc/vsx-builtin-7.c: Likewise.
* gcc.target/powerpc/vsx-builtin-8.c: Likewise.
* gcc.target/powerpc/vsx-builtin-msum.c: Likewise.
* gcc.target/powerpc/vsx-extract-1.c: Likewise.
* gcc.target/powerpc/vsx-extract-2.c: Likewise.
* gcc.target/powerpc/vsx-extract-3.c: Likewise.
* gcc.target/powerpc/vsx-extract-4.c: Likewise.
* gcc.target/powerpc/vsx-extract-5.c: Likewise.
* gcc.target/powerpc/vsx-extract-6.c: Likewise.
* gcc.target/powerpc/vsx-extract-7.c: Likewise.
* gcc.target/powerpc/vsx-float0.c: Likewise.
* gcc.target/powerpc/vsx-himode.c: Likewise.
* gcc.target/powerpc/vsx-himode2.c: Likewise.
* gcc.target/powerpc/vsx-himode3.c: Likewise.
* gcc.target/powerpc/vsx-mass-1.c: Likewise.
* gcc.target/powerpc/vsx-qimode.c: Likewise.
* gcc.target/powerpc/vsx-qimode2.c: Likewise.
* gcc.target/powerpc/vsx-qimode3.c: Likewise.
* gcc.target/powerpc/vsx-sfminmax.c: Likewise.
* gcc.target/powerpc/vsx-simode.c: Likewise.
* gcc.target/powerpc/vsx-simode2.c: Likewise.
* gcc.target/powerpc/vsx-simode3.c: Likewise.
* gcc.target/powerpc/vsx-vector-1.c: Likewise.
* gcc.target/powerpc/vsx-vector-2.c: Likewise.
* gcc.target/powerpc/vsx-vector-3.c: Likewise.
* gcc.target/powerpc/vsx-vector-4.c: Likewise.
* gcc.target/powerpc/vsx-vector-6-func-1op.c: Likewise.
* gcc.target/powerpc/vsx-vector-6-func-2lop.c: Likewise.
* gcc.target/powerpc/vsx-vector-6-func-2op.c: Likewise.
* gcc.target/powerpc/vsx-vector-6-func-3op.c: Likewise.
* gcc.target/powerpc/vsx-vector-6-func-cmp-all.c: Likewise.
* gcc.target/powerpc/vsx-vector-6-func-cmp.c: Likewise.
* gcc.target/powerpc/vsx-vector-7.c: Likewise.
* gcc.target/powerpc/vsx-vectorize-1.c: Likewise.
* gcc.target/powerpc/vsx-vectorize-2.c: Likewise.
* gcc.target/powerpc/vsx-vectorize-3.c: Likewise.
* gcc.target/powerpc/vsx-vectorize-4.c: Likewise.
* gcc.target/powerpc/vsx-vectorize-5.c: Likewise.
* gcc.target/powerpc/vsx-vectorize-6.c: Likewise.
* gcc.target/powerpc/vsx-vectorize-7.c: Likewise.
* gcc.target/powerpc/vsx-vectorize-8.c: Likewise.
* gcc.target/powerpc/vsxcopy.c: Likewise.
* gfortran.dg/nint_p7.f90: Likewise.
---
gcc/testsuite/g++.dg/ext/pr85503.C | 2 +-
gcc/testsuite/g++.dg/pr69667.C | 2 +-
gcc/testsuite/g++.target/powerpc/altivec-19.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr101168.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr65240-1.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr65240-2.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr65240-3.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr65240-4.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr65242.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr67211.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr71294.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr84279.C | 4 ++--
gcc/testsuite/g++.target/powerpc/pr93974.C | 2 +-
gcc/testsuite/g++.target/powerpc/undef-bool-1.C | 2 +-
gcc/testsuite/gcc.dg/gomp/pr82374.c | 3 +--
.../gcc.dg/vect/costmodel/ppc/costmodel-slp-perm.c | 4 ++--
.../gcc.dg/vect/costmodel/ppc/costmodel-vect-reversed.c | 4 ++--
.../gcc.dg/vect/costmodel/ppc/costmodel-vect-store-2.c | 4 ++--
gcc/testsuite/gcc.dg/vect/pr109011-1.c | 7 +++----
gcc/testsuite/gcc.dg/vect/pr109011-2.c | 5 ++---
gcc/testsuite/gcc.dg/vect/pr109011-3.c | 4 ++--
gcc/testsuite/gcc.dg/vect/pr109011-4.c | 5 ++---
gcc/testsuite/gcc.dg/vect/pr109011-5.c | 4 ++--
| 2 +-
gcc/testsuite/gcc.dg/vmx/insert-vsx.c | 2 +-
gcc/testsuite/gcc.dg/vmx/ld-vsx.c | 2 +-
gcc/testsuite/gcc.dg/vmx/ldl-vsx.c | 2 +-
gcc/testsuite/gcc.dg/vmx/merge-vsx.c | 2 +-
gcc/testsuite/gcc.dg/vmx/splat-vsx.c | 2 +-
gcc/testsuite/gcc.dg/vmx/st-vsx.c | 2 +-
gcc/testsuite/gcc.dg/vmx/stl-vsx.c | 2 +-
gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c | 2 +-
gcc/testsuite/gcc.target/powerpc/altivec-37.c | 2 +-
.../gcc.target/powerpc/altivec_vld_vst_addr-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/amo1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/atomic-p7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/atomic-p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/atomic_load_store-p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bcd-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bcd-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bcd-3.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-eq-0.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-gt-0.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-lt-0.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-0.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c | 2 +-
| 2 +-
| 2 +-
| 4 ++--
| 4 ++--
| 4 ++--
| 2 +-
| 2 +-
| 2 +-
| 4 ++--
| 4 ++--
| 4 ++--
.../gcc.target/powerpc/bfp/scalar-insert-exp-0.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-1.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-10.c | 4 ++--
.../gcc.target/powerpc/bfp/scalar-insert-exp-11.c | 4 ++--
.../gcc.target/powerpc/bfp/scalar-insert-exp-2.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-3.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-4.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-5.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-6.c | 4 ++--
.../gcc.target/powerpc/bfp/scalar-insert-exp-7.c | 4 ++--
.../gcc.target/powerpc/bfp/scalar-insert-exp-8.c | 4 ++--
.../gcc.target/powerpc/bfp/scalar-insert-exp-9.c | 4 ++--
.../gcc.target/powerpc/bfp/scalar-test-data-class-0.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-1.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-10.c | 4 ++--
.../gcc.target/powerpc/bfp/scalar-test-data-class-11.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-2.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-3.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-4.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-5.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-6.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-7.c | 2 +-
.../gcc.target/powerpc/bfp/scalar-test-data-class-8.c | 4 ++--
.../gcc.target/powerpc/bfp/scalar-test-data-class-9.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-4.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c | 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c | 2 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-0.c | 2 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-1.c | 2 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-2.c | 2 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-3.c | 2 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-4.c | 2 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-5.c | 2 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-6.c | 2 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bmi2-pext64-1a.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bool2-p7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bool2-p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bool3-p7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/bool3-p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/builtins-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/builtins-3-p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/builtins-3-p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/builtins-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/builtins-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/builtins-9.c | 2 +-
.../gcc.target/powerpc/byte-in-either-range-0.c | 2 +-
.../gcc.target/powerpc/byte-in-either-range-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/byte-in-range-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/byte-in-set-0.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/clone1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/conv-vectorize-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/conv-vectorize-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ctz-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ctz-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/darn-0.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/darn-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/darn-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dform-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dform-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dform-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-20.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-22.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-23.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-24.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-25.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-27.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-28.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-29.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-40.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-42.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-43.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-44.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-45.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-47.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-48.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-49.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-60.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-62.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-63.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-64.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-65.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-67.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-68.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-69.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/direct-move-double1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/direct-move-float1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/direct-move-float3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/direct-move-long1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/direct-move-vector.c | 2 +-
gcc/testsuite/gcc.target/powerpc/direct-move-vint1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/divkc3-2.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/divkc3-3.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/extend-divide-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/extend-divide-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/float128-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/float128-3b.c | 2 +-
gcc/testsuite/gcc.target/powerpc/float128-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/float128-fma1.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw10.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw2.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw3.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw4.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw5.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw6.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw7.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw8.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-hw9.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-odd.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-sqrt1.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/float128-type-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/float128-type-2.c | 2 +-
.../gcc.target/powerpc/fold-vec-abs-floatdouble.c | 2 +-
.../gcc.target/powerpc/fold-vec-abs-int-fwrapv.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p9.c | 2 +-
.../gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.c | 2 +-
.../gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p8.c | 2 +-
.../gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-abs-longlong.p8.c | 2 +-
.../gcc.target/powerpc/fold-vec-abs-longlong.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-add-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-add-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-add-7.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-double.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-float.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.h | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.h | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-char.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-cntlz-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-short.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-div-float.c | 2 +-
.../gcc.target/powerpc/fold-vec-div-floatdouble.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-div-longlong.c | 4 ++--
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
.../gcc.target/powerpc/fold-vec-insert-char-p8.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-char-p9.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-float-p8.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-float-p9.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-int-p8.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-int-p9.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-short-p8.c | 2 +-
.../gcc.target/powerpc/fold-vec-insert-short-p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-ld-double.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-ld-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-ld-misc.c | 2 +-
.../powerpc/fold-vec-load-builtin_vec_xl-char.c | 2 +-
.../powerpc/fold-vec-load-builtin_vec_xl-double.c | 2 +-
.../powerpc/fold-vec-load-builtin_vec_xl-float.c | 2 +-
.../powerpc/fold-vec-load-builtin_vec_xl-int.c | 2 +-
.../powerpc/fold-vec-load-builtin_vec_xl-longlong.c | 2 +-
.../powerpc/fold-vec-load-builtin_vec_xl-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_vsx_ld-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_vsx_ld-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_vsx_ld-float.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_vsx_ld-int.c | 2 +-
.../powerpc/fold-vec-load-vec_vsx_ld-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_vsx_ld-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_xl-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_xl-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_xl-float.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_xl-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_xl-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-load-vec_xl-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-ands-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-ands-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-ands-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-ands-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-eqv-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-eqv-float.c | 2 +-
.../powerpc/fold-vec-logical-eqv-floatdouble.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-eqv-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-eqv-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-eqv-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-ors-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-ors-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-ors-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-ors-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-other-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-other-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-other-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-logical-other-short.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-madd-double.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-madd-float.c | 2 +-
.../gcc.target/powerpc/fold-vec-mergeeo-floatdouble.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-mergeeo-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-mergehl-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-mergehl-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-mergehl-pixel.c | 2 +-
.../gcc.target/powerpc/fold-vec-minmax-floatdouble.c | 2 +-
.../gcc.target/powerpc/fold-vec-minmax-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-mult-float.c | 2 +-
.../gcc.target/powerpc/fold-vec-mult-floatdouble.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-mult-int128-p8.c | 6 +++---
.../gcc.target/powerpc/fold-vec-mult-int128-p9.c | 4 ++--
.../gcc.target/powerpc/fold-vec-mult-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-neg-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-neg-floatdouble.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.h | 2 +-
.../gcc.target/powerpc/fold-vec-neg-longlong.p8.c | 2 +-
.../gcc.target/powerpc/fold-vec-neg-longlong.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-neg-short.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-pack-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-pack-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-perm-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-perm-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-select-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-select-longlong.c | 2 +-
.../powerpc/fold-vec-shift-left-longlong-fwrapv.c | 2 +-
.../gcc.target/powerpc/fold-vec-shift-left-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-shift-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-splat-16.c | 2 +-
.../gcc.target/powerpc/fold-vec-splat-floatdouble.c | 2 +-
.../gcc.target/powerpc/fold-vec-splat-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-splat-misc-invalid.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-splat-pixel.c | 2 +-
.../gcc.target/powerpc/fold-vec-splats-floatdouble.c | 2 +-
.../gcc.target/powerpc/fold-vec-splats-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-st-double.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-st-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-st-pixel.c | 2 +-
.../powerpc/fold-vec-store-builtin_vec_xst-char.c | 2 +-
.../powerpc/fold-vec-store-builtin_vec_xst-double.c | 2 +-
.../powerpc/fold-vec-store-builtin_vec_xst-float.c | 2 +-
.../powerpc/fold-vec-store-builtin_vec_xst-int.c | 2 +-
.../powerpc/fold-vec-store-builtin_vec_xst-longlong.c | 2 +-
.../powerpc/fold-vec-store-builtin_vec_xst-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_vsx_st-char.c | 2 +-
.../powerpc/fold-vec-store-vec_vsx_st-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_vsx_st-float.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_vsx_st-int.c | 2 +-
.../powerpc/fold-vec-store-vec_vsx_st-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_vsx_st-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_xst-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_xst-double.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_xst-float.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_xst-int.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_xst-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-store-vec_xst-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-sub-floatdouble.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int128.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/fold-vec-sub-longlong.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-float.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-int.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fusion.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fusion2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/gnuattr1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/gnuattr2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/gnuattr3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/mul-vectorize-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/mulkc3-2.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/mulkc3-3.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst-v2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-builtin-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-builtin-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-builtin-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-builtin-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-builtin-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-builtin-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-builtin-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-builtin-8.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/p8vector-fp.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-int128-1.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/p8vector-ldst.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-vbpermq.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-dimode1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-dimode2.c | 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
gcc/testsuite/gcc.target/powerpc/p9-fpcvt-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-fpcvt-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-fpcvt-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-3.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/p9-minmax-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-minmax-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-minmax-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-permute.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-vbpermd.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-1.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-2.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-3.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-4.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-5.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-6.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-7.c | 9 ++++++---
gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-8.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-1.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-2.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-3.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-4.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-5.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-6.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-7.c | 9 ++++++---
gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-8.c | 5 ++++-
gcc/testsuite/gcc.target/powerpc/p9-vneg.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-vparity.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/p9-vpermr.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-xxbr-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-xxbr-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/p9-xxbr-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-fma-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-fma-2.c | 2 +-
.../gcc.target/powerpc/ppc-fortran/pr102767.f90 | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-fpconv-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-fpconv-10.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-fpconv-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-fpconv-9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-round.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-round2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-round3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr100866-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr100866-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr102868.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr103124.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr103605-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr103605-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr104015-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr104124.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr104239-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr104239-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr104239-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr104482.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr105271.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr106769-p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr106769-p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr107412.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr108396.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr109069-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr109082.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr110429.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr111449-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr111449-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr113950.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr42747.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr43154.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr47755.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr47862.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr48053-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr48053-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr48053-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr48192.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr48226.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr48258-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr48258-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr48857.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr52199.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr53487.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr56605.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr57150.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr58673-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr58673-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr59054.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr60203.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr60676.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr64019.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr66144-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr66144-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr66144-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr67808.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr68163.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr70243.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr70669.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71186.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71309.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr71656-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71656-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71670.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71680.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71698.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr71720.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71763.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71977-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr71977-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr72717.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr72804.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr72853.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr77289.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr78056-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr78056-3.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr78102.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr78543.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr78604.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr78658.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr78953.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79004.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79038-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79179.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79251.p7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79251.p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79251.p9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79354.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79544.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79799-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79799-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79799-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79799-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79907.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr79951.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr80315-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr80315-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr80315-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr80315-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr80510-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr80510-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr80695-p8.c | 6 ++++--
gcc/testsuite/gcc.target/powerpc/pr80695-p9.c | 5 +++--
gcc/testsuite/gcc.target/powerpc/pr80718.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr81348.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr81622.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr81959.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr82015.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr82748-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr82748-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr83399.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr83862.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr84154-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr84154-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr84154-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr84220-sld2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr84220-sldw.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr84220-xxperm.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr84220-xxsld.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr84226.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr85456.c | 4 ++--
.../gcc.target/powerpc/pr86731-fwrapv-longlong.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr88309.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr88558-p8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr88845.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr88965.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr90763.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr91903.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr92398.p9+.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr92398.p9-.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr92923-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr92923-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr93073.c | 3 ++-
gcc/testsuite/gcc.target/powerpc/pr93658.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr96125.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr96139-a.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr96139-b.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr96933-1.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/pr96933-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr97019.c | 4 +++-
gcc/testsuite/gcc.target/powerpc/pr98914.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pragma_misc9.c | 4 ++--
.../gcc.target/powerpc/pure-builtin-redundant-load.c | 2 +-
gcc/testsuite/gcc.target/powerpc/recip-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/sad-vectorize-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/sad-vectorize-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/sd-vsx.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/signbit-1.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/signbit-2.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/sldoi_to_mov.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-12.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-14.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-15.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-16.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-17.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-18.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-19.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-22.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-23.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-24.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-25.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-26.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-27.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-30.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-33.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-36.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-39.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-42.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-45.c | 2 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/undef-bool-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/unpack-vectorize-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/unpack-vectorize-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/upper-regs-df.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/upper-regs-sf.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsdub-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsdub-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsduh-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsduh-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsduw-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vadsduw-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-cmp-sel.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vec-cmp.c | 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
gcc/testsuite/gcc.target/powerpc/vec-init-10.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vec-init-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-init-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-init-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-minmax-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-minmax-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-mul.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-perm-ctor.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-set-char.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-set-int.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec-set-short.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec_reve_1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vec_reve_2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vector_float.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/versioned-copy-loop.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vslv-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vslv-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsrv-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsrv-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-10.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-11.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-12.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-13.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-14.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-10.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-11.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-12.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-13.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-14.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-0.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-1.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-10.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-11.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-12.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-2.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-3.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-4.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-5.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-6.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-7.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-8.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-9.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-0.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-1.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-10.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-11.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-13.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-2.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-3.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-4.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-5.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-6.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-7.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-8.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-9.c | 4 ++--
gcc/testsuite/gcc.target/powerpc/vsx-13.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-builtin-msum.c | 4 ++--
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
| 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-float0.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-himode.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-himode2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-himode3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-mass-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-qimode.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-qimode2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-qimode3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-sfminmax.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-simode.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-simode2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-simode3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-6-func-1op.c | 2 +-
.../gcc.target/powerpc/vsx-vector-6-func-2lop.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-6-func-2op.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-6-func-3op.c | 2 +-
.../gcc.target/powerpc/vsx-vector-6-func-cmp-all.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-6-func-cmp.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vectorize-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vectorize-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vectorize-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vectorize-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vectorize-5.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vectorize-6.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vectorize-7.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsx-vectorize-8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/vsxcopy.c | 2 +-
gcc/testsuite/gfortran.dg/nint_p7.f90 | 2 +-
881 files changed, 1049 insertions(+), 999 deletions(-)
diff --git a/gcc/testsuite/g++.dg/ext/pr85503.C b/gcc/testsuite/g++.dg/ext/pr85503.C
index 832952a8774..ac7d018baf9 100644
--- a/gcc/testsuite/g++.dg/ext/pr85503.C
+++ b/gcc/testsuite/g++.dg/ext/pr85503.C
@@ -1,7 +1,7 @@
// PR target/85503
// { dg-do compile { target { { powerpc64le-*-* } && c++11 } } }
-// { dg-require-effective-target powerpc_vsx_ok }
// { dg-options "-O2 -mvsx" }
+// { dg-require-effective-target powerpc_vsx }
namespace b {
template < int c > struct d { static constexpr int e = c; };
diff --git a/gcc/testsuite/g++.dg/pr69667.C b/gcc/testsuite/g++.dg/pr69667.C
index cfe25a82fb1..dc50db98e62 100644
--- a/gcc/testsuite/g++.dg/pr69667.C
+++ b/gcc/testsuite/g++.dg/pr69667.C
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -w -std=c++14" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* target/69667, compiler got
internal compiler error: Max. number of generated reload insns per insn is achieved (90) */
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-19.C b/gcc/testsuite/g++.target/powerpc/altivec-19.C
index 4a1bf188983..0fca32bde1b 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-19.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-19.C
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 " } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/g++.target/powerpc/pr101168.C b/gcc/testsuite/g++.target/powerpc/pr101168.C
index e0512a9627e..6df6ece68de 100644
--- a/gcc/testsuite/g++.target/powerpc/pr101168.C
+++ b/gcc/testsuite/g++.target/powerpc/pr101168.C
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
using vdbl = __vector double;
#define BREAK 1
diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-1.C b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
index c22c2c2d1a5..94002f05f04 100644
--- a/gcc/testsuite/g++.target/powerpc/pr65240-1.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
@@ -1,7 +1,7 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ffast-math -mno-fp-in-toc -Wno-return-type" } */
/* { dg-additional-options "-mcmodel=small" { target lp64 } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* target/65240, compiler got a 'insn does not satisfy its constraints' error. */
diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-2.C b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
index 99ca68cf7cd..fa6da1be57f 100644
--- a/gcc/testsuite/g++.target/powerpc/pr65240-2.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
@@ -1,7 +1,7 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ffast-math -mfp-in-toc -Wno-return-type" } */
/* { dg-additional-options "-mcmodel=small" { target lp64 } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* target/65240, compiler got a 'insn does not satisfy its constraints' error. */
diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-3.C b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
index a8869d5510a..429be60ed8f 100644
--- a/gcc/testsuite/g++.target/powerpc/pr65240-3.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
@@ -1,7 +1,7 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ffast-math -Wno-return-type" } */
/* { dg-additional-options "-mcmodel=medium" { target lp64 } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* target/65240, compiler got a 'insn does not satisfy its constraints' error. */
diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-4.C b/gcc/testsuite/g++.target/powerpc/pr65240-4.C
index 3f6993aa1cd..1200cba534c 100644
--- a/gcc/testsuite/g++.target/powerpc/pr65240-4.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-4.C
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O3 -ffast-math -Wno-return-type" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* target/65240, compiler got a 'insn does not satisfy its constraints' error. */
diff --git a/gcc/testsuite/g++.target/powerpc/pr65242.C b/gcc/testsuite/g++.target/powerpc/pr65242.C
index 278fe960159..31e0579cf4b 100644
--- a/gcc/testsuite/g++.target/powerpc/pr65242.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65242.C
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
class A {
public:
diff --git a/gcc/testsuite/g++.target/powerpc/pr67211.C b/gcc/testsuite/g++.target/powerpc/pr67211.C
index 95d90dabd4a..33e007b2a6a 100644
--- a/gcc/testsuite/g++.target/powerpc/pr67211.C
+++ b/gcc/testsuite/g++.target/powerpc/pr67211.C
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3 -w" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* target/67211, compiler got a 'insn does not satisfy its constraints' error. */
diff --git a/gcc/testsuite/g++.target/powerpc/pr71294.C b/gcc/testsuite/g++.target/powerpc/pr71294.C
index 85b9f811d11..b0f26956f28 100644
--- a/gcc/testsuite/g++.target/powerpc/pr71294.C
+++ b/gcc/testsuite/g++.target/powerpc/pr71294.C
@@ -1,5 +1,5 @@
-// { dg-require-effective-target powerpc_vsx_ok } */
// { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -fstack-protector" }
+// { dg-require-effective-target powerpc_vsx } */
// PAR target/71294 failed because RELOAD could not figure how create a V2DI
// vector that auto vectorization created with each element being the same
diff --git a/gcc/testsuite/g++.target/powerpc/pr84279.C b/gcc/testsuite/g++.target/powerpc/pr84279.C
index ee9747cc48b..33947d5c9ea 100644
--- a/gcc/testsuite/g++.target/powerpc/pr84279.C
+++ b/gcc/testsuite/g++.target/powerpc/pr84279.C
@@ -1,8 +1,8 @@
/* { dg-do compile } */
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target fpic } */
/* { dg-options "-O3 -mdejagnu-cpu=power8 -mvsx -g -fPIC -fvisibility=hidden -fstack-protector-strong" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target fpic } */
template <typename, typename T> struct E { T e; };
struct J {
diff --git a/gcc/testsuite/g++.target/powerpc/pr93974.C b/gcc/testsuite/g++.target/powerpc/pr93974.C
index 86401bd4629..61cc54cccfd 100644
--- a/gcc/testsuite/g++.target/powerpc/pr93974.C
+++ b/gcc/testsuite/g++.target/powerpc/pr93974.C
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -fstack-protector-strong" } */
+/* { dg-require-effective-target powerpc_vsx } */
class a {
double b[2];
diff --git a/gcc/testsuite/g++.target/powerpc/undef-bool-1.C b/gcc/testsuite/g++.target/powerpc/undef-bool-1.C
index d9a1eb5aa85..406dbbfd4c5 100644
--- a/gcc/testsuite/g++.target/powerpc/undef-bool-1.C
+++ b/gcc/testsuite/g++.target/powerpc/undef-bool-1.C
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-O2 -DNO_WARN_X86_INTRINSICS -mvsx" } */
/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test to ensure that "bool" gets undef'd in xmmintrin.h when
we require strict ANSI. */
diff --git a/gcc/testsuite/gcc.dg/gomp/pr82374.c b/gcc/testsuite/gcc.dg/gomp/pr82374.c
index 453266ed84e..448eacf0e15 100644
--- a/gcc/testsuite/gcc.dg/gomp/pr82374.c
+++ b/gcc/testsuite/gcc.dg/gomp/pr82374.c
@@ -2,7 +2,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fno-tree-vectorize -fdump-tree-vect-details" } */
/* { dg-additional-options "-mavx -mno-avx2" { target i?86-*-* x86_64-*-* } } */
-/* { dg-additional-options "-mvsx" { target powerpc_vsx_ok } } */
#define SIZE (1024 * 1024)
@@ -28,4 +27,4 @@ bar (void)
d[i] = a[i] + b[i];
}
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { { i?86-*-* x86_64-*-* } || { powerpc_vsx_ok } } } } } */
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { { i?86-*-* x86_64-*-* } || { powerpc_vsx } } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-perm.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-perm.c
index 624881b581f..7dd1e045b53 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-perm.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-perm.c
@@ -1,10 +1,10 @@
/* { dg-do compile } */
-/* { dg-require-effective-target vect_int } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* Specify power9 to ensure the vectorization is profitable
and test point stands, otherwise it could be not profitable
to vectorize. */
/* { dg-additional-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify we cost the exact count for required vec_perm. */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-reversed.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-reversed.c
index 651274be038..203ad629db3 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-reversed.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-reversed.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target vect_int } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-additional-options "-mvsx" } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify we do cost the required vec_perm. */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-store-2.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-store-2.c
index 72b67cf9040..92d64b60358 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-store-2.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-store-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target vect_int } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-additional-options "-mvsx" } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify we do cost the required vec_perm. */
diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-1.c b/gcc/testsuite/gcc.dg/vect/pr109011-1.c
index 28f1288648b..bba364bb122 100644
--- a/gcc/testsuite/gcc.dg/vect/pr109011-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-1.c
@@ -3,8 +3,7 @@
/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
/* { dg-additional-options "-mavx512cd" { target { { i?86-*-* x86_64-*-* } && avx512cd } } } */
/* { dg-additional-options "-mavx512vpopcntdq" { target { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } } } */
-/* { dg-additional-options "-mvsx" { target { powerpc_vsx_ok && has_arch_pwr8 } } } */
-/* { dg-additional-options "-mdejagnu-cpu=power8 -mvsx" { target { powerpc_vsx_ok && { ! has_arch_pwr8 } } } } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { powerpc_vsx && { ! has_arch_pwr8 } } } } */
/* { dg-additional-options "-march=z13 -mzarch" { target s390_vx } } */
void
@@ -16,7 +15,7 @@ foo (long long *p, long long *q)
}
/* { dg-final { scan-tree-dump-times " = \.POPCOUNT \\\(vect" 1 "optimized" { target { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } } } } */
-/* { dg-final { scan-tree-dump-times " = \.POPCOUNT \\\(vect" 1 "optimized" { target { powerpc_vsx_ok || s390_vx } } } } */
+/* { dg-final { scan-tree-dump-times " = \.POPCOUNT \\\(vect" 1 "optimized" { target { powerpc_vsx || s390_vx } } } } */
void
bar (long long *p, long long *q)
@@ -27,4 +26,4 @@ bar (long long *p, long long *q)
}
/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 1 "optimized" { target { { i?86-*-* x86_64-*-* } && avx512cd } } } } */
-/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 1 "optimized" { target { powerpc_vsx_ok || s390_vx } } } } */
+/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 1 "optimized" { target { powerpc_vsx || s390_vx } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-2.c b/gcc/testsuite/gcc.dg/vect/pr109011-2.c
index 0219019edf1..4c7e6ad07a4 100644
--- a/gcc/testsuite/gcc.dg/vect/pr109011-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-2.c
@@ -2,8 +2,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
/* { dg-additional-options "-mavx512cd -mbmi -mlzcnt -mno-avx512vpopcntdq" { target { { { { i?86-*-* x86_64-*-* } && avx512cd } && lzcnt } && bmi } } } */
-/* { dg-additional-options "-mvsx" { target { powerpc_vsx_ok && has_arch_pwr9 } } } */
-/* { dg-additional-options "-mdejagnu-cpu=power9 -mvsx" { target { powerpc_vsx_ok && { ! has_arch_pwr9 } } } } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { powerpc_vsx && { ! has_arch_pwr9 } } } } */
/* { dg-additional-options "-march=z13 -mzarch" { target s390_vx } } */
void
@@ -31,6 +30,6 @@ baz (int *p, int *q)
}
/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 3 "optimized" { target { { { { i?86-*-* x86_64-*-* } && avx512cd } && lzcnt } && bmi } } } } */
-/* { dg-final { scan-tree-dump-times " = \.CTZ \\\(vect" 3 "optimized" { target powerpc_vsx_ok } } } */
+/* { dg-final { scan-tree-dump-times " = \.CTZ \\\(vect" 3 "optimized" { target powerpc_vsx } } } */
/* { dg-final { scan-tree-dump-times " = \.CTZ \\\(vect" 2 "optimized" { target s390_vx } } } */
/* { dg-final { scan-tree-dump-times " = \.POPCOUNT \\\(vect" 1 "optimized" { target s390_vx } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-3.c b/gcc/testsuite/gcc.dg/vect/pr109011-3.c
index eda0d3aa978..7b282952049 100644
--- a/gcc/testsuite/gcc.dg/vect/pr109011-3.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-3.c
@@ -2,7 +2,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
/* { dg-additional-options "-mno-avx512cd -mbmi -mlzcnt -mavx512vpopcntdq" { target { { { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } && lzcnt } && bmi } } } */
-/* { dg-additional-options "-mdejagnu-cpu=power8 -mvsx" { target powerpc_vsx_ok } } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target powerpc_vsx } } */
void
foo (int *p, int *q)
@@ -29,4 +29,4 @@ baz (int *p, int *q)
}
/* { dg-final { scan-tree-dump-times " = \.POPCOUNT \\\(vect" 3 "optimized" { target { { { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } && lzcnt } && bmi } } } } */
-/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 3 "optimized" { target powerpc_vsx_ok } } } */
+/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 3 "optimized" { target powerpc_vsx } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-4.c b/gcc/testsuite/gcc.dg/vect/pr109011-4.c
index da7810d62b5..38b2ab4d511 100644
--- a/gcc/testsuite/gcc.dg/vect/pr109011-4.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-4.c
@@ -2,8 +2,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
/* { dg-additional-options "-mavx512cd -mbmi -mlzcnt -mno-avx512vpopcntdq" { target { { { { i?86-*-* x86_64-*-* } && avx512cd } && lzcnt } && bmi } } } */
-/* { dg-additional-options "-mvsx" { target { powerpc_vsx_ok && has_arch_pwr9 } } } */
-/* { dg-additional-options "-mdejagnu-cpu=power9 -mvsx" { target { powerpc_vsx_ok && { ! has_arch_pwr9 } } } } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { powerpc_vsx && { ! has_arch_pwr9 } } } } */
/* { dg-additional-options "-march=z13 -mzarch" { target s390_vx } } */
void
@@ -31,6 +30,6 @@ baz (long long *p, long long *q)
}
/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 3 "optimized" { target { { { { i?86-*-* x86_64-*-* } && avx512cd } && lzcnt } && bmi } } } } */
-/* { dg-final { scan-tree-dump-times " = \.CTZ \\\(vect" 3 "optimized" { target powerpc_vsx_ok } } } */
+/* { dg-final { scan-tree-dump-times " = \.CTZ \\\(vect" 3 "optimized" { target powerpc_vsx } } } */
/* { dg-final { scan-tree-dump-times " = \.CTZ \\\(vect" 2 "optimized" { target s390_vx } } } */
/* { dg-final { scan-tree-dump-times " = \.POPCOUNT \\\(vect" 1 "optimized" { target s390_vx } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-5.c b/gcc/testsuite/gcc.dg/vect/pr109011-5.c
index f2119aebcfd..9717b1ba841 100644
--- a/gcc/testsuite/gcc.dg/vect/pr109011-5.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-5.c
@@ -2,7 +2,7 @@
/* { dg-do compile } */
/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
/* { dg-additional-options "-mno-avx512cd -mbmi -mlzcnt -mavx512vpopcntdq" { target { { { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } && lzcnt } && bmi } } } */
-/* { dg-additional-options "-mdejagnu-cpu=power8 -mvsx" { target powerpc_vsx_ok } } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target powerpc_vsx } } */
void
foo (long long *p, long long *q)
@@ -29,4 +29,4 @@ baz (long long *p, long long *q)
}
/* { dg-final { scan-tree-dump-times " = \.POPCOUNT \\\(vect" 3 "optimized" { target { { { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } && lzcnt } && bmi } } } } */
-/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 3 "optimized" { target powerpc_vsx_ok } } } */
+/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 3 "optimized" { target powerpc_vsx } } } */
--git a/gcc/testsuite/gcc.dg/vmx/extract-vsx.c b/gcc/testsuite/gcc.dg/vmx/extract-vsx.c
index 900328251e6..9eae312c392 100644
--- a/gcc/testsuite/gcc.dg/vmx/extract-vsx.c
+++ b/gcc/testsuite/gcc.dg/vmx/extract-vsx.c
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mabi=altivec -std=gnu99 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "harness.h"
diff --git a/gcc/testsuite/gcc.dg/vmx/insert-vsx.c b/gcc/testsuite/gcc.dg/vmx/insert-vsx.c
index 6885b8ce23f..4befe4c7917 100644
--- a/gcc/testsuite/gcc.dg/vmx/insert-vsx.c
+++ b/gcc/testsuite/gcc.dg/vmx/insert-vsx.c
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mabi=altivec -std=gnu99 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "harness.h"
diff --git a/gcc/testsuite/gcc.dg/vmx/ld-vsx.c b/gcc/testsuite/gcc.dg/vmx/ld-vsx.c
index ce213777fd7..6dd9cf44087 100644
--- a/gcc/testsuite/gcc.dg/vmx/ld-vsx.c
+++ b/gcc/testsuite/gcc.dg/vmx/ld-vsx.c
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mabi=altivec -std=gnu99 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "harness.h"
diff --git a/gcc/testsuite/gcc.dg/vmx/ldl-vsx.c b/gcc/testsuite/gcc.dg/vmx/ldl-vsx.c
index dc631f9fc9a..4e4e2401329 100644
--- a/gcc/testsuite/gcc.dg/vmx/ldl-vsx.c
+++ b/gcc/testsuite/gcc.dg/vmx/ldl-vsx.c
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mabi=altivec -std=gnu99 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "harness.h"
diff --git a/gcc/testsuite/gcc.dg/vmx/merge-vsx.c b/gcc/testsuite/gcc.dg/vmx/merge-vsx.c
index 088b9bd150b..905da953ff8 100644
--- a/gcc/testsuite/gcc.dg/vmx/merge-vsx.c
+++ b/gcc/testsuite/gcc.dg/vmx/merge-vsx.c
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mabi=altivec -std=gnu99 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "harness.h"
diff --git a/gcc/testsuite/gcc.dg/vmx/splat-vsx.c b/gcc/testsuite/gcc.dg/vmx/splat-vsx.c
index 54ca3c294fe..9ea38ed7df1 100644
--- a/gcc/testsuite/gcc.dg/vmx/splat-vsx.c
+++ b/gcc/testsuite/gcc.dg/vmx/splat-vsx.c
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mabi=altivec -std=gnu99 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "harness.h"
diff --git a/gcc/testsuite/gcc.dg/vmx/st-vsx.c b/gcc/testsuite/gcc.dg/vmx/st-vsx.c
index d048c53911f..40455b8c581 100644
--- a/gcc/testsuite/gcc.dg/vmx/st-vsx.c
+++ b/gcc/testsuite/gcc.dg/vmx/st-vsx.c
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mabi=altivec -std=gnu99 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "harness.h"
diff --git a/gcc/testsuite/gcc.dg/vmx/stl-vsx.c b/gcc/testsuite/gcc.dg/vmx/stl-vsx.c
index a5b973a1309..8c00912cd4b 100644
--- a/gcc/testsuite/gcc.dg/vmx/stl-vsx.c
+++ b/gcc/testsuite/gcc.dg/vmx/stl-vsx.c
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mabi=altivec -std=gnu99 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "harness.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c b/gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c
index 7d1eda909f7..6975ea57e65 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-37.c b/gcc/testsuite/gcc.target/powerpc/altivec-37.c
index 2a84e0bdb35..4228a152009 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-37.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-37.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-2.c b/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-2.c
index aecccd0c7d2..f27785dd52b 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-2.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Note that vector long long and vector double type require vsx support. */
diff --git a/gcc/testsuite/gcc.target/powerpc/amo1.c b/gcc/testsuite/gcc.target/powerpc/amo1.c
index d2a67d81bc5..c5af373b4e9 100644
--- a/gcc/testsuite/gcc.target/powerpc/amo1.c
+++ b/gcc/testsuite/gcc.target/powerpc/amo1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -mpower9-misc -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify P9 atomic memory operations. */
diff --git a/gcc/testsuite/gcc.target/powerpc/atomic-p7.c b/gcc/testsuite/gcc.target/powerpc/atomic-p7.c
index cb3d28390da..ee998036750 100644
--- a/gcc/testsuite/gcc.target/powerpc/atomic-p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/atomic-p7.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "lbarx" } } */
/* { dg-final { scan-assembler-not "lharx" } } */
/* { dg-final { scan-assembler-times "lwarx" 18 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/atomic-p8.c b/gcc/testsuite/gcc.target/powerpc/atomic-p8.c
index b24ca4cbfd8..ff0cbbb20b4 100644
--- a/gcc/testsuite/gcc.target/powerpc/atomic-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/atomic-p8.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "lbarx" 7 } } */
/* { dg-final { scan-assembler-times "lharx" 7 } } */
/* { dg-final { scan-assembler-times "lwarx" 7 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/atomic_load_store-p8.c b/gcc/testsuite/gcc.target/powerpc/atomic_load_store-p8.c
index 94b21ba9973..10fc2705bad 100644
--- a/gcc/testsuite/gcc.target/powerpc/atomic_load_store-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/atomic_load_store-p8.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "lq" 1 } } */
/* { dg-final { scan-assembler-times "stq" 1 } } */
/* { dg-final { scan-assembler-not "bl __atomic" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bcd-1.c b/gcc/testsuite/gcc.target/powerpc/bcd-1.c
index 00a6f84c3d8..51484329b8c 100644
--- a/gcc/testsuite/gcc.target/powerpc/bcd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bcd-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-linux* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "cdtbcd " 1 } } */
/* { dg-final { scan-assembler-times "cbcdtd " 1 } } */
/* { dg-final { scan-assembler-times "addg6s " 1 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bcd-2.c b/gcc/testsuite/gcc.target/powerpc/bcd-2.c
index a5b4f2cf3d6..cb66da9e5cb 100644
--- a/gcc/testsuite/gcc.target/powerpc/bcd-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bcd-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "bcdadd\[.\] " 2 } } */
/* { dg-final { scan-assembler-times "bcdsub\[.\] " 2 } } */
/* { dg-final { scan-assembler-not "bl __builtin" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bcd-3.c b/gcc/testsuite/gcc.target/powerpc/bcd-3.c
index ff35ef54eb3..dd5fafceb8e 100644
--- a/gcc/testsuite/gcc.target/powerpc/bcd-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bcd-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "bcdadd\[.\] " 4 } } */
/* { dg-final { scan-assembler-times "bcdsub\[.\] " 6 } } */
/* { dg-final { scan-assembler-not "bl __builtin" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-0.c
index f1b3bc3fd53..717148f9615 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c
index 720ba5d5fa9..8632e723dcc 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
index 46c459cbb76..3710f8bc4e8 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-0.c
index e412d73f7d0..6b9aeda93dc 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c
index bd9f5229de2..9b77b0f8cb5 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
index b9f306dd076..40fa735e951 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-0.c
index ca25ac24c7a..cd9229028ee 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c
index 77302a3d9f5..67a07897bb3 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
index 6045bda6c4c..0f9e176a5f5 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-0.c
index 1893fc5eb56..89d1a8b8ac1 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c
index 45acdb4a5e7..8a947c6ce12 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
index 64176314058..3ef6783e113 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on 32-bit and 64-bit configurations. */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-0.c
index b59fdd6d3f7..44cb037868b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c
index 32179cd134a..efba38dc4f2 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-3.c
index 48a0ee2117f..8aeddb47097 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c
index ae3ab80873f..5f481da250c 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c
index 79956d7698b..672aac7ed37 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test only runs on 32-bit configurations, where a compiler error
should be issued because this builtin is not available on
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-0.c
index 92e894413ed..9cefeedd769 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
/* This test should succeed only on 64-bit configurations. */
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c
index 848fce33d86..983cff37277 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
/* This test should succeed only on 64-bit configurations. */
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c
index b8c89ac00c5..4f2129f136b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { has_arch_ppc64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test only runs on 32-bit configurations, producing a compiler
error because the builtin requires 64 bits. */
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-3.c
index d3ae94b4f00..858656a313d 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c
index 24e382fe494..2ced9e66137 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c
index 7f86801e228..5b6d763a26f 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test only runs on 32-bit configurations, producing a compiler
error because the builtin requires 64 bits. */
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-0.c
index ae345915f5b..c26f77975f5 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
/* This test should succeed only on 64-bit configurations. */
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c
index 50a21f9aa68..2a2d8aae3a4 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
/* This test should succeed only on 64-bit configurations. */
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c
index 743cf4401bc..7d0f93dcff6 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c
index 469f6d94eab..3a0529ed9a1 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test only runs on 32-bit configurations, where a compiler error
should be issued because this builtin is not available on
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c
index a3ab1f2d007..ba1f1c20e8b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { has_arch_ppc64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test only runs on 32-bit configurations, where a compiler error
should be issued because this builtin is not available on
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-3.c
index fe0a7a7eac6..b91d916e38e 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
/* This test should succeed only on 64-bit configurations. */
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c
index 7078a677eaa..d181d77ade8 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
/* This test should succeed only on 64-bit configurations. */
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c
index 5ccc7aee962..e208c6650e4 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { has_arch_ppc64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test only runs on 32-bit configurations, where a compiler error
should be issued because this builtin is not available on
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-6.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-6.c
index 3aca1ae7770..ad93c57881d 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-6.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c
index 2651745c161..797dc5f6bc2 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c
index 265b4ae1cbe..d9984c7678f 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test only runs on 32-bit configurations, where a compiler error
should be issued because this builtin is not available on
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-9.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-9.c
index 84a0156c2e6..8aba7b4d29b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-9.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-0.c
index 7d69447f738..6147cc56f6f 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-1.c
index 403f54ba6b7..0ac5eb009ed 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-10.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-10.c
index 45f380f9ce5..69921b26acf 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-10.c
@@ -1,9 +1,9 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* Require 64-bit target to select expected error message below. 32-bit
target produces different error message. */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c
index 170f641b587..8da98569de8 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-2.c
index b519dd6dcd2..e2cca9a330d 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-3.c
index 3beb620a952..6bd1af79f94 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-4.c
index 1687f965d71..aff4a11d2c4 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-5.c
index 465af2db76f..ea030215b47 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c
index 014ebb713fd..c67d74fb14b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c
index 4c46db9f5b8..53d76c76340 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-8.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-8.c
index 7fa834e879c..995c5a008bc 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-8.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-9.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-9.c
index 3998d45fe41..2dfa662b8ef 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-9.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-0.c
index 941187efe54..5c93264f04b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-1.c
index 215437c79d4..3ccb221c00a 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c
index abdac3ade49..1f7a168ff9a 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c
index f4774a937e7..5647e2c54df 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-4.c
index 112023cf923..ae9b3f0c1cd 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c
index 3bee45d9851..d78462f6000 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdbool.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-0.c
index 9979aa98860..5d5de569e49 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-1.c
index 981bcb47419..ed685291cb9 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c
index efd7d4abf3e..57eeb9451e9 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c
index 94f8c79dfac..54c4132430c 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-0.c
index 03a91b228d6..83b85a01894 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-1.c
index 60e090d489e..9be2e9c8d61 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c
index 4f079e81e00..5f4479ca11a 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c
index 7843cb5cd76..7d4902eb7e2 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-0.c
index 96dc96a7097..0ed5c591da6 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-1.c
index fcc6bee6352..fb11b4e2a0d 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c
index 6d8198ff9cd..e55326c2884 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c
index b4b88c2d9b5..fc7af588607 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-4.c
index c654f7ec323..384c5dbf388 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-5.c
index f0a41e16df3..7c1a22b2715 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c
index 0a893a10276..97584333991 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c
index b0f81a5cf80..147fbd8d4c7 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-0.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-0.c
index 1cad09ccf83..f1b69319094 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-1.c
index 4baa2ae4aa2..bdea854a9c6 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c
index f463152e521..1e41fb30a9b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c
index e0e346a547f..357f430af86 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-4.c
index f6fa7d04653..cee4d570b6d 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-5.c
index 29387071b99..faa7060c4cd 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-6.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-6.c
index 41652778456..1d90323ae98 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-6.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-7.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-7.c
index d6301d07ea1..1b506c6b054 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-7.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bmi2-pext64-1a.c b/gcc/testsuite/gcc.target/powerpc/bmi2-pext64-1a.c
index 58fd7344199..1d446721749 100644
--- a/gcc/testsuite/gcc.target/powerpc/bmi2-pext64-1a.c
+++ b/gcc/testsuite/gcc.target/powerpc/bmi2-pext64-1a.c
@@ -2,7 +2,7 @@
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
/* { dg-options "-O3 -mdejagnu-cpu=power7" } */
/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#define NO_WARN_X86_INTRINSICS 1
#include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bool2-p7.c b/gcc/testsuite/gcc.target/powerpc/bool2-p7.c
index 956605e32ec..ce45fd4b05a 100644
--- a/gcc/testsuite/gcc.target/powerpc/bool2-p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bool2-p7.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "\[ \t\]and " } } */
/* { dg-final { scan-assembler-not "\[ \t\]or " } } */
/* { dg-final { scan-assembler-not "\[ \t\]xor " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bool2-p8.c b/gcc/testsuite/gcc.target/powerpc/bool2-p8.c
index 545d523608c..ee02bacca00 100644
--- a/gcc/testsuite/gcc.target/powerpc/bool2-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/bool2-p8.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "\[ \t\]and " } } */
/* { dg-final { scan-assembler-not "\[ \t\]or " } } */
/* { dg-final { scan-assembler-not "\[ \t\]xor " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bool3-p7.c b/gcc/testsuite/gcc.target/powerpc/bool3-p7.c
index 082d6b0e085..11ae87cadb8 100644
--- a/gcc/testsuite/gcc.target/powerpc/bool3-p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bool3-p7.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "\[ \t\]and " } } */
/* { dg-final { scan-assembler "\[ \t\]or " } } */
/* { dg-final { scan-assembler "\[ \t\]xor " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bool3-p8.c b/gcc/testsuite/gcc.target/powerpc/bool3-p8.c
index f2b1b1df5e7..97aef0f9684 100644
--- a/gcc/testsuite/gcc.target/powerpc/bool3-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/bool3-p8.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "\[ \t\]and " } } */
/* { dg-final { scan-assembler "\[ \t\]or " } } */
/* { dg-final { scan-assembler "\[ \t\]xor " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-1.c b/gcc/testsuite/gcc.target/powerpc/builtins-1.c
index 155895ffef8..8410a5fd431 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-3-p8.c b/gcc/testsuite/gcc.target/powerpc/builtins-3-p8.c
index e5a7db6d83d..f641d306ec3 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-3-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-3-p8.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-3-p9.c b/gcc/testsuite/gcc.target/powerpc/builtins-3-p9.c
index c354fd5f198..b54bda99eac 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-3-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-3-p9.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-4.c b/gcc/testsuite/gcc.target/powerpc/builtins-4.c
index f65e582541a..b8f6fb73993 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-5.c b/gcc/testsuite/gcc.target/powerpc/builtins-5.c
index fc3cf211d37..5b80b9ddfcf 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O0 -dp" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-9.c b/gcc/testsuite/gcc.target/powerpc/builtins-9.c
index d1b7dba8f3c..bc5af02d25d 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-9.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-0.c b/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-0.c
index c93e2eff5c2..9aa1346a27b 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c b/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c
index 59040a53c93..d65bc0431e5 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-range-0.c b/gcc/testsuite/gcc.target/powerpc/byte-in-range-0.c
index 12668b77b3b..48463b041ba 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-range-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-range-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c b/gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c
index fb97f3efe52..8747ec5f531 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-set-0.c b/gcc/testsuite/gcc.target/powerpc/byte-in-set-0.c
index b709378537e..04cc9e55f74 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-set-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-set-0.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed only on 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c b/gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c
index 6b8b414935d..7433957b022 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c b/gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c
index bbdcbbd08f5..e7cdebe533d 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/clone1.c b/gcc/testsuite/gcc.target/powerpc/clone1.c
index 0506b141fc2..1ed432c631c 100644
--- a/gcc/testsuite/gcc.target/powerpc/clone1.c
+++ b/gcc/testsuite/gcc.target/powerpc/clone1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target ppc_cpu_supports_hw } */
/* Power9 (aka, ISA 3.0) has a MODSD instruction to do modulus, while Power8
diff --git a/gcc/testsuite/gcc.target/powerpc/conv-vectorize-1.c b/gcc/testsuite/gcc.target/powerpc/conv-vectorize-1.c
index 8b8c88befd5..c9c1185bde3 100644
--- a/gcc/testsuite/gcc.target/powerpc/conv-vectorize-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/conv-vectorize-1.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -ftree-vectorize -mvsx -fno-vect-cost-model" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test vectorizer can exploit vector conversion instructions to convert
unsigned/signed long long to float. */
diff --git a/gcc/testsuite/gcc.target/powerpc/conv-vectorize-2.c b/gcc/testsuite/gcc.target/powerpc/conv-vectorize-2.c
index 06ae4e2d5ce..e189b793c8c 100644
--- a/gcc/testsuite/gcc.target/powerpc/conv-vectorize-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/conv-vectorize-2.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -ftree-vectorize -mvsx -fno-vect-cost-model" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test vectorizer can exploit vector conversion instructions to convert
float to unsigned/signed long long. */
diff --git a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c
index b8ff3b5760b..de6391909a9 100644
--- a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
typedef vector unsigned long long crypto_t;
diff --git a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c
index 734f1ac29f3..327da7d83f0 100644
--- a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -mno-crypto" } */
+/* { dg-require-effective-target powerpc_vsx } */
void use_builtins_d (__vector unsigned long long *p, __vector unsigned long long *q, __vector unsigned long long *r, __vector unsigned long long *s)
{
diff --git a/gcc/testsuite/gcc.target/powerpc/ctz-3.c b/gcc/testsuite/gcc.target/powerpc/ctz-3.c
index 0481d0233b1..545c22e0194 100644
--- a/gcc/testsuite/gcc.target/powerpc/ctz-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/ctz-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef SIZE
#define SIZE 1024
diff --git a/gcc/testsuite/gcc.target/powerpc/ctz-4.c b/gcc/testsuite/gcc.target/powerpc/ctz-4.c
index ebff89f3ea0..0a254be6d5f 100644
--- a/gcc/testsuite/gcc.target/powerpc/ctz-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/ctz-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/darn-0.c b/gcc/testsuite/gcc.target/powerpc/darn-0.c
index ca339a1ceba..436c8e6c7b0 100644
--- a/gcc/testsuite/gcc.target/powerpc/darn-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/darn-0.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/darn-1.c b/gcc/testsuite/gcc.target/powerpc/darn-1.c
index d3a2a6202f4..17745a91498 100644
--- a/gcc/testsuite/gcc.target/powerpc/darn-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/darn-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/darn-2.c b/gcc/testsuite/gcc.target/powerpc/darn-2.c
index 0bbd69be3c7..b7846d17b19 100644
--- a/gcc/testsuite/gcc.target/powerpc/darn-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/darn-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dform-1.c b/gcc/testsuite/gcc.target/powerpc/dform-1.c
index 9d0e8702554..0d1edccb7cb 100644
--- a/gcc/testsuite/gcc.target/powerpc/dform-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/dform-1.c
@@ -1,9 +1,9 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* Now O2 enables vectorization by default, which makes expected scalar
loads gone, so simply disable it. */
/* { dg-options "-mvsx -O2 -fno-tree-vectorize" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef TYPE
#define TYPE double
diff --git a/gcc/testsuite/gcc.target/powerpc/dform-2.c b/gcc/testsuite/gcc.target/powerpc/dform-2.c
index d9d01116387..e469f8ac224 100644
--- a/gcc/testsuite/gcc.target/powerpc/dform-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/dform-2.c
@@ -1,9 +1,9 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* Now O2 enables vectorization by default, which generates unexpected float
conversion for vector construction, so simply disable it. */
/* { dg-options "-mvsx -O2 -fno-tree-vectorize" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef TYPE
#define TYPE float
diff --git a/gcc/testsuite/gcc.target/powerpc/dform-3.c b/gcc/testsuite/gcc.target/powerpc/dform-3.c
index 84885ecbcb6..621cfe69307 100644
--- a/gcc/testsuite/gcc.target/powerpc/dform-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/dform-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef TYPE
#define TYPE vector double
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-0.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-0.c
index 4903184a8da..029232614fa 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c
index 6e1750d37ff..a1aff3d54eb 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
index b8d5662d2a1..859ebae87ca 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
index 706ba22ff68..414a1f0ecc6 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
index 642814adcae..f687a8458e6 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
index ec22452349a..1093dddea81 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c
index 1b9fe417880..afa407f6709 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
index 19158a18fed..0e2cc94eba1 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
index da3ba1cb644..78a36be9e1c 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
index 6c5b608ba15..28acb644093 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
index c612e6672e1..8db8d4eddad 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c
index 586b43a6cef..05b60881d31 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-2.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-2.c
index daf12308959..db19c26079b 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-20.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-20.c
index 03e8c2eec07..be72bdecaf5 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-20.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-20.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c
index 0d157eea92a..3a16878cad3 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-22.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-22.c
index 3d9249bbcaf..0f15ecc153e 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-22.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-22.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-23.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-23.c
index 66bc0d2052f..96fcf9d68bd 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-23.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-23.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-24.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-24.c
index eb58202c34a..e6a6b5a0143 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-24.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-24.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-25.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-25.c
index 98dbba4956a..ac7bfb7b711 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-25.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-25.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c
index 9a96dd9a1e7..0428f6c2b3d 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-27.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-27.c
index 6ffd1e7582b..de1104f6990 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-27.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-27.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-28.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-28.c
index f8dbc8d70bf..5d7d07fd587 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-28.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-28.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-29.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-29.c
index dcc85579a36..7d3b5e1f203 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-29.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-29.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-3.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-3.c
index 01c0d69d2f3..ff84cbc5e81 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
index d7a8df16bc5..874976c6e7a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
index 97bf3d5d814..8dfcea1105e 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
index 2ca7e118335..3f9ca79442f 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
index 92539502b1b..43169918d6b 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c
index 0731a896432..2e4c1e0d74e 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
index 5dd564ec1bb..075bd643164 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
index e7aca95cefb..50aa0c4269a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
index 01f7154d96f..eafa222fc62 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
index 6f8fddb72f6..14a69a9a48b 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c
index ee779995689..8ec15ebf418 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-4.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-4.c
index 485f8a71b5b..faaccd1e4d6 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-40.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-40.c
index a6a2c592df8..42adcd119ae 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-40.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-40.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c
index a790ed57c23..5109bd2cfa0 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-42.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-42.c
index 68827dcd231..bb009df2db1 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-42.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-42.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-43.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-43.c
index 0e4c4bc15a9..773ec791ec0 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-43.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-43.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-44.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-44.c
index dc3580a70ec..cfaaf7ede48 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-44.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-44.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-45.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-45.c
index 3097f1ef281..a5af9d0ce87 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-45.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-45.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c
index a36df7f473a..85154602043 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-47.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-47.c
index a49dfea9949..ca8251d1326 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-47.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-47.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-48.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-48.c
index 65a920f6aac..b6d01c40564 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-48.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-48.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-49.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-49.c
index 1d4db3300bf..2fd76f9e898 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-49.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-49.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-5.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-5.c
index c5be1ca11f0..4291005877e 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
index d67c0a375bc..9e88bd1caab 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
index a35903412b3..2a11cc39376 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
index 817ea469e1b..e0aee90af56 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
index 85e2ec827df..182debc014c 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c
index 57590d85047..b7d697ee5d5 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
index 6646d8e91b7..73204c5826f 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
index b80d4fefaea..fefc55be1bc 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
index 04f729d2c7b..903c65650d4 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
index ff81cbbcf70..86ce3a32e38 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c
index dfd566d0c97..9a562872fac 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c
index c3ab62d4614..d81e511ec21 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-60.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-60.c
index 06c2ed8e19e..ef104a2befd 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-60.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-60.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c
index dbdf64fbe29..925cdf94b20 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-62.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-62.c
index f0f8cbbf943..455df2643a1 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-62.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-62.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-63.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-63.c
index 527f656d668..97d6108cd8a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-63.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-63.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-64.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-64.c
index f2de23ab411..f25c26fa2a9 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-64.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-64.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-65.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-65.c
index a1ddc103a50..59ab53a3867 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-65.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-65.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c
index b7adb7eaa4d..917dd819a3a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-67.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-67.c
index 9f4961c1753..39f267d29e7 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-67.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-67.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-68.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-68.c
index 35de6a5f9c7..bfb1a81a806 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-68.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-68.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-69.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-69.c
index ed9bc04b921..515b8f2a819 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-69.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-69.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-7.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-7.c
index 52a34f62575..675a5b54239 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-7.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
index 7ef9f4cbf16..0734261a349 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
index 1848b1e7275..497485149ee 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
index 55aa7c87bcb..08255ec7283 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
index 8c525ca4049..6795b3a4441 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c
index c8b108da1ff..db8551ba2e6 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
index 089a71fd13a..5103bb6cc01 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
index f3354797386..2e68c105034 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
index 6bca0d62f6e..29554c4604a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
index 300e5b6b796..be444f1dcf9 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c
index 53ac646630e..252072ec045 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-8.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-8.c
index 59df46e4458..a04503265ab 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-8.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-9.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-9.c
index c6749f2ebc0..7477d2416e9 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-9.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/direct-move-double1.c b/gcc/testsuite/gcc.target/powerpc/direct-move-double1.c
index 03402f1d14e..12498b22dd9 100644
--- a/gcc/testsuite/gcc.target/powerpc/direct-move-double1.c
+++ b/gcc/testsuite/gcc.target/powerpc/direct-move-double1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target lp64 } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "mtvsrd" } } */
/* { dg-final { scan-assembler "mfvsrd" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/direct-move-float1.c b/gcc/testsuite/gcc.target/powerpc/direct-move-float1.c
index 5e5097be520..0775620693f 100644
--- a/gcc/testsuite/gcc.target/powerpc/direct-move-float1.c
+++ b/gcc/testsuite/gcc.target/powerpc/direct-move-float1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target lp64 } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler {\mmtvsrd\M} } } */
/* { dg-final { scan-assembler {\mmfvsrwz\M} } } */
/* { dg-final { scan-assembler {\mxscvdpspn\M} } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/direct-move-float3.c b/gcc/testsuite/gcc.target/powerpc/direct-move-float3.c
index 0eb19456286..fe3b31db2bd 100644
--- a/gcc/testsuite/gcc.target/powerpc/direct-move-float3.c
+++ b/gcc/testsuite/gcc.target/powerpc/direct-move-float3.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test that we generate XSCVDPSP instead of FRSP and XSCVDPSPN when we combine
a round from double to float and moving the float value to a GPR. */
diff --git a/gcc/testsuite/gcc.target/powerpc/direct-move-long1.c b/gcc/testsuite/gcc.target/powerpc/direct-move-long1.c
index 931f1e91754..e700b215fbf 100644
--- a/gcc/testsuite/gcc.target/powerpc/direct-move-long1.c
+++ b/gcc/testsuite/gcc.target/powerpc/direct-move-long1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target lp64 } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "mtvsrd" } } */
/* { dg-final { scan-assembler "mfvsrd" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/direct-move-vector.c b/gcc/testsuite/gcc.target/powerpc/direct-move-vector.c
index 1d06cd8a28f..282df4cbf7f 100644
--- a/gcc/testsuite/gcc.target/powerpc/direct-move-vector.c
+++ b/gcc/testsuite/gcc.target/powerpc/direct-move-vector.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Check code generation for direct move for long types. */
diff --git a/gcc/testsuite/gcc.target/powerpc/direct-move-vint1.c b/gcc/testsuite/gcc.target/powerpc/direct-move-vint1.c
index 8e22297b159..10e972fb813 100644
--- a/gcc/testsuite/gcc.target/powerpc/direct-move-vint1.c
+++ b/gcc/testsuite/gcc.target/powerpc/direct-move-vint1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target lp64 } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "mtvsrd" } } */
/* { dg-final { scan-assembler "mfvsrd" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/divkc3-2.c b/gcc/testsuite/gcc.target/powerpc/divkc3-2.c
index 223f413453c..09af8492ba2 100644
--- a/gcc/testsuite/gcc.target/powerpc/divkc3-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/divkc3-2.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target longdouble128 } */
/* { dg-options "-O2 -mvsx -mabi=ieeelongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target longdouble128 } */
/* Check that complex multiply generates the right call when long double is
IEEE 128-bit floating point. */
diff --git a/gcc/testsuite/gcc.target/powerpc/divkc3-3.c b/gcc/testsuite/gcc.target/powerpc/divkc3-3.c
index 3a33b506304..fc94210c6a3 100644
--- a/gcc/testsuite/gcc.target/powerpc/divkc3-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/divkc3-3.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target longdouble128 } */
/* { dg-options "-O2 -mvsx -mabi=ibmlongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target longdouble128 } */
/* Check that complex multiply generates the right call when long double is
IBM extended double floating point. */
diff --git a/gcc/testsuite/gcc.target/powerpc/extend-divide-1.c b/gcc/testsuite/gcc.target/powerpc/extend-divide-1.c
index b648efd8a40..6fa4209e37b 100644
--- a/gcc/testsuite/gcc.target/powerpc/extend-divide-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/extend-divide-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-linux* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "divwe " 1 } } */
/* { dg-final { scan-assembler-times "divweu " 1 } } */
/* { dg-final { scan-assembler-not "bl __builtin" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/extend-divide-2.c b/gcc/testsuite/gcc.target/powerpc/extend-divide-2.c
index 5b1aaa71e93..7846a1274b8 100644
--- a/gcc/testsuite/gcc.target/powerpc/extend-divide-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/extend-divide-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "divde " 1 } } */
/* { dg-final { scan-assembler-times "divdeu " 1 } } */
/* { dg-final { scan-assembler-not "bl __builtin" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-3.c b/gcc/testsuite/gcc.target/powerpc/float128-3.c
index 6daf290d12b..e62ad5f5247 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-linux* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx -mno-float128" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test that we can use #pragma GCC target to enable -mfloat128. */
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-3b.c b/gcc/testsuite/gcc.target/powerpc/float128-3b.c
index 6b409c13d1c..7c68d31ed2b 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-3b.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-3b.c
@@ -1,4 +1,4 @@
/* { dg-do compile { target { powerpc*-*-linux* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx -mno-float128 -save-temps" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "float128-3.c"
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-5.c b/gcc/testsuite/gcc.target/powerpc/float128-5.c
index 85da4b87092..8a9eee971fb 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx -mno-float128" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test that we can use #pragma GCC target to enable -mfloat128 and generate
code on ISA 3.0 for the float128 built-in functions. Lp64 is required
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-fma1.c b/gcc/testsuite/gcc.target/powerpc/float128-fma1.c
index 1ce1caa96c0..089c6c52d8e 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-fma1.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-fma1.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
__float128
xfma (__float128 a, __float128 b, __float128 c)
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw.c b/gcc/testsuite/gcc.target/powerpc/float128-hw.c
index 74c0e92e07f..88f09a5adeb 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
#ifndef TYPE
#define TYPE _Float128
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw10.c b/gcc/testsuite/gcc.target/powerpc/float128-hw10.c
index 983c372da5f..1ba55b53939 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw10.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw10.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
extern _Float128 floorf128 (_Float128);
extern _Float128 ceilf128 (_Float128);
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw2.c b/gcc/testsuite/gcc.target/powerpc/float128-hw2.c
index 663032e2e69..6d16adea2ed 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw2.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw2.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2 -ffast-math -std=gnu11" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
/* Test to make sure the compiler handles the standard _Float128 functions that
have hardware support in ISA 3.0/power9. */
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw3.c b/gcc/testsuite/gcc.target/powerpc/float128-hw3.c
index 7f9bb6ce515..f8c86f55f0c 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw3.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw3.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2 -ffast-math -std=c11 -mno-pcrel" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
/* Test to make sure the compiler calls the external function instead of doing
the built-in processing for _Float128 functions that have hardware support
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw4.c b/gcc/testsuite/gcc.target/powerpc/float128-hw4.c
index c07d34dc33b..29749f3d733 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw4.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw4.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2 -mabi=ieeelongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
/* Insure that the ISA 3.0 IEEE 128-bit floating point built-in functions can
be used with long double when the default is IEEE 128-bit. */
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw5.c b/gcc/testsuite/gcc.target/powerpc/float128-hw5.c
index 3dd960a1f59..539d49f7b14 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw5.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw5.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2 -ffast-math" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
extern _Float128 copysignf128 (_Float128, _Float128);
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw6.c b/gcc/testsuite/gcc.target/powerpc/float128-hw6.c
index 05bb2dc5320..6d8ed46c626 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw6.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw6.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
extern _Float128 fabsf128 (_Float128);
extern _Float128 copysignf128 (_Float128, _Float128);
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw7.c b/gcc/testsuite/gcc.target/powerpc/float128-hw7.c
index 300ca2367b0..c6decf1e037 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw7.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw7.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
extern _Float128 fabsf128 (_Float128);
extern _Float128 copysignf128 (_Float128, _Float128);
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw8.c b/gcc/testsuite/gcc.target/powerpc/float128-hw8.c
index 6555fed923b..901070771fa 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw8.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw8.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
extern _Float128 fminf128 (_Float128, _Float128);
extern _Float128 fmaxf128 (_Float128, _Float128);
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw9.c b/gcc/testsuite/gcc.target/powerpc/float128-hw9.c
index ac6cf686e83..5f993fb2461 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw9.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw9.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2 -ffast-math" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
extern _Float128 sqrtf128 (_Float128);
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-odd.c b/gcc/testsuite/gcc.target/powerpc/float128-odd.c
index 3b82568d1be..df9d3510083 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-odd.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-odd.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
/* Test the generation of the round to odd instructions. */
__float128
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-sqrt1.c b/gcc/testsuite/gcc.target/powerpc/float128-sqrt1.c
index ca9b24adcb2..d162d7b2b81 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-sqrt1.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-sqrt1.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target float128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target float128 } */
__float128
xsqrt (__float128 a)
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-type-1.c b/gcc/testsuite/gcc.target/powerpc/float128-type-1.c
index 0fbd7f2cb05..d351d963ce1 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-type-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-type-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { *-*-linux* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -mno-float128" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test tests whether the underlying IEEE 128-bit floating point) is
enabled by default on VSX Linux 64-bit systems, even if the keyword
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-type-2.c b/gcc/testsuite/gcc.target/powerpc/float128-type-2.c
index 459402133cb..08f65419312 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-type-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-type-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { *-*-linux* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mno-float128" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test tests whether the underlying IEEE 128-bit floating point) is
enabled by default on VSX Linux 64-bit systems, even if the keyword
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-floatdouble.c
index 1a08618b367..14e5c680a67 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-floatdouble.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p9.c
index d7fc9d30eb8..6444f62187d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p9.c
@@ -2,8 +2,8 @@
inputs produce the right results when -mcpu=power9 is specified. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9 -mvsx -fwrapv" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p9.c
index 569104e9aad..361007afd79 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code when -mcpu=power9 is specified. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.c
index cd681d63a22..acb8b95602c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -fwrapv" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p8.c
index d4062a70b22..86c749e04b6 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p8.c
@@ -3,8 +3,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p9.c
index 471244b74d4..3dff5cd75f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p9.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.c
index edd2c4e3031..f2b8abe2e08 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.p8.c
index 9650a470017..7564e19e28c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.p8.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.p9.c
index 471244b74d4..3dff5cd75f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.p9.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-4.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-4.c
index 3db3ff104f7..c59333b51f7 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-4.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-6.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-6.c
index 559b3e15a4a..305b3fb631f 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-6.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-7.c
index 38f1fcb6b9a..cde96ca68ba 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-7.c
@@ -2,11 +2,11 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
/* { dg-options "-maltivec -mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
#include "altivec.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p8.c
index 606b773c745..f3df6993c0b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p8.c
@@ -2,8 +2,8 @@
char inputs produce the right code when -mcpu=power8 is specified. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-cmp-char.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p9.c
index 385df08a7db..3facd916814 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-char.p9.c
@@ -2,8 +2,8 @@
char inputs produce the right code when -mcpu=power9 is specified. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-cmp-char.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-double.c
index 9d56862b2ea..30ca537be1a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-double.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-float.c
index b75250a7a3a..6bee9bc656a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-float.c
@@ -2,8 +2,8 @@
inputs for VSX produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.h b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.h
index 5de4ff99a99..21b2111f21d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.h
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.h
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p7.c
index 0c8ba150b99..bfee9e2db1d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p7.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-cmp-int.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p8.c
index 8a5128ef7d0..1a042da305e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p8.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-cmp-int.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p9.c
index 9f5b4bd939a..8db2bd28448 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.p9.c
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-cmp-int.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-longlong.c
index 36f90b1735d..9b16c5d66fb 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.h b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.h
index 596be67f9d1..2a10171ef27 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.h
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.h
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p8.c
index 832ea69e27f..fc0302f08a3 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p8.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-cmp-short.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p9.c
index 87a87f3a78e..0dae825f90b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-cmp-short.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-char.c
index 4257bef76ce..4f9ac9445ab 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-char.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-int.c
index 36ff16594af..36544b2c8ec 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-int.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-longlong.c
index 1811a6f3d64..c977edc2c09 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-short.c
index afecc249a5c..23f85a49ac9 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-short.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-div-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-div-float.c
index 47254ce66a8..d73e3d59b8b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-div-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-div-float.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-div-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-div-floatdouble.c
index 569467e61f9..bfafde1dd27 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-div-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-div-floatdouble.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-div-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-div-longlong.c
index f6a9b290ae5..2f5690b08d9 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-div-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-div-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target lp64 } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target lp64 } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p7.c
index 42599c214e4..29fbc9d9ec7 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p7.c
@@ -2,8 +2,8 @@
inputs produce the right code with a power7 (BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// Six tests total. Targeting P7 (BE).
// P7 variable offset: addi, li, stxvw4x, rldicl, add, lbz, (extsb)
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p8.c
index 2f6589999ec..ce4cdb6d238 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p8.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P8 (LE or BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// six tests total. Targeting P8LE / P8BE.
// P8 LE variable offset: rldicl, subfic, sldi, mtvsrd, xxpermdi, vslo, mfvsrd, sradi, rlwinm, (extsb)
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p9.c
index f96eb7b91b0..e1861c365e1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-char.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P9 (LE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mli\M} 3 { target lp64 } } } */
/* Endian sensitive, vextubrx or vextublx. */
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-double.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-double.p8.c
index 42e83f46583..3bb0eb202f4 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-double.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-double.p8.c
@@ -2,8 +2,8 @@
double inputs produce the right code with a P8 (LE or BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// targeting P8, BE and LE. 2 tests.
// P8 (LE) constants: xxlor
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p7.c
index 59a4979457d..f7c06e96109 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p7.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P7 (BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2 " } */
+/* { dg-require-effective-target powerpc_vsx } */
// targeting P7 (BE), 2 tests.
// P7 constants: xscvspdp
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p8.c
index ce4e43c1fb4..6819d271c53 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p8.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P8 (LE or BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// targeting P8, BE and LE. 2 tests.
// P8 (LE) constants: xxsldwi, xscvspdp
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p9.c
index 19a84e9fe38..6b6ca02e3f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-float.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mxscvspdp\M} 2 } } */
/* { dg-final { scan-assembler-times {\mrldicl\M} 1 { target le } } } */
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p7.c
index 3729a1646e9..51636926953 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p7.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P7 (BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2 " } */
+/* { dg-require-effective-target powerpc_vsx } */
// Targeting P7 (BE). 6 tests total.
// P7 constant: li, addi, stxvw4x, rldic, addi, lwzx/lwax
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p8.c
index 152fbdd041b..67fa89d9e02 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p8.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P8 (LE or BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// Targeting P8 (LE) and (BE). 6 tests total.
// P8 LE constant: vspltw, mfvsrwz, (1:extsw/2:rldicl)
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p9.c
index d6e71b9e7e9..810bf94705c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P9 (LE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 " } */
+/* { dg-require-effective-target powerpc_vsx } */
// Targeting P9 (LE). 6 tests total.
// P9 constant: li, vextuwrx, (1:extsw)
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p7.c
index b97fcb40eda..5cffea1a6de 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p7.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P8 (LE or BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// Targeting P7. six tests total.
// P7 (m64) with constants: xxpermdi, stfd, ld
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p8.c
index a49822d52aa..b80c1e8d989 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p8.c
@@ -2,8 +2,8 @@
inputs produce the right code with a P8 (LE or BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// Targeting P8LE and P8BE, six tests total.
// P8 (LE) constants: mfvsrd
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p9.c
index 0b83f3858d6..ce36b18b567 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-longlong.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code for a P9 target. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// targeting P9 (LE), six tests.
// p9 constants: mfvsrd
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p7.c
index a495d9f3928..5f3b11fc5c1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p7.c
@@ -2,8 +2,8 @@
inputs produce the right code for a P7 (BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// six tests total. Targeting P7 BE.
// p7 (be) vars: li, addi, stxvw4x, rldic, addi, lhax/lhzx
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p8.c
index 9eabc5068d4..0db99933871 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p8.c
@@ -2,8 +2,8 @@
inputs produce the right results with a P8 (LE or BE) target. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// six tests total. Targeting P8, both LE and BE.
// p8 (le) variable offset: rldicl, subfic, sldi, mtvsrd, xxpermdi, vslo, mfvsrd, srdi, (1:extsh/2:rlwinm)
--git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p9.c
index 7e6c122fbfa..a3da81ff659 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-short.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code for a P9 target. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
// six tests total. Targeting P9.
// p9 (le) variable offset: slwi, vextuhlx, extsh
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-char-p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-char-p8.c
index 209f3c45a89..525807fc44e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-char-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-char-p8.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* The below contains vec_insert () calls with both variable and constant
values. Only the constant value calls are early-gimple folded, but all
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-char-p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-char-p9.c
index 7fdcad562c4..a7ad676f240 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-char-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-char-p9.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* The below contains vec_insert () calls with both variable and constant
values. Only the constant value calls are early-gimple folded, but all
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-double.c
index afd7f7e9924..d24b4dad19c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-double.c
@@ -2,8 +2,8 @@
double inputs produce the right codegen. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p8.c
index fef29c84190..01b1db3d577 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p8.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. Power8 variant. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p9.c
index c2eacc0cdbd..112b3c92899 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p9.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. Power9 variant. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-int-p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-int-p8.c
index 78e74ec9af3..7a36f77281e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-int-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-int-p8.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. Power8 variant. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-int-p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-int-p9.c
index 95c03edaa72..525d73aee99 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-int-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-int-p9.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. Power9 variant. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-longlong.c
index bf982b6a880..7ec8e569087 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-longlong.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-short-p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-short-p8.c
index 2ac72300148..2370138fece 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-short-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-short-p8.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. Power8 variant. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-short-p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-short-p9.c
index 10fb3c3497e..c5691945b7d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-short-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-short-p9.c
@@ -2,8 +2,8 @@
inputs produce the right codegen. Power9 variant. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-double.c
index 1577fb8603e..12f8db4e36d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-double.c
@@ -2,8 +2,8 @@
double inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-longlong.c
index d5dd84c4c39..3018d58dd75 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-misc.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-misc.c
index 4b86a81337c..acbe617ffa1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-misc.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-misc.c
@@ -11,8 +11,8 @@
*/
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -fdump-tree-gimple" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#include <stdio.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-char.c
index 9fc24f90cdd..360b361329a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-char.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xl with char
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-double.c
index 770bf367883..c499e80d796 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-double.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xl with double
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-float.c
index 9b35a442d49..357fdaef306 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-float.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xl with float
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-int.c
index 75903a918de..7007fa47fb3 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-int.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xl with int
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-longlong.c
index 204f73824b1..fa12daece78 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-longlong.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xl with long long
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-short.c
index 1be7765008b..71e8c310258 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-builtin_vec_xl-short.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xl with short
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-char.c
index 6aae43583f6..d35f6d266a3 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-char.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_ld with char
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-double.c
index b3f3b7fcd07..f49503cb1f0 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-double.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_ld with double
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-float.c
index 56cbe9ad102..baeea1798c1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-float.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_ld with float
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-int.c
index 2cde9f5b6dd..d4ebafb6f30 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-int.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_ld with int
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-longlong.c
index cf2b7f9b5bc..67fd101cd1d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-longlong.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_ld with long long
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-short.c
index cfc0e307d80..9322fe8dd36 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_vsx_ld-short.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_ld with short
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-char.c
index 7281b3cca7a..04542be6888 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-char.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xl with char
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-double.c
index 3f3d985c45b..e257b19b31d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-double.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xl with double
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-float.c
index eafe3053771..1a513d0993b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-float.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xl with float
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-int.c
index a2267218af9..17e312cc6c2 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-int.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xl with int
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-longlong.c
index f2e5469ab74..f004e9a4e41 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-longlong.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xl with long long
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-short.c
index 2d64b4f11d2..5bbded8862f 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-load-vec_xl-short.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xl with short
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, RETTYPE, VAR_OFFSET, LOADFROM) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-char.c
index d1f66f434ad..4ada00be556 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-char.c
@@ -2,8 +2,8 @@
* with char inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-int.c
index 59a23e89b48..96c922f70fb 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-int.c
@@ -2,8 +2,8 @@
* with int inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-longlong.c
index 76bece11a99..7ec1a4ad2ca 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-longlong.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-short.c
index 805d34561ba..3437531fea1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ands-short.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-char.c
index 75d913b3321..9427c1f75f1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-char.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-float.c
index edbf2d4ff37..6004015d945 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-float.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-floatdouble.c
index 7a1ff0b4ce1..db6e0e80431 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-floatdouble.c
@@ -2,9 +2,9 @@
double inputs for VSX produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-int.c
index ea0785277e5..3435e3a0e45 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-int.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-longlong.c
index 45673c10f60..bcf99696155 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-short.c
index 995c6cbcf7d..f6cf86a7e94 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-eqv-short.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-char.c
index 7406039d054..5876cd89075 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-char.c
@@ -2,8 +2,8 @@
* with char inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-int.c
index a7c6366b938..a5adb12f32d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-int.c
@@ -2,8 +2,8 @@
* with int inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-longlong.c
index d15ee5b02cf..60af61a7f16 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-longlong.c
@@ -2,9 +2,9 @@
* long long inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-short.c
index 8352a7f4dc5..bc3a64e555f 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-ors-short.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-char.c
index 62a084f34ea..ce46de4b667 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-char.c
@@ -3,9 +3,9 @@
* vec_nand) were added as part of ISA 2.07 (P8). */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-int.c
index 4dde6bc9f8a..1cdac54570d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-int.c
@@ -3,9 +3,9 @@
* vec_nand) were added as part of ISA 2.07 (P8). */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-longlong.c
index a8af3b059b9..fc7101a737d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-short.c
index dbb7884d6b7..f3934a71915 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-logical-other-short.c
@@ -3,9 +3,9 @@
* vec_nand) were added as part of ISA 2.07 (P8). */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-double.c
index 0fe78241294..7247636da1a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-double.c
@@ -2,8 +2,8 @@
double inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-float.c
index fcfe0c38656..35be9f68a03 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-float.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-floatdouble.c
index 4e4f4450b32..36a77b8b854 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-floatdouble.c
@@ -2,8 +2,8 @@
with float and double inputs produce the right codegen. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-int.c
index 815e466824a..00f5d6cf5de 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-int.c
@@ -2,8 +2,8 @@
with int inputs produce the right codegen. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-longlong.c
index c733522d8d0..c5e39690a1a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergeeo-longlong.c
@@ -2,8 +2,8 @@
with long long inputs produce the right codegen. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-double.c
index 14f944817bf..4b01749c46c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-double.c
@@ -2,8 +2,8 @@
double inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-longlong.c
index ad7e51b1253..ec3d10e1ec6 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-pixel.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-pixel.c
index 8c41bbfde2f..0c60c04d8d8 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-pixel.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-pixel.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-floatdouble.c
index 1185ce28f45..88ff50e6669 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-floatdouble.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-longlong.c
index af6ba51189a..31a71a0ea86 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-float.c
index 46afc685570..b4e60beebea 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-float.c
@@ -2,8 +2,8 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-floatdouble.c
index 59e936154e9..814a07e648c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-floatdouble.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int.c
index 49c28f032ce..32653d6d56a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int128-p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int128-p8.c
index b1250d59f4a..4f8ab5f1bd5 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int128-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int128-p8.c
@@ -2,11 +2,11 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
-/* { dg-require-effective-target lp64 } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
+/* { dg-require-effective-target lp64 } */
#include "altivec.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int128-p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int128-p9.c
index dc82b59238f..e48e553e364 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int128-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int128-p9.c
@@ -2,10 +2,10 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
#include "altivec.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-longlong.c
index 2d791838936..37b759de4a5 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-longlong.c
@@ -2,10 +2,10 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-char.c
index 8cb686bcb9d..1566dfe3fdb 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-char.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-floatdouble.c
index ad4b874be99..ead6050bfa8 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-floatdouble.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.c
index 35b211f914c..64f7ec3586d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.c
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p8.c
index 878cf794ad8..cdf45932827 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p8.c
@@ -2,8 +2,8 @@
inputs produce the right code when -mcpu=power8 is specified. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p9.c
index 7635d0adef1..7d958252445 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code when -mcpu=power9 is specified. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.h b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.h
index 2c9daa40619..4e8e2a8e8b4 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.h
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.h
@@ -4,9 +4,9 @@
/* vec_neg testcase, included by fold-vec-neg-longlong.p*.c */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.p8.c
index ceb28a75c83..6a49e1d029c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.p8.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-neg-longlong.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.p9.c
index 54b58372956..d206aab9cbb 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.p9.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "fold-vec-neg-longlong.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-short.c
index e777d358718..1040db7b984 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-short.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-double.c
index d5164f46a80..34ba192f9bc 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-double.c
@@ -2,9 +2,9 @@
double inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-longlong.c
index b5e8db2ec42..b0f6c503808 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-double.c
index c982bc2232f..3dc6fc2ae0b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-double.c
@@ -3,8 +3,8 @@
/* { dg-do compile } */
// vector double needs -mvsx.
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-longlong.c
index 3cc757da564..06d6c1b1150 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-longlong.c
@@ -3,8 +3,8 @@
/* { dg-do compile {target lp64} } */
// 'long long' in Altivec types is invalid without -mvsx.
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-select-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-select-double.c
index 14dcd1210d9..bdd068eec84 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-select-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-select-double.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-select-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-select-longlong.c
index 449c0f0fda8..c56bfb979d1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-select-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-select-longlong.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-longlong-fwrapv.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-longlong-fwrapv.c
index 72aa5f0cd95..44bbaa1b453 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-longlong-fwrapv.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-longlong-fwrapv.c
@@ -2,9 +2,9 @@
/* This test covers the shift left tests with the -fwrapv option. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -fwrapv" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-longlong.c
index 6afa91797fb..4406f82d14d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-longlong.c
@@ -2,9 +2,9 @@
* This is a counterpart to the fold-vec-shift-left-frwapv test. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-longlong.c
index 9403552d4da..fb626331be7 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-16.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-16.c
index bb4a8d2fa55..345e96caaf1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-16.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-floatdouble.c
index 01f1b0dadf3..965fceeb26a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-floatdouble.c
@@ -2,8 +2,8 @@
double inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-longlong.c
index 3fa1f05d6f5..fcf9561000e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-longlong.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-misc-invalid.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-misc-invalid.c
index 263a1723d31..029774be8e9 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-misc-invalid.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-misc-invalid.c
@@ -2,8 +2,8 @@
generate errors as expected when we attempt to use invalid inputs. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-pixel.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-pixel.c
index bb9b516fa5c..00d090f6f3c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-pixel.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-pixel.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-floatdouble.c
index 3c7cc7c9a67..71a989082e6 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-floatdouble.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-longlong.c
index 242565017fa..0e291b7267a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-longlong.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-double.c
index 100caf486c7..28a090ed8e5 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-double.c
@@ -2,8 +2,8 @@
double inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-longlong.c
index bc81123f4d5..92a86a347b4 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-pixel.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-pixel.c
index 5b95cc73d8d..029907daf1e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-pixel.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-pixel.c
@@ -2,8 +2,8 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-char.c
index 162563caed4..191b05759f7 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-char.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xst with char
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-double.c
index c42a720d361..f19daafa17c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-double.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xst with double
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-float.c
index b200c47fd2f..cf98b733524 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-float.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xst with float
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-int.c
index d9848820b3a..009f6086ca4 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-int.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xst with int
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-longlong.c
index 6df11514d51..1c75755ec85 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-longlong.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xst with long long
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-short.c
index f4dbb702583..5d8efdf2ad5 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-builtin_vec_xst-short.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for __builtin_vec_xst with short
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-char.c
index ae5cf8ef0b4..4406de613c7 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-char.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_st with char
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-double.c
index 1360f4d4ce9..ce5b9ac460b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-double.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_st with double
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-float.c
index 1b70f2a80f7..280cf817622 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-float.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_st with float
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-int.c
index 4e4a499eaad..d6d280883e2 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-int.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_st with int
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-longlong.c
index b57c126b9ab..3c2de0e8390 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-longlong.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_st with long long
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-short.c
index 7593f425258..5418451861a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_vsx_st-short.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_vsx_st with short
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-char.c
index fdd2ed5648d..6d43cd5ca16 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-char.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xst with char
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, VALUE, VAR_OFFSET, SAVETO) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-double.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-double.c
index 62f8552fdde..c3f6f85aca9 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-double.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xst with double
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, VALUE, VAR_OFFSET, SAVETO) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-float.c
index ad15a5a2b51..616f0baa60f 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-float.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xst with float
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, VALUE, VAR_OFFSET, SAVETO) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-int.c
index abe93dfb235..8a9ef2cacd2 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-int.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xst with int
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, VALUE, VAR_OFFSET, SAVETO) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-longlong.c
index 6859593bf0a..bd8d79480b3 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-longlong.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xst with long long
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, VALUE, VAR_OFFSET, SAVETO) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-short.c
index 6c54873db20..d47fc2aa09b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-store-vec_xst-short.c
@@ -1,8 +1,8 @@
/* Verify that overloaded built-ins for vec_xst with short
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
#define BUILD_VAR_TEST(TESTNAME1, VALUE, VAR_OFFSET, SAVETO) \
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-floatdouble.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-floatdouble.c
index 116f15e6688..dbc528a3a3a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-floatdouble.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-floatdouble.c
@@ -2,8 +2,8 @@
double inputs for VSX produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int128.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int128.c
index 2c7b454edba..a75a3a5a0fc 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int128.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int128.c
@@ -2,11 +2,11 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
/* { dg-options "-maltivec -mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
#include "altivec.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-longlong.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-longlong.c
index f38312cb6bb..c418ce10067 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-longlong.c
@@ -2,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-float.c
index 4e1d603a28f..ec8d12c97b7 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-float.c
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-int.c
index 17e4ad797be..40429f26626 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-int.c
@@ -2,9 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fusion.c b/gcc/testsuite/gcc.target/powerpc/fusion.c
index 2906f8a9159..d739e790e74 100644
--- a/gcc/testsuite/gcc.target/powerpc/fusion.c
+++ b/gcc/testsuite/gcc.target/powerpc/fusion.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3 -dp" } */
+/* { dg-require-effective-target powerpc_vsx } */
#define LARGE 0x12345
diff --git a/gcc/testsuite/gcc.target/powerpc/fusion2.c b/gcc/testsuite/gcc.target/powerpc/fusion2.c
index 925b6d83fd2..5641c7d2303 100644
--- a/gcc/testsuite/gcc.target/powerpc/fusion2.c
+++ b/gcc/testsuite/gcc.target/powerpc/fusion2.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
/* { dg-skip-if "" { powerpc*le-*-* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
vector double fusion_vector (vector double *p) { return p[2]; }
diff --git a/gcc/testsuite/gcc.target/powerpc/gnuattr1.c b/gcc/testsuite/gcc.target/powerpc/gnuattr1.c
index cf46777849a..6749a09c0c2 100644
--- a/gcc/testsuite/gcc.target/powerpc/gnuattr1.c
+++ b/gcc/testsuite/gcc.target/powerpc/gnuattr1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-linux-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx -mlong-double-64" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "gnu_attribute 4, 9" } } */
/* Check that if we can do the long double operation without doing an emulator
diff --git a/gcc/testsuite/gcc.target/powerpc/gnuattr2.c b/gcc/testsuite/gcc.target/powerpc/gnuattr2.c
index 70efb7b34c8..fd485a8d036 100644
--- a/gcc/testsuite/gcc.target/powerpc/gnuattr2.c
+++ b/gcc/testsuite/gcc.target/powerpc/gnuattr2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-linux-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx -mabi=ieeelongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "gnu_attribute 4, 13" } } */
/* Check that if we can do the long double operation without doing an emulator
diff --git a/gcc/testsuite/gcc.target/powerpc/gnuattr3.c b/gcc/testsuite/gcc.target/powerpc/gnuattr3.c
index bd5a64fe330..0ec1c6fa130 100644
--- a/gcc/testsuite/gcc.target/powerpc/gnuattr3.c
+++ b/gcc/testsuite/gcc.target/powerpc/gnuattr3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-linux-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx -mabi=ibmlongdouble -Wno-psabi" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "gnu_attribute 4, 5" } } */
/* Check that if we can do the long double operation without doing an emulator
diff --git a/gcc/testsuite/gcc.target/powerpc/mul-vectorize-1.c b/gcc/testsuite/gcc.target/powerpc/mul-vectorize-1.c
index bd9e1f9ee51..6f033014dc8 100644
--- a/gcc/testsuite/gcc.target/powerpc/mul-vectorize-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mul-vectorize-1.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fdump-tree-vect-details" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test vectorizer can exploit ISA 2.07 instruction vmuluwm (Vector Multiply
Unsigned Word Modulo) for both signed and unsigned word multiplication. */
diff --git a/gcc/testsuite/gcc.target/powerpc/mulkc3-2.c b/gcc/testsuite/gcc.target/powerpc/mulkc3-2.c
index 6c59a284a9f..9c5093b6a81 100644
--- a/gcc/testsuite/gcc.target/powerpc/mulkc3-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/mulkc3-2.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target longdouble128 } */
/* { dg-options "-O2 -mvsx -mabi=ieeelongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target longdouble128 } */
/* Check that complex multiply generates the right call when long double is
IEEE 128-bit floating point. */
diff --git a/gcc/testsuite/gcc.target/powerpc/mulkc3-3.c b/gcc/testsuite/gcc.target/powerpc/mulkc3-3.c
index 54671f813ef..b5827049cb0 100644
--- a/gcc/testsuite/gcc.target/powerpc/mulkc3-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/mulkc3-3.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target longdouble128 } */
/* { dg-options "-O2 -mvsx -mabi=ibmlongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target longdouble128 } */
/* Check that complex multiply generates the right call when long double is
IBM extended double floating point. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst-v2.c b/gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst-v2.c
index 7a624297ae9..53f00c3190a 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst-v2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst-v2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { le } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify fix for problem where vec_xl and vec_xst are not recognized
for the vector char and vector short cases on P8 only.
diff --git a/gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst.c b/gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst.c
index 46d5d6f6fe9..35011ef74ad 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { le } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify fix for problem where vec_xl and vec_xst are not recognized
for the vector char and vector short cases on P8 only. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-1.c b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-1.c
index 47a5f88c4ec..f67f77bf747 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef TYPE
#define TYPE long long
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-2.c b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-2.c
index d3aab195bef..faa511a7bb9 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-3.c b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-3.c
index ca354c54ed5..3da313d4332 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ftree-vectorize -fvect-cost-model=dynamic" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-4.c b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-4.c
index 074d23c5d91..d17af3e32c5 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ftree-vectorize -fvect-cost-model=dynamic" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-5.c b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-5.c
index 35b7e2a189f..f0521fc3d05 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-6.c b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-6.c
index 6a10054146a..6ebfa11c189 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-6.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
vector float dbl_to_float_p8 (double x) { return __builtin_vsx_xscvdpspn (x); }
double float_to_dbl_p8 (vector float x) { return __builtin_vsx_xscvspdpn (x); }
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-7.c b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-7.c
index 9f2d80cdef3..4db1294364e 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-7.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-8.c b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-8.c
index d8f23d1741d..eff18076ac5 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-8.c
@@ -1,8 +1,8 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-fp.c b/gcc/testsuite/gcc.target/powerpc/p8vector-fp.c
index d990691f499..402f09abbb0 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-fp.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-fp.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -fno-math-errno" } */
+/* { dg-require-effective-target powerpc_vsx } */
float abs_sf (float *p)
{
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-int128-1.c b/gcc/testsuite/gcc.target/powerpc/p8vector-int128-1.c
index c763187cda9..bd18094eae0 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-int128-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-int128-1.c
@@ -1,8 +1,8 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-ldst.c b/gcc/testsuite/gcc.target/powerpc/p8vector-ldst.c
index 6ac5d465438..09a436bc651 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-ldst.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-ldst.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
float
load_store_sf (unsigned long num,
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-vbpermq.c b/gcc/testsuite/gcc.target/powerpc/p8vector-vbpermq.c
index 486ae40cd93..3b5cc4faf03 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-vbpermq.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-vbpermq.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "vbpermq" } } */
/* { dg-final { scan-assembler "mfvsrd" } } */
/* { dg-final { scan-assembler-not "stfd" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-1.c b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-1.c
index a2dd1a4f55f..807806aa9e4 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef SIZE
#define SIZE 1024
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-2.c b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-2.c
index 46dc31807f8..6b5a74115dc 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stddef.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-3.c b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-3.c
index b464bdce246..a57f336c8d4 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stddef.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-4.c b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-4.c
index 1f2a0cd06ef..4cf3b88b388 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef SIZE
#define SIZE 1024
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-5.c b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-5.c
index 1d161968b14..f5c73f2825d 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-vectorize-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef SIZE
#define SIZE 1024
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-dimode1.c b/gcc/testsuite/gcc.target/powerpc/p9-dimode1.c
index 125252e7423..f1e0c8bdab4 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-dimode1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-dimode1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify P9 changes to allow DImode into Altivec registers, and generate
constants using XXSPLTIB. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-dimode2.c b/gcc/testsuite/gcc.target/powerpc/p9-dimode2.c
index d4392d4cf08..0cf97a8cdfe 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-dimode2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-dimode2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that large integer constants are loaded via direct move instead of
being loaded from memory. */
--git a/gcc/testsuite/gcc.target/powerpc/p9-extract-1.c b/gcc/testsuite/gcc.target/powerpc/p9-extract-1.c
index 5c0f00e4cd6..72539f385a4 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-extract-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-extract-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test to make sure VEXTU{B,H,W}{L,R}X is generated for various vector extract
operations for ISA 3.0 (-mcpu=power9). In addition, make sure that neither
--git a/gcc/testsuite/gcc.target/powerpc/p9-extract-2.c b/gcc/testsuite/gcc.target/powerpc/p9-extract-2.c
index 824665a20f6..81b072137e5 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-extract-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-extract-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/p9-extract-3.c b/gcc/testsuite/gcc.target/powerpc/p9-extract-3.c
index 1317c59e587..0b3ac5add85 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-extract-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-extract-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test that under ISA 3.0 (-mcpu=power9), the compiler optimizes conversion to
double after a vec_extract to use the VEXTRACTU{B,H} or XXEXTRACTUW
--git a/gcc/testsuite/gcc.target/powerpc/p9-extract-4.c b/gcc/testsuite/gcc.target/powerpc/p9-extract-4.c
index 8968696040e..9bdfd882aeb 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-extract-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-extract-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This file tests the extraction of 64-bit values. On Power 9, the direct
move is prefered for the 64-bit extract as it is either lower latency or
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-1.c b/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-1.c
index 19b2c0dc0a6..865d3c6754f 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
void sc (signed char *p, double x) { *p = x; }
void uc (unsigned char *p, double x) { *p = x; }
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-2.c b/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-2.c
index 2356815ad5e..25555f69cc9 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
double sc (signed char *p) { return (double)*p; }
double uc (unsigned char *p) { return (double)*p; }
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-3.c b/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-3.c
index fbb73a56535..a63ddfc0c2d 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-fpcvt-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Note that for unsigned cases, the differences from those ones in
p9-fpcvt-2.c is that they will be converted to int implicitly first
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-1.c b/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-1.c
index 936a0377b92..41c41c35765 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvx" } } */
/* { dg-final { scan-assembler "stxvx" } } */
/* { dg-final { scan-assembler-not "lxvd2x" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-2.c b/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-2.c
index b8e1e78623b..b99c248748d 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvx" } } */
/* { dg-final { scan-assembler "stvewx" } } */
/* { dg-final { scan-assembler-not "lxvd2x" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-3.c b/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-3.c
index 2d3f63f56eb..0994e6a8da8 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target ppc_float128_sw } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3 -mfloat128" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target ppc_float128_sw } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvx" } } */
/* { dg-final { scan-assembler "stxvx" } } */
/* { dg-final { scan-assembler-not "lxvd2x" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-minmax-1.c b/gcc/testsuite/gcc.target/powerpc/p9-minmax-1.c
index 616c2f01151..dcbfb4dc4f9 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-minmax-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-minmax-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mpower9-minmax -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "fsel" } } */
/* { dg-final { scan-assembler "xscmpeqdp" } } */
/* { dg-final { scan-assembler "xscmpgtdp" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-minmax-2.c b/gcc/testsuite/gcc.target/powerpc/p9-minmax-2.c
index 73ec1607a72..0684eb501c5 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-minmax-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-minmax-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mpower9-minmax" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "fsel" } } */
/* { dg-final { scan-assembler "xscmpeqdp" } } */
/* { dg-final { scan-assembler "xscmpgtdp" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-minmax-3.c b/gcc/testsuite/gcc.target/powerpc/p9-minmax-3.c
index c97eedecd4e..e4ae8e7bd4e 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-minmax-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-minmax-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mpower9-minmax" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "xsmaxcdp" } } */
/* { dg-final { scan-assembler-not "xsmincdp" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-permute.c b/gcc/testsuite/gcc.target/powerpc/p9-permute.c
index 9ac9493986f..10f6b17657c 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-permute.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-permute.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-splat-1.c b/gcc/testsuite/gcc.target/powerpc/p9-splat-1.c
index 72ff87c0249..9502384cce0 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-splat-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-splat-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-splat-2.c b/gcc/testsuite/gcc.target/powerpc/p9-splat-2.c
index 55492506d26..ec0cb92002e 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-splat-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-splat-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-splat-3.c b/gcc/testsuite/gcc.target/powerpc/p9-splat-3.c
index 8bd3fec0e85..49395e63b61 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-splat-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-splat-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-splat-4.c b/gcc/testsuite/gcc.target/powerpc/p9-splat-4.c
index 886a75c31c5..f29237bf388 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-splat-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-splat-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-splat-5.c b/gcc/testsuite/gcc.target/powerpc/p9-splat-5.c
index 3f9e729b8b9..ba588080c1c 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-splat-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-splat-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "vspltish" } } */
/* { dg-final { scan-assembler-not "xxspltib" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vbpermd.c b/gcc/testsuite/gcc.target/powerpc/p9-vbpermd.c
index 83606dda8c2..730923330de 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vbpermd.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vbpermd.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify P9 vector bit-permute doubleword instruction. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-1.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-1.c
index e28da9eaf9b..4f414ef73f4 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-1.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for that only vectorize the epilogue with vector access with length,
the main body still use normal vector load/store. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-2.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-2.c
index 499dcef34fd..b068c983695 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-2.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for that only vectorize the epilogue with vector access with length,
the main body still use normal vector load/store. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-3.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-3.c
index cf28122d56e..1947703898a 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-3.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for that only vectorize the epilogue with vector access with length,
the main body still use normal vector load/store. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-4.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-4.c
index 83c67ff4a0e..5a4cad3596a 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-4.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for that only vectorize the epilogue with vector access with length,
the main body still use normal vector load/store. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-5.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-5.c
index 0f31dcdda2b..e148771ed08 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-5.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for that only vectorize the epilogue with vector access with length,
the main body still use normal vector load/store. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-6.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-6.c
index ac4de8fad5d..40ab2201b2a 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-6.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for that only vectorize the epilogue with vector access with length,
the main body still use normal vector load/store. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-7.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-7.c
index 89f8d3476bb..9b0cc77e94e 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-7.c
@@ -1,9 +1,12 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* Pass cunroll isn't disabled by -fno-unroll-loops, so use explicit
disabling option for it. */
-/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -ffast-math -fdisable-tree-cunroll" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -ffast-math" } */
-/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
+/* { dg-additional-options "--param=vect-partial-vector-usage=1 -fdisable-tree-cunroll" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-8.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-8.c
index fbd1a353ade..34a2c8eb11b 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-epil-8.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for that only vectorize the epilogue with vector access with length,
the main body still use normal vector load/store. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-1.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-1.c
index a501873967f..d5f67082fa1 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-1.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for fully with length, the loop body uses vector access with length,
there should not be any epilogues. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-2.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-2.c
index d30feff9ff0..0799d21957f 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-2.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for fully with length, the loop body uses vector access with length,
there should not be any epilogues. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-3.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-3.c
index ecef0fd1393..bc8e6757a94 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-3.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for fully with length, the loop body uses vector access with length,
there should not be any epilogues. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-4.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-4.c
index 0c8f223f122..9d7711e61d4 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-4.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for fully with length, the loop body uses vector access with length,
there should not be any epilogues. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-5.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-5.c
index 0165eed62f9..90507150edc 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-5.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for fully with length, the loop body uses vector access with length,
there should not be any epilogues. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-6.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-6.c
index ff66a114195..889e770f6cd 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-6.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for fully with length, the loop body uses vector access with length,
there should not be any epilogues. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-7.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-7.c
index f5b2d1abe96..2b0ec7d095f 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-7.c
@@ -1,9 +1,12 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* Pass cunroll isn't disabled by -fno-unroll-loops, so use explicit
disabling option for it. */
-/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -ffast-math -fdisable-tree-cunroll" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -ffast-math" } */
-/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
+/* { dg-additional-options "--param=vect-partial-vector-usage=2 -fdisable-tree-cunroll" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-8.c b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-8.c
index daf62ac8f46..53fa8ebc3ff 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vec-length-full-8.c
@@ -1,10 +1,13 @@
-/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
/* { dg-additional-options "-mno-strict-align" { target opt_mstrict_align } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* Test for fully with length, the loop body uses vector access with length,
there should not be any epilogues. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vneg.c b/gcc/testsuite/gcc.target/powerpc/p9-vneg.c
index e07bc437e72..eed4886403d 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vneg.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vneg.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify P9 vector negate instructions. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vparity.c b/gcc/testsuite/gcc.target/powerpc/p9-vparity.c
index 978ddefaf92..784ad945650 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vparity.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vparity.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target lp64 } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target int128 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target int128 } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vpermr.c b/gcc/testsuite/gcc.target/powerpc/p9-vpermr.c
index 07c86e6264c..4580ebbf349 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-vpermr.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-vpermr.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test generation of VPERMR/XXPERMR on ISA 3.0 in little endian. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-xxbr-1.c b/gcc/testsuite/gcc.target/powerpc/p9-xxbr-1.c
index 956f6c10103..00776bd7190 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-xxbr-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-xxbr-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-xxbr-2.c b/gcc/testsuite/gcc.target/powerpc/p9-xxbr-2.c
index 7e89daafe5c..8afbacdf196 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-xxbr-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-xxbr-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-xxbr-3.c b/gcc/testsuite/gcc.target/powerpc/p9-xxbr-3.c
index efb9acf4fc1..90c44c7a4ca 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-xxbr-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-xxbr-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that the XXBR{H,W} instructions are generated if the value is
forced to be in a vector register, and XXBRD is generated all of the
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fma-1.c b/gcc/testsuite/gcc.target/powerpc/ppc-fma-1.c
index 2a5b92cf938..5c7bb376be3 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fma-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fma-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -ftree-vectorize -mdejagnu-cpu=power7 -ffast-math -fno-unroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "xvmadd" 4 } } */
/* { dg-final { scan-assembler-times "xsmadd\|fmadd\ " 2 } } */
/* { dg-final { scan-assembler-times "fmadds" 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fma-2.c b/gcc/testsuite/gcc.target/powerpc/ppc-fma-2.c
index bf2c67fb7f4..89f6a291e15 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fma-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fma-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -ftree-vectorize -mdejagnu-cpu=power7 -ffast-math -ffp-contract=off -fno-unroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "xvmadd" 2 } } */
/* { dg-final { scan-assembler-times "xsmadd\|fmadd\ " 1 } } */
/* { dg-final { scan-assembler-times "fmadds" 1 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr102767.f90 b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr102767.f90
index 6853cfee772..7d8c88fb4bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr102767.f90
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr102767.f90
@@ -1,5 +1,5 @@
-! { dg-require-effective-target powerpc_vsx_ok }
! { dg-options "-mvsx -O2 -ftree-vectorize -mno-efficient-unaligned-vsx" }
+! { dg-require-effective-target powerpc_vsx }
INTERFACE
FUNCTION elemental_mult (a, b, c)
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-1.c b/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-1.c
index 73b42913399..83ddd31d1bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mlfiwax\M|\mlxsiwax\M} 2 } } */
/* { dg-final { scan-assembler-times {\mlfiwzx\M|\mlxsiwzx\M} 2 } } */
/* { dg-final { scan-assembler-times {\mfcfids\M|\mxscvsxdsp\M} 3 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-10.c b/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-10.c
index bd9800755dd..5f1abb8a21f 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-10.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler {\mfriz\M|\mxsrdpiz\M} } } */
double round_double_llong (double a)
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-5.c b/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-5.c
index 70e37976d86..65389fe55fb 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mfctiwz\M|\mxscvdpsxws\M} 2 } } */
/* { dg-final { scan-assembler-times {\mfctiwuz\M|\mxscvdpuxws\M} 2 } } */
/* { dg-final { scan-assembler-times {\mfctidz\M|\mxscvdpsxds\M} 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-9.c b/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-9.c
index fe1ecb853df..754caba620b 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fpconv-9.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mfctidz\M|\mxscvdpsxds\M} 2 } } */
/* { dg-final { scan-assembler-not {\mlwz\M} } } */
/* { dg-final { scan-assembler-not {\mstw\M} } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-round.c b/gcc/testsuite/gcc.target/powerpc/ppc-round.c
index 266d711be07..d1b008ad325 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-round.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-round.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mstfiwx\M|\mstxsiwx\M} 4 } } */
/* { dg-final { scan-assembler-times {\mlfiwax\M|\mlxsiwax\M} 2 } } */
/* { dg-final { scan-assembler-times {\mlfiwzx\M|\mlxsiwzx\M} 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-round2.c b/gcc/testsuite/gcc.target/powerpc/ppc-round2.c
index c50f00825b0..f5ac3e435a3 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-round2.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-round2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "fcfid \|xscvsxddp " 2 } } */
/* { dg-final { scan-assembler-times "fcfids \|xscvsxdsp " 2 } } */
/* { dg-final { scan-assembler-times "fctiwz \|xscvdpsxws " 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-round3.c b/gcc/testsuite/gcc.target/powerpc/ppc-round3.c
index 873c90ae335..73a3825925b 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-round3.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-round3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "fcfid \|xscvsxddp " 2 } } */
/* { dg-final { scan-assembler-times "fcfids \|xscvsxdsp " 2 } } */
/* { dg-final { scan-assembler-times "fctiwz \|xscvdpsxws " 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr100866-1.c b/gcc/testsuite/gcc.target/powerpc/pr100866-1.c
index 856d7b7b93b..caef3721661 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr100866-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr100866-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not {\mxxlnor\M} } } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr100866-2.c b/gcc/testsuite/gcc.target/powerpc/pr100866-2.c
index 79193cfdd17..246553df7d4 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr100866-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr100866-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler {\mvspltish\M} } } */
/* { dg-final { scan-assembler {\mvrlh\M} } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr102868.c b/gcc/testsuite/gcc.target/powerpc/pr102868.c
index eb45d193f66..a5d93a2b147 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr102868.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr102868.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
vector float b = {0.0f, 0.0f, 0.0f, 0.0f};
diff --git a/gcc/testsuite/gcc.target/powerpc/pr103124.c b/gcc/testsuite/gcc.target/powerpc/pr103124.c
index c6942e4724e..1d2eb2a5cae 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr103124.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr103124.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
/* { dg-final { scan-assembler-not {\mmr\M} } } */
vector __int128 add (long long a)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr103605-1.c b/gcc/testsuite/gcc.target/powerpc/pr103605-1.c
index 3f253a4f67e..67a16b5513b 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr103605-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr103605-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mxsmaxdp\M} 3 } } */
/* { dg-final { scan-assembler-times {\mxsmindp\M} 3 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr103605-2.c b/gcc/testsuite/gcc.target/powerpc/pr103605-2.c
index 9e531e2f0e7..8812b243cd4 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr103605-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr103605-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mxsmaxcdp\M} 3 { target has_arch_pwr9 } } } */
/* { dg-final { scan-assembler-times {\mxsmincdp\M} 3 { target has_arch_pwr9 } } } */
/* { dg-final { scan-assembler-times {\mxsmaxdp\M} 3 { target { ! has_arch_pwr9 } } } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104015-1.c b/gcc/testsuite/gcc.target/powerpc/pr104015-1.c
index 272499cfa5c..2d31c922c8e 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr104015-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr104015-1.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* As PR104015, we don't expect vectorizer will re-try some vector modes
for epilogues on Power9, since Power9 doesn't support partial vector
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104124.c b/gcc/testsuite/gcc.target/powerpc/pr104124.c
index 7859ca2608c..75697641b96 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr104124.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr104124.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler {\mvspltisw\M} } } */
/* { dg-final { scan-assembler {\mvupkhsw\M} } } */
/* { dg-final { scan-assembler-not {\mlvx\M} } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104239-1.c b/gcc/testsuite/gcc.target/powerpc/pr104239-1.c
index 8c1862a329b..cd1dbdb4ee8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr104239-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr104239-1.c
@@ -1,7 +1,7 @@
/* PR target/104239 */
/* { dg-do compile } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -DNO_WARN_X86_INTRINSICS" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#if __has_include(<immintrin.h>)
#include <immintrin.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104239-2.c b/gcc/testsuite/gcc.target/powerpc/pr104239-2.c
index b021550a038..8bdd7634cc5 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr104239-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr104239-2.c
@@ -1,7 +1,7 @@
/* PR target/104239 */
/* { dg-do compile } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -DNO_WARN_X86_INTRINSICS" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#if __has_include(<x86gprintrin.h>)
#include <x86gprintrin.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104239-3.c b/gcc/testsuite/gcc.target/powerpc/pr104239-3.c
index 7436597f19b..5a452978086 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr104239-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr104239-3.c
@@ -1,7 +1,7 @@
/* PR target/104239 */
/* { dg-do compile } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -DNO_WARN_X86_INTRINSICS -std=c89" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104482.c b/gcc/testsuite/gcc.target/powerpc/pr104482.c
index 92191265e4c..bd078d9a68f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr104482.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr104482.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* It's to verify no ICE here, ignore error messages about
mismatch argument number since they are not test points
diff --git a/gcc/testsuite/gcc.target/powerpc/pr105271.c b/gcc/testsuite/gcc.target/powerpc/pr105271.c
index 1c5f88cadcf..44e75aed1d8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr105271.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr105271.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* It's to verify no ICE here, ignore error messages about
the required options for vec_neg here. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr106769-p8.c b/gcc/testsuite/gcc.target/powerpc/pr106769-p8.c
index 51e72477566..486641ca555 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr106769-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr106769-p8.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
#include "pr106769.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/pr106769-p9.c b/gcc/testsuite/gcc.target/powerpc/pr106769-p9.c
index b602e7d5768..cb446b3d972 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr106769-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr106769-p9.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
#include "pr106769.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/pr107412.c b/gcc/testsuite/gcc.target/powerpc/pr107412.c
index 9e21f96be59..c94a998f1d5 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr107412.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr107412.c
@@ -1,6 +1,6 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target lp64 } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -funroll-loops -fno-tree-loop-distribute-patterns --param vect-partial-vector-usage=2 -fdump-tree-optimized" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target lp64 } */
/* Verify there is only one IFN call LEN_LOAD and IFN_STORE separately. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr108396.c b/gcc/testsuite/gcc.target/powerpc/pr108396.c
index 262a4468675..c3535008c59 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr108396.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr108396.c
@@ -1,6 +1,6 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
/* Verify there is no error message. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr109069-2.c b/gcc/testsuite/gcc.target/powerpc/pr109069-2.c
index e71bbeb5df5..edd579a2379 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr109069-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr109069-2.c
@@ -1,8 +1,8 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* Disable rs6000 optimize_swaps as it drops some REG_EQUAL
notes on const vector and affects test point here. */
/* { dg-options "-O2 -mvsx -mno-optimize-swaps" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify we can optimize away vector shifting if every byte
of vector is the same. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr109082.c b/gcc/testsuite/gcc.target/powerpc/pr109082.c
index ffa1c099eed..30cdcb12c53 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr109082.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr109082.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify there is no warning message. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr110429.c b/gcc/testsuite/gcc.target/powerpc/pr110429.c
index b9241ed7d14..91f5c891dcf 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr110429.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr110429.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-require-effective-target has_arch_ppc64 } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr111449-1.c b/gcc/testsuite/gcc.target/powerpc/pr111449-1.c
index ce97e4f7dfb..e65794c7ae7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr111449-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr111449-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Ensure vector mode is used for 16-byte by pieces equality compare. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr111449-2.c b/gcc/testsuite/gcc.target/powerpc/pr111449-2.c
index 49871cab899..3859702fce8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr111449-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr111449-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { has_arch_pwr8 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Ensure 16-byte by pieces move is enabled. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr113950.c b/gcc/testsuite/gcc.target/powerpc/pr113950.c
index 359963d1041..a7c1921322a 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr113950.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr113950.c
@@ -1,6 +1,6 @@
/* PR target/113950 */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify we do not ICE on the following. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr42747.c b/gcc/testsuite/gcc.target/powerpc/pr42747.c
index af3065f00ca..4f774db07d6 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr42747.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr42747.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
double foo (double x) { return __builtin_sqrt (x); }
diff --git a/gcc/testsuite/gcc.target/powerpc/pr43154.c b/gcc/testsuite/gcc.target/powerpc/pr43154.c
index 770a821af39..f1a69c48e9c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr43154.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr43154.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
/* { dg-skip-if "" { powerpc*le-*-* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Make sure that vec_mergel and vec_mergeh are supported for V2DF/V2DI types. */
/* { dg-final { scan-assembler-times "xxpermdi" 4 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr47755.c b/gcc/testsuite/gcc.target/powerpc/pr47755.c
index b705f71b73e..883dc4531a0 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr47755.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr47755.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "xxlxor\|vspltis\[bhw\]" } } */
/* { dg-final { scan-assembler-not "lxvd2x" } } */
/* { dg-final { scan-assembler-not "lxvw4x" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr47862.c b/gcc/testsuite/gcc.target/powerpc/pr47862.c
index 9c504047c99..fecd290ac06 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr47862.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr47862.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "stfd" } } */
/* PR 47862: Verify caller-save spill of vectors in FP regs do not use
diff --git a/gcc/testsuite/gcc.target/powerpc/pr48053-1.c b/gcc/testsuite/gcc.target/powerpc/pr48053-1.c
index 91c477c68e4..4e4552aeeed 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr48053-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr48053-1.c
@@ -1,7 +1,7 @@
/* Test for ICE arising from VSX code generation. */
/* { dg-do compile } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -funroll-loops" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
int sourcenode;
int ARCHelems;
diff --git a/gcc/testsuite/gcc.target/powerpc/pr48053-2.c b/gcc/testsuite/gcc.target/powerpc/pr48053-2.c
index a6ab2f50a58..5df62f9c05c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr48053-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr48053-2.c
@@ -1,7 +1,7 @@
/* Test for ICE arising from VSX code generation. */
/* { dg-do compile } */
/* { dg-options "-O3 -mdejagnu-cpu=power7" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
struct timeval
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr48053-3.c b/gcc/testsuite/gcc.target/powerpc/pr48053-3.c
index ddee8ab11ff..f9ae1042005 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr48053-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr48053-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Cut down example from s_scalbnl that aborted on 32-bit when the fix for
48053 went in to allow creating DImode 0's in VSX registers. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr48192.c b/gcc/testsuite/gcc.target/powerpc/pr48192.c
index 4ec11c3e230..d03a82887be 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr48192.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr48192.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -std=gnu89" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Make sure that the conditional macros vector, bool, and pixel are not
considered as being defined. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr48226.c b/gcc/testsuite/gcc.target/powerpc/pr48226.c
index b0d1541621a..eabfbc4e485 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr48226.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr48226.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* The bug shows up if you compile with -maltivec or -mcpu=power7, due to one
of the vector's being eliminated due to rs6000_macro_to_expand being called
diff --git a/gcc/testsuite/gcc.target/powerpc/pr48258-1.c b/gcc/testsuite/gcc.target/powerpc/pr48258-1.c
index eecf135b5bf..7ab0ffc4095 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr48258-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr48258-1.c
@@ -1,8 +1,8 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
/* { dg-skip-if "" { powerpc*le-*-* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -mabi=altivec -ffast-math -fno-unroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "xvaddsp" 3 } } */
/* { dg-final { scan-assembler-times "xvminsp" 3 } } */
/* { dg-final { scan-assembler-times "xvmaxsp" 3 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr48258-2.c b/gcc/testsuite/gcc.target/powerpc/pr48258-2.c
index 5604fe6716c..ddfa9d7d654 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr48258-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr48258-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -mabi=altivec -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "xvadddp" } } */
/* { dg-final { scan-assembler "xvmindp" } } */
/* { dg-final { scan-assembler "xvmaxdp" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr48857.c b/gcc/testsuite/gcc.target/powerpc/pr48857.c
index 6cab64cdf93..a1f6a404dfd 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr48857.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr48857.c
@@ -3,8 +3,8 @@
little-endian targets. */
/* { dg-do compile { target { powerpc64le-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7 -mabi=altivec" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "lvx" 1 } } */
/* { dg-final { scan-assembler-times "stvx" 1 } } */
/* { dg-final { scan-assembler-not "ld" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr52199.c b/gcc/testsuite/gcc.target/powerpc/pr52199.c
index 773d64d08ab..bd4ecd09c34 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr52199.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr52199.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -fmerge-all-constants" } */
+/* { dg-require-effective-target powerpc_vsx } */
struct locale_time_t
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr53487.c b/gcc/testsuite/gcc.target/powerpc/pr53487.c
index e8781f9716b..52415be774f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr53487.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr53487.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -misel -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
struct phylo_s {
int left;
diff --git a/gcc/testsuite/gcc.target/powerpc/pr56605.c b/gcc/testsuite/gcc.target/powerpc/pr56605.c
index 651a88e3cc7..1909821347d 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr56605.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr56605.c
@@ -1,8 +1,8 @@
/* PR rtl-optimization/56605 */
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mvsx -mdejagnu-cpu=power7 -fno-unroll-loops -fdump-rtl-combine" } */
+/* { dg-require-effective-target powerpc_vsx } */
void foo (short* __restrict sb, int* __restrict ia)
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr57150.c b/gcc/testsuite/gcc.target/powerpc/pr57150.c
index 65ae5ad8855..3a1620e9220 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr57150.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr57150.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target longdouble128 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -fcaller-saves" } */
+/* { dg-require-effective-target longdouble128 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "lxvd2x" } } */
/* { dg-final { scan-assembler-not "lxvw4x" } } */
/* { dg-final { scan-assembler-not "lvx" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr58673-1.c b/gcc/testsuite/gcc.target/powerpc/pr58673-1.c
index 9ebe3c579d6..8e04dfa997a 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr58673-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr58673-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
enum typecode
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr58673-2.c b/gcc/testsuite/gcc.target/powerpc/pr58673-2.c
index d59cc217bb5..349bf98b03a 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr58673-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr58673-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -funroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stddef.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr59054.c b/gcc/testsuite/gcc.target/powerpc/pr59054.c
index 376dcafb488..5d82cb17f27 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr59054.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr59054.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O0" } */
+/* { dg-require-effective-target powerpc_vsx } */
long foo (void) { return 0; }
diff --git a/gcc/testsuite/gcc.target/powerpc/pr60203.c b/gcc/testsuite/gcc.target/powerpc/pr60203.c
index 56b676fde9b..5a129f59c97 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr60203.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr60203.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target longdouble128 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target longdouble128 } */
+/* { dg-require-effective-target powerpc_vsx } */
#if defined(__LONG_DOUBLE_IEEE128__)
/* If long double is IEEE 128-bit, we need to use the __ibm128 type instead of
diff --git a/gcc/testsuite/gcc.target/powerpc/pr60676.c b/gcc/testsuite/gcc.target/powerpc/pr60676.c
index 3b54bd0b5a8..50738335fa7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr60676.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr60676.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "xxsldwi" } } */
/* { dg-final { scan-assembler "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr64019.c b/gcc/testsuite/gcc.target/powerpc/pr64019.c
index c8f18a5691f..46a5e5cb02f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr64019.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr64019.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -ffast-math -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <math.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr66144-1.c b/gcc/testsuite/gcc.target/powerpc/pr66144-1.c
index 4fd5fc5ce6c..fe261539b6a 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr66144-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr66144-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that we optimize vector1 = (vector2 == vector3) by not loading up
0/-1. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr66144-2.c b/gcc/testsuite/gcc.target/powerpc/pr66144-2.c
index 6b12f25fd22..6687a66dd17 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr66144-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr66144-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that we optimize vector1 = (vector2 != vector3) by not loading up
0/-1. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr66144-3.c b/gcc/testsuite/gcc.target/powerpc/pr66144-3.c
index 46bf2e3fc8d..4c93b2a7a3d 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr66144-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr66144-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that we can optimize a vector conditional move, where one of the arms
is all 1's into using the mask as one of the inputs to XXSEL. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr67808.c b/gcc/testsuite/gcc.target/powerpc/pr67808.c
index 44d094fdede..4ddadb71946 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr67808.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr67808.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O1 -mvsx -mdejagnu-cpu=power7 -mlong-double-128" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR 67808: LRA ICEs on simple double to long double conversion test case */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr68163.c b/gcc/testsuite/gcc.target/powerpc/pr68163.c
index 736fad172eb..6b44984ab52 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr68163.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr68163.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Make sure that the register allocator does not move SF values to GPR
registers in order to do an offsettable store. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70243.c b/gcc/testsuite/gcc.target/powerpc/pr70243.c
index 18a5ce78792..11525186ef0 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr70243.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr70243.c
@@ -1,6 +1,6 @@
/* { dg-do compile */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR 70423, Make sure we don't generate vmaddfp or vnmsubfp. These
instructions have different rounding modes than the VSX instructions
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70669.c b/gcc/testsuite/gcc.target/powerpc/pr70669.c
index 3082e292607..96dc13db38c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr70669.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr70669.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef TYPE
#define TYPE __float128
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71186.c b/gcc/testsuite/gcc.target/powerpc/pr71186.c
index acc354ff2d9..6a78fbff743 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71186.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71186.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
static unsigned short x[(16384/sizeof(unsigned short))] __attribute__ ((aligned (16)));
static unsigned short y[(16384/sizeof(unsigned short))] __attribute__ ((aligned (16)));
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71309.c b/gcc/testsuite/gcc.target/powerpc/pr71309.c
index 97489ad67ad..e1cdf9180f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71309.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71309.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target lp64 } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target lp64 } */
#define TYPE void*
#define TYPE2 void*
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71656-1.c b/gcc/testsuite/gcc.target/powerpc/pr71656-1.c
index 7009d990042..c961b5adb37 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71656-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71656-1.c
@@ -1,8 +1,8 @@
/* Test for reload ICE arising from POWER9 Vector Dform code generation. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O1 -mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
typedef __attribute__((altivec(vector__))) int type_t;
type_t
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71656-2.c b/gcc/testsuite/gcc.target/powerpc/pr71656-2.c
index 9ec1fca7aaf..caf91a734be 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71656-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71656-2.c
@@ -1,8 +1,8 @@
/* Test for reload ICE arising from POWER9 Vector Dform code generation. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mvsx -funroll-loops -fno-aggressive-loop-optimizations" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
typedef double vec[3];
struct vec_t
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71670.c b/gcc/testsuite/gcc.target/powerpc/pr71670.c
index f6a38ebbe14..7cdb4adf023 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71670.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71670.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
volatile int a;
int b;
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71680.c b/gcc/testsuite/gcc.target/powerpc/pr71680.c
index ce54b9cccf3..94d1e10bf71 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71680.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71680.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#pragma pack(1)
struct
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71698.c b/gcc/testsuite/gcc.target/powerpc/pr71698.c
index a34c410005e..b51f8f43c9a 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71698.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71698.c
@@ -1,8 +1,8 @@
/* Test for a reload ICE arising from trying to direct move a TDmode value. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target dfp } */
/* { dg-options "-O1 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target dfp } */
extern void testvad128 (int n, ...);
void
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71720.c b/gcc/testsuite/gcc.target/powerpc/pr71720.c
index 236faa6a009..76ed5ed2ad9 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71720.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71720.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that we generate xxspltw <reg>,<reg>,0 for V4SFmode splat. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71763.c b/gcc/testsuite/gcc.target/powerpc/pr71763.c
index b8888394393..f020caba302 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71763.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71763.c
@@ -1,7 +1,7 @@
// PR target/71763
// { dg-do compile }
-// { dg-require-effective-target powerpc_vsx_ok }
// { dg-options "-O1 -mvsx" }
+// { dg-require-effective-target powerpc_vsx }
int a, b;
float c;
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71977-1.c b/gcc/testsuite/gcc.target/powerpc/pr71977-1.c
index ca60f204a0c..6ca63679a6f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71977-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71977-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71977-2.c b/gcc/testsuite/gcc.target/powerpc/pr71977-2.c
index 85b7a2292d1..7e3d6848b90 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71977-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71977-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr72717.c b/gcc/testsuite/gcc.target/powerpc/pr72717.c
index d9bea5a5636..aa4810f5b7b 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr72717.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr72717.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
typedef long V __attribute__((__vector_size__(32)));
diff --git a/gcc/testsuite/gcc.target/powerpc/pr72804.c b/gcc/testsuite/gcc.target/powerpc/pr72804.c
index 38dff549210..23f3aa8c230 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr72804.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr72804.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
__int128_t
foo (__int128_t *src)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr72853.c b/gcc/testsuite/gcc.target/powerpc/pr72853.c
index de69bd9ecc0..04afa7d9c80 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr72853.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr72853.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3 -funroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* derived from 20021120-1.c, compiled for -mcpu=power9. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr77289.c b/gcc/testsuite/gcc.target/powerpc/pr77289.c
index a8308b01057..29da79f4058 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr77289.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr77289.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7 -funroll-loops -ffast-math -mupdate -fno-auto-inc-dec" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR 77289: LRA ICEs due to invalid constraint checking. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78056-1.c b/gcc/testsuite/gcc.target/powerpc/pr78056-1.c
index 1af42296306..72640007dbb 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78056-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78056-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78056-3.c b/gcc/testsuite/gcc.target/powerpc/pr78056-3.c
index 545e93b3a70..cf57d058e8b 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78056-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78056-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* { dg-options "-mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78102.c b/gcc/testsuite/gcc.target/powerpc/pr78102.c
index 7ae0d02b835..d0237e661fe 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78102.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78102.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -DNO_WARN_X86_INTRINSICS" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78543.c b/gcc/testsuite/gcc.target/powerpc/pr78543.c
index 9c5454df47e..22792087ff1 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78543.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78543.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
typedef long a;
enum c { e, f, g, h, i, ab } j();
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78604.c b/gcc/testsuite/gcc.target/powerpc/pr78604.c
index f6ac7f15985..6aa1be71f57 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78604.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78604.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fdump-tree-vect-details -fno-unroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef SIZE
#define SIZE 1024
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78658.c b/gcc/testsuite/gcc.target/powerpc/pr78658.c
index 228736afcb2..afcf09464f5 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78658.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78658.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This caused an unrecognizable insn message on development versions of GCC 7. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78953.c b/gcc/testsuite/gcc.target/powerpc/pr78953.c
index a1b66cbd94a..f785dba7a37 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78953.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78953.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79004.c b/gcc/testsuite/gcc.target/powerpc/pr79004.c
index caf1f6c1eef..ac89a4c9f32 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79004.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79004.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <math.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79038-1.c b/gcc/testsuite/gcc.target/powerpc/pr79038-1.c
index fdf0c1a26d3..7c5500716b7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79038-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79038-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx } */
#ifndef TYPE
#define TYPE _Float128
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79179.c b/gcc/testsuite/gcc.target/powerpc/pr79179.c
index f2f48c4e73f..c9b60ae7425 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79179.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79179.c
@@ -1,6 +1,6 @@
/* { dg-do assemble { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* Compile with -O3 -mcpu=power9. It originally generated
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79251.p7.c b/gcc/testsuite/gcc.target/powerpc/pr79251.p7.c
index 25e227a8036..f3c8add78fb 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79251.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79251.p7.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power7 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stddef.h>
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79251.p8.c b/gcc/testsuite/gcc.target/powerpc/pr79251.p8.c
index 7d83e72a7b7..d163cac0ca2 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79251.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79251.p8.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stddef.h>
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79251.p9.c b/gcc/testsuite/gcc.target/powerpc/pr79251.p9.c
index 8ce6858e6ce..d7fce16ca27 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79251.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79251.p9.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stddef.h>
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79354.c b/gcc/testsuite/gcc.target/powerpc/pr79354.c
index cdb2c363fae..b8416f11b87 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79354.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79354.c
@@ -1,7 +1,7 @@
/* PR target/79354 */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not {\mstxssp\M} } } */
int b, f, g;
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79544.c b/gcc/testsuite/gcc.target/powerpc/pr79544.c
index 172b9511675..31f2d2b5b00 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79544.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79544.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79799-1.c b/gcc/testsuite/gcc.target/powerpc/pr79799-1.c
index a8d8d1df28d..e0f72b61e97 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79799-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79799-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79799-2.c b/gcc/testsuite/gcc.target/powerpc/pr79799-2.c
index fe27e5c0da2..96a01d0cafe 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79799-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79799-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79799-3.c b/gcc/testsuite/gcc.target/powerpc/pr79799-3.c
index 542601629ad..6b1005bc2f1 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79799-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79799-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79799-5.c b/gcc/testsuite/gcc.target/powerpc/pr79799-5.c
index 037bfc0895f..af89ffb2be6 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79799-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79799-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79907.c b/gcc/testsuite/gcc.target/powerpc/pr79907.c
index 9597201fe9f..b090a9fab49 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79907.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79907.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
int foo (short a[], int x)
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79951.c b/gcc/testsuite/gcc.target/powerpc/pr79951.c
index 796fa7cbbbc..dcc8e0644ef 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79951.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79951.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -S -mno-cmpb" } */
+/* { dg-require-effective-target powerpc_vsx } */
float testf (float x, float y)
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-1.c b/gcc/testsuite/gcc.target/powerpc/pr80315-1.c
index b846e19a471..63e9b9ed0a7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80315-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80315-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
int
main()
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-2.c b/gcc/testsuite/gcc.target/powerpc/pr80315-2.c
index 64b06283700..b08f1ee79c1 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80315-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80315-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
int
main ()
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-3.c b/gcc/testsuite/gcc.target/powerpc/pr80315-3.c
index 2c335e76605..ba5c3867782 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80315-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80315-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-4.c b/gcc/testsuite/gcc.target/powerpc/pr80315-4.c
index c003c9ba799..8e874b7cb52 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80315-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80315-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80510-1.c b/gcc/testsuite/gcc.target/powerpc/pr80510-1.c
index d3b4c07505e..33318336fb4 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80510-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80510-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Make sure that STXSDX is generated for double scalars in Altivec registers
on power7 instead of moving the value to a FPR register and doing a X-FORM
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80510-2.c b/gcc/testsuite/gcc.target/powerpc/pr80510-2.c
index 627e52412d5..45993aba57a 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80510-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80510-2.c
@@ -1,9 +1,9 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* Now O2 enables vectorization by default, which generates unexpected VSR
to GPR movement for vector construction, so simply disable it. */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -fno-tree-vectorize" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Make sure that STXSSPX is generated for float scalars in Altivec registers
on power7 instead of moving the value to a FPR register and doing a X-FORM
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80695-p8.c b/gcc/testsuite/gcc.target/powerpc/pr80695-p8.c
index 7d2d81804c7..b2264b9c093 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80695-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80695-p8.c
@@ -1,6 +1,8 @@
-/* { dg-do compile { target { powerpc_vsx_ok } } } */
-/* { dg-require-effective-target vect_int } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -fdump-tree-slp-details" } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-require-effective-target powerpc_vsx } */
+
/* PR80695: Verify cost model for vec_construct on POWER8. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80695-p9.c b/gcc/testsuite/gcc.target/powerpc/pr80695-p9.c
index f35e45beb4a..231cfba67f9 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80695-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80695-p9.c
@@ -1,6 +1,7 @@
-/* { dg-do compile { target { powerpc_vsx_ok } } } */
-/* { dg-require-effective-target vect_int } */
+/* { dg-do compile } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3 -fdump-tree-slp-details" } */
+/* { dg-require-effective-target vect_int } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR80695: Verify cost model for vec_construct on POWER9. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80718.c b/gcc/testsuite/gcc.target/powerpc/pr80718.c
index 8ef2e80392d..96fb8ec5905 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80718.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80718.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Taken from the Spec 2006 milc brenchmark. Ultimately, GCC wants to generate
a DF splat from offsettable memory. The register allocator decided it was
diff --git a/gcc/testsuite/gcc.target/powerpc/pr81348.c b/gcc/testsuite/gcc.target/powerpc/pr81348.c
index c275d5b0c10..d5501198fa6 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr81348.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr81348.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -Og" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR target/81348: Compiler died in doing short->float conversion due to using
the wrong register in a define_split. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr81622.c b/gcc/testsuite/gcc.target/powerpc/pr81622.c
index 4cd4528e620..8f48991f7f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr81622.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr81622.c
@@ -1,7 +1,7 @@
/* PR target/81622 */
/* { dg-do compile { target { powerpc*-*-linux* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
void
foo (void)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr81959.c b/gcc/testsuite/gcc.target/powerpc/pr81959.c
index 31d2163df83..0ad637eb3c9 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr81959.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr81959.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mfloat128" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR 81959, the compiler raised on unrecognizable insn message in converting
int to __float128, where the int had a PRE_INC in the address. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr82015.c b/gcc/testsuite/gcc.target/powerpc/pr82015.c
index 40f1c7d2a5c..76b65095193 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr82015.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr82015.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
unsigned long foo_11(__vector __int128_t *p)
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr82748-1.c b/gcc/testsuite/gcc.target/powerpc/pr82748-1.c
index fe053d9cc20..626e5c5ffc8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr82748-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr82748-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mabi=ieeelongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Make sure the old 'q' builtin functions work correctly when the long double
default has been changed to be IEEE 128-bit floating point. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr82748-2.c b/gcc/testsuite/gcc.target/powerpc/pr82748-2.c
index fb8e9a5330c..46713ea7a56 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr82748-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr82748-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mabi=ibmlongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Make sure the old 'q' builtin functions work correctly when the long double
default uses the IBM double-double format. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr83399.c b/gcc/testsuite/gcc.target/powerpc/pr83399.c
index cc0d6575916..26c306e5e88 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr83399.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr83399.c
@@ -1,7 +1,7 @@
/* PR target/83399 */
/* { dg-do compile { target { powerpc*-*-linux* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O1 -mabi=elfv2 -mlittle -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
typedef __attribute__((altivec(vector__))) int v4si_t;
int
diff --git a/gcc/testsuite/gcc.target/powerpc/pr83862.c b/gcc/testsuite/gcc.target/powerpc/pr83862.c
index e605194b528..df0f61441db 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr83862.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr83862.c
@@ -1,9 +1,9 @@
/* PR target/83862.c */
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target ppc_float128_sw } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mabi=ieeelongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target ppc_float128_sw } */
+/* { dg-require-effective-target powerpc_vsx } */
/* On little endian systems, optimizing signbit of IEEE 128-bit values from
memory could abort if the memory address was indexed (reg+reg). The
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84154-1.c b/gcc/testsuite/gcc.target/powerpc/pr84154-1.c
index 286b885fef6..ff51e8a4be5 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84154-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84154-1.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR target/84154. Make sure conversion to char/short does not generate a
store and a load on ISA 2.07 and newer systems. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84154-2.c b/gcc/testsuite/gcc.target/powerpc/pr84154-2.c
index 64b355f51b1..0d4424899db 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84154-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84154-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR target/84154. Make sure on ISA 2.07 (power8) that we store the result of
a conversion to char/short using an offsettable address does not generate
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84154-3.c b/gcc/testsuite/gcc.target/powerpc/pr84154-3.c
index 3bb663e71bb..10acad93f53 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84154-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84154-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR target/84154. Make sure on ISA 3.0 we store the result of a conversion
to char/short using an offsettable address does not generate direct moves
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84220-sld2.c b/gcc/testsuite/gcc.target/powerpc/pr84220-sld2.c
index 9f319864fdb..c99eeb2ee7f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84220-sld2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84220-sld2.c
@@ -2,9 +2,9 @@
/* Test to ensure we generate invalid parameter errors rather than an ICE
when calling builtin_vec_sld() with invalid parameters. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84220-sldw.c b/gcc/testsuite/gcc.target/powerpc/pr84220-sldw.c
index a3b4be6686b..ae2a7d35a96 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84220-sldw.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84220-sldw.c
@@ -2,8 +2,8 @@
/* Test to ensure we generate invalid parameter errors rather than an ICE
when calling builtin_vec_sldw() with invalid parameters. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84220-xxperm.c b/gcc/testsuite/gcc.target/powerpc/pr84220-xxperm.c
index 8a802eb337e..4018daf7665 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84220-xxperm.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84220-xxperm.c
@@ -2,8 +2,8 @@
/* Test to ensure we generate invalid parameter errors rather than an ICE
when calling vec_xxpermdi() with invalid parameters. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
void abort (void);
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84220-xxsld.c b/gcc/testsuite/gcc.target/powerpc/pr84220-xxsld.c
index 0ef565a9a6c..84381f93fe4 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84220-xxsld.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84220-xxsld.c
@@ -3,8 +3,8 @@
when calling vec_xxsldwi() and vec_xxpermdi() with invalid parameters. */
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84226.c b/gcc/testsuite/gcc.target/powerpc/pr84226.c
index e3e771f2816..6697e72d915 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84226.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84226.c
@@ -1,6 +1,6 @@
/* PR target/84226 */
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -mpower9-misc -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include "builtins-revb-runnable.c"
diff --git a/gcc/testsuite/gcc.target/powerpc/pr85456.c b/gcc/testsuite/gcc.target/powerpc/pr85456.c
index 7fb7a7a87a6..b2c4c6af74c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr85456.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr85456.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target longdouble128 } */
/* { dg-options "-O2 -mvsx -mabi=ieeelongdouble -Wno-psabi" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target longdouble128 } */
/* Check that the __builtin_powil generates a call to the correct function
when long double uses IEEE 128-bit floating point. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
index ea759d54bf6..e13ca382289 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
@@ -6,10 +6,10 @@
/* specify -mcpu=power8 -mvsx, which provides vec_sl(long long,...) support. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target lp64 } */
/* { dg-options "-maltivec -O3 -fwrapv -mvsx " } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target lp64 } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c b/gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c
index 8a7a9ce7753..c97cb49de8c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c
@@ -2,10 +2,10 @@
left shift properly. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target lp64 } */
/* { dg-options "-maltivec -O3 -mvsx " } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target lp64 } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr88309.c b/gcc/testsuite/gcc.target/powerpc/pr88309.c
index c0078cf2b8c..958fda7cce5 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr88309.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr88309.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -fprefetch-loop-arrays" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify there is no ICE or hanging. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c b/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c
index c1fe3e04bfb..1612d02ab31 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -fno-math-errno -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* -fno-math-errno is required to make {i,l,ll}rint{,f} inlined */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr88845.c b/gcc/testsuite/gcc.target/powerpc/pr88845.c
index 002690a1be1..a75b4d39dea 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr88845.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr88845.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target powerpc*-*-linux* } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler {\mmtvsrd\M} { target { lp64 } } } } */
/* { dg-final { scan-assembler {\mxscvspdpn\M} { target { lp64 } } } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr88965.c b/gcc/testsuite/gcc.target/powerpc/pr88965.c
index e5ea0fab125..47be152c095 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr88965.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr88965.c
@@ -1,7 +1,7 @@
/* PR target/88965 */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
unsigned int a[16];
unsigned int __attribute__ ((vector_size (16))) b;
diff --git a/gcc/testsuite/gcc.target/powerpc/pr90763.c b/gcc/testsuite/gcc.target/powerpc/pr90763.c
index 0094b4ef70c..783a023ba26 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr90763.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr90763.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target int128 } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target int128 } */
/* PR90763: PowerPC vec_xl_len should take const.
*/
diff --git a/gcc/testsuite/gcc.target/powerpc/pr91903.c b/gcc/testsuite/gcc.target/powerpc/pr91903.c
index b304a9e2f7f..d70a0c66469 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr91903.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr91903.c
@@ -1,6 +1,6 @@
/* { dg-do compile */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stdlib.h>
#include <stdio.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr92398.p9+.c b/gcc/testsuite/gcc.target/powerpc/pr92398.p9+.c
index 72dd1d9a274..7f27f999342 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr92398.p9+.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr92398.p9+.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { lp64 && has_arch_pwr9 } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mmtvsrdd\M} 1 } } */
/* { dg-final { scan-assembler-times {\mxxlnor\M} 1 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr92398.p9-.c b/gcc/testsuite/gcc.target/powerpc/pr92398.p9-.c
index bd7fa98af51..fc81cc43ee3 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr92398.p9-.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr92398.p9-.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { lp64 && {! has_arch_pwr9} } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mnot\M} 2 { xfail be } } } */
/* { dg-final { scan-assembler-times {\mstd\M} 2 { xfail { { {! has_arch_pwr9} && has_arch_pwr8 } && be } } } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr92923-1.c b/gcc/testsuite/gcc.target/powerpc/pr92923-1.c
index 262f1a1c31b..2110c6d539d 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr92923-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr92923-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -fdump-tree-gimple" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that overloaded built-ins for "and", "andc", "nor", "or" and "xor"
do not produce VIEW_CONVERT_EXPR operations on their operands. Like so:
diff --git a/gcc/testsuite/gcc.target/powerpc/pr92923-2.c b/gcc/testsuite/gcc.target/powerpc/pr92923-2.c
index 9dea626cb82..83712da4172 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr92923-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr92923-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -fdump-tree-gimple" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that overloaded built-ins for "eqv", "nand" and "orc" do not
produce VIEW_CONVERT_EXPR operations on their operands. Like so:
diff --git a/gcc/testsuite/gcc.target/powerpc/pr93073.c b/gcc/testsuite/gcc.target/powerpc/pr93073.c
index 6a0a4731148..37e9be12f4d 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr93073.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr93073.c
@@ -1,6 +1,7 @@
/* PR target/93073 */
-/* { dg-do compile { target powerpc_vsx_ok } } */
+/* { dg-do compile } */
/* { dg-options "-mvsx -O1 -ffinite-math-only -fno-trapping-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
void bar (void);
diff --git a/gcc/testsuite/gcc.target/powerpc/pr93658.c b/gcc/testsuite/gcc.target/powerpc/pr93658.c
index 8858ca8a793..09a1ed0381c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr93658.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr93658.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-O3 -Wno-stringop-overflow -fstack-protector-strong -mdejagnu-cpu=power8" } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
/* PR93658: Failure compiling this test is an infinite loop in LRA's
process_address(), so set a short timeout limit. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr96125.c b/gcc/testsuite/gcc.target/powerpc/pr96125.c
index bd9487d73cb..a4bb0d55786 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr96125.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr96125.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
void
__attribute__((target("cpu=power10")))
diff --git a/gcc/testsuite/gcc.target/powerpc/pr96139-a.c b/gcc/testsuite/gcc.target/powerpc/pr96139-a.c
index 70f477f5456..0da0e387127 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr96139-a.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr96139-a.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-O2 -Wall -mvsx" } */
/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stdio.h>
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr96139-b.c b/gcc/testsuite/gcc.target/powerpc/pr96139-b.c
index 3264a8e6b80..0cb476517fa 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr96139-b.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr96139-b.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-O2 -Wall -mvsx" } */
/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <stdio.h>
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr96933-1.c b/gcc/testsuite/gcc.target/powerpc/pr96933-1.c
index 7c425721b19..d95fd4819f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr96933-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr96933-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test vector constructions with char/short type values whether use 128bit
direct move instructions mtvsrdd on Power9 or later, rather than transfering
diff --git a/gcc/testsuite/gcc.target/powerpc/pr96933-2.c b/gcc/testsuite/gcc.target/powerpc/pr96933-2.c
index 2eacc24296d..6f26f3c0654 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr96933-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr96933-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test vector constructions with char/short type values whether use direct
move instructions like mtvsrd/mtvsrwz on Power8, rather than transfering
diff --git a/gcc/testsuite/gcc.target/powerpc/pr97019.c b/gcc/testsuite/gcc.target/powerpc/pr97019.c
index d82866b07b6..9bc8ee3daa3 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr97019.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr97019.c
@@ -2,8 +2,10 @@
the built-in functions vec_ld/vec_st can use lxvd2x/stxvd2x
(P8 big-endian) or lxv/stxv (P9 and later) for some cases,
those rldicr instructions fed to them are necessary. */
-/* { dg-do compile { target { powerpc_vsx_ok && le } } } */
+/* { dg-do compile } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target le } */
/* Test there are no useless instructions "rldicr x,y,0,59"
to align the addresses for lvx/stvx. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr98914.c b/gcc/testsuite/gcc.target/powerpc/pr98914.c
index 54d9f48c306..de1d03fbc72 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr98914.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr98914.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-Og -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
vector int
foo (vector int v)
diff --git a/gcc/testsuite/gcc.target/powerpc/pragma_misc9.c b/gcc/testsuite/gcc.target/powerpc/pragma_misc9.c
index b99b3e29d40..03e4bf0b31a 100644
--- a/gcc/testsuite/gcc.target/powerpc/pragma_misc9.c
+++ b/gcc/testsuite/gcc.target/powerpc/pragma_misc9.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target lp64 } */
/* { dg-options "-mdejagnu-cpu=power9 -maltivec -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target lp64 } */
/* Ensure that if we set a pragma gcc target for an
older processor, we do not compile builtins that
diff --git a/gcc/testsuite/gcc.target/powerpc/pure-builtin-redundant-load.c b/gcc/testsuite/gcc.target/powerpc/pure-builtin-redundant-load.c
index 16ab6abfc3b..ca153d96db0 100644
--- a/gcc/testsuite/gcc.target/powerpc/pure-builtin-redundant-load.c
+++ b/gcc/testsuite/gcc.target/powerpc/pure-builtin-redundant-load.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -fdump-tree-fre-all -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify we remove a redundant load that occurs both before and after
we call a vector load builtin.
diff --git a/gcc/testsuite/gcc.target/powerpc/recip-5.c b/gcc/testsuite/gcc.target/powerpc/recip-5.c
index 66e56fc967b..39a6c290ad1 100644
--- a/gcc/testsuite/gcc.target/powerpc/recip-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/recip-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -ftree-vectorize -mrecip=all -ffast-math -mdejagnu-cpu=power7 -fno-unroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "xvredp" 4 } } */
/* { dg-final { scan-assembler-times "xvresp" 5 } } */
/* { dg-final { scan-assembler-times "xsredp\|fre\ " 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/sad-vectorize-1.c b/gcc/testsuite/gcc.target/powerpc/sad-vectorize-1.c
index 1049437cf65..2434da4268c 100644
--- a/gcc/testsuite/gcc.target/powerpc/sad-vectorize-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sad-vectorize-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that we vectorize this SAD loop using vabsdub. */
diff --git a/gcc/testsuite/gcc.target/powerpc/sad-vectorize-2.c b/gcc/testsuite/gcc.target/powerpc/sad-vectorize-2.c
index 73a68eb9ee2..11e65e0c2b4 100644
--- a/gcc/testsuite/gcc.target/powerpc/sad-vectorize-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sad-vectorize-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that we vectorize this SAD loop using vabsduh. */
diff --git a/gcc/testsuite/gcc.target/powerpc/sd-vsx.c b/gcc/testsuite/gcc.target/powerpc/sd-vsx.c
index 92b88a32334..87fdc569497 100644
--- a/gcc/testsuite/gcc.target/powerpc/sd-vsx.c
+++ b/gcc/testsuite/gcc.target/powerpc/sd-vsx.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* powerpc-ibm-aix* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target dfp } */
/* { dg-options "-O2 -mdejagnu-cpu=power7 -mhard-dfp" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target dfp } */
/* { dg-final { scan-assembler-times "lfiwzx" 2 } } */
/* { dg-final { scan-assembler-times "stfiwx" 1 } } */
/* { dg-final { scan-assembler-not "lfd" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/signbit-1.c b/gcc/testsuite/gcc.target/powerpc/signbit-1.c
index 21c5b77916c..a29ae0fd98b 100644
--- a/gcc/testsuite/gcc.target/powerpc/signbit-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/signbit-1.c
@@ -1,8 +1,8 @@
/* { dg-do compile } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -mfloat128" } */
/* { dg-require-effective-target lp64 } */
/* { dg-require-effective-target ppc_float128_sw } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx } */
int do_signbit_kf (__float128 a) { return __builtin_signbit (a); }
int do_signbit_if (__ibm128 a) { return __builtin_signbit (a); }
diff --git a/gcc/testsuite/gcc.target/powerpc/signbit-2.c b/gcc/testsuite/gcc.target/powerpc/signbit-2.c
index a5b669f2a76..a6d83458f9d 100644
--- a/gcc/testsuite/gcc.target/powerpc/signbit-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/signbit-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target ppc_float128_sw } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target ppc_float128_sw } */
int do_signbit_kf (__float128 *a) { return __builtin_signbit (*a); }
diff --git a/gcc/testsuite/gcc.target/powerpc/sldoi_to_mov.c b/gcc/testsuite/gcc.target/powerpc/sldoi_to_mov.c
index 131000765fd..7e1a24d6f5a 100644
--- a/gcc/testsuite/gcc.target/powerpc/sldoi_to_mov.c
+++ b/gcc/testsuite/gcc.target/powerpc/sldoi_to_mov.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
vector signed int foo1 (vector signed int a) {
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-1.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-1.c
index 53e3bbd0047..dbeb53aa223 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-12.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-12.c
index 2c0a9a603a7..ae2b8ef7e6c 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-12.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-14.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-14.c
index b20ec885084..4139b8e9c23 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-14.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler "stxsdx" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-15.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-15.c
index 5607b56c1fb..8182cf501dc 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-15.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-15.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler "xxspltw" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-16.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-16.c
index a09269a5e82..80014a13ce9 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-16.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler "vspltw" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-17.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-17.c
index 88ad9acd684..b5e83f89372 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-17.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-17.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { le } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-18.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-18.c
index 00e52c1e693..202bff8de8d 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-18.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-18.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
/* This is a test for a specific convert-splat permute removal. */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-19.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-19.c
index f4698d51115..64fb243258e 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-19.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-19.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -ftree-vectorize -mdejagnu-cpu=power8 -mvsx -ffast-math -fvect-cost-model=unlimited" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This tests special handling for various uses of xxpermdi, other than
to perform doubleword swaps. */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-2.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-2.c
index c927daffe8f..84a2592ca86 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-22.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-22.c
index b6fb0bb80fe..86d7139377d 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-22.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-22.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { *-*-aix* || { *-*-linux* && lp64 } } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -maltivec -mcmodel=large" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* The expansion for vector character multiply introduces a vperm operation.
This tests that changing the vperm mask allows us to remove all swaps
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-23.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-23.c
index d2d88e0cd2b..83533d1bf4d 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-23.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-23.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" { target le } } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-24.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-24.c
index 1c9badd6cae..45e30bc8edf 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-24.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-24.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-25.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-25.c
index 44631ea9026..1fd1c524288 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-25.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-25.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-26.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-26.c
index cc952fc4445..f24c2e260a2 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-26.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-26.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "lxvd2x" 2 } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-27.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-27.c
index a41b8cd409e..b25e3fa0d4d 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-27.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-27.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "lxvd2x" 2 } } */
/* { dg-final { scan-assembler-times "stxvd2x" 1 } } */
/* { dg-final { scan-assembler-times "xxpermdi" 3 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-3.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-3.c
index 6c3d1557233..777296ecb77 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-30.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-30.c
index 44a67ac3e92..906cea30e39 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-30.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-30.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Previous versions of this test required that the assembler does not
contain xxpermdi or xxswapd. However, with the more sophisticated
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-33.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-33.c
index aa51db424a3..ba623662b5f 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-33.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-33.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Previous versions of this test required that the assembler does not
contain xxpermdi or xxswapd. However, with the more sophisticated
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-36.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-36.c
index 29ffcbab33b..c194d06ad8a 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-36.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-36.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Previous versions of this test required that the assembler does not
contain xxpermdi or xxswapd. However, with the more sophisticated
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-39.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-39.c
index 8dca8f517b1..e4702fc2dbe 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-39.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-39.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Previous versions of this test required that the assembler does not
contain xxpermdi or xxswapd. However, with the more sophisticated
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-4.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-4.c
index ffb89e14ef9..f91684896eb 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-42.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-42.c
index 5c0b29ccbfb..6efe4a945ce 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-42.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-42.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Previous versions of this test required that the assembler does not
contain xxpermdi or xxswapd. However, with the more sophisticated
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-45.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-45.c
index 0bb4c7a6e2a..e7fc3cc7ca8 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-45.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-45.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 " } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Previous versions of this test required that the assembler does not
contain xxpermdi or xxswapd. However, with the more sophisticated
diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-5.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-5.c
index 5fc9fcc832a..831c70cd4d9 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target le } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "lxvd2x" } } */
/* { dg-final { scan-assembler "stxvd2x" } } */
/* { dg-final { scan-assembler-not "xxpermdi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/undef-bool-2.c b/gcc/testsuite/gcc.target/powerpc/undef-bool-2.c
index 7bc5d184840..9588176936a 100644
--- a/gcc/testsuite/gcc.target/powerpc/undef-bool-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/undef-bool-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-O2 -std=c11 -DNO_WARN_X86_INTRINSICS -mvsx" } */
/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test to ensure that "bool" gets undef'd in xmmintrin.h when
we require strict ANSI. Subsequent use of bool needs stdbool.h.
diff --git a/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-2.c b/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-2.c
index 4f2e6ebb07b..7285ff9e68a 100644
--- a/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fdump-tree-vect-details" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test if unsigned int unpack vectorization succeeds. V2DImode is
supported since Power7 so guard it under Power7 and up. */
diff --git a/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-3.c b/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-3.c
index bb56dabbdd0..b2dc320b8fd 100644
--- a/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fdump-tree-vect-details" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test if signed int unpack vectorization succeeds. */
diff --git a/gcc/testsuite/gcc.target/powerpc/upper-regs-df.c b/gcc/testsuite/gcc.target/powerpc/upper-regs-df.c
index b85b9e04c21..70963b9c0a5 100644
--- a/gcc/testsuite/gcc.target/powerpc/upper-regs-df.c
+++ b/gcc/testsuite/gcc.target/powerpc/upper-regs-df.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
/* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-skip-if "" { powerpc*-*-darwin* } } */
/* Test to make sure double values are allocated to the Altivec registers as
well as the traditional FPR registers. */
diff --git a/gcc/testsuite/gcc.target/powerpc/upper-regs-sf.c b/gcc/testsuite/gcc.target/powerpc/upper-regs-sf.c
index 8eb18ae7ed3..c8a87170c4f 100644
--- a/gcc/testsuite/gcc.target/powerpc/upper-regs-sf.c
+++ b/gcc/testsuite/gcc.target/powerpc/upper-regs-sf.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test make sure single precision values are allocated to the Altivec
registers as well as the traditional FPR registers. */
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsdu-0.c b/gcc/testsuite/gcc.target/powerpc/vadsdu-0.c
index 218c54657c4..dbee08cb1a0 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsdu-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsdu-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsdu-1.c b/gcc/testsuite/gcc.target/powerpc/vadsdu-1.c
index a6534df1159..03e6a11757c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsdu-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsdu-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsdu-2.c b/gcc/testsuite/gcc.target/powerpc/vadsdu-2.c
index 8fc2277f5e5..0f19cddb45d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsdu-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsdu-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsdu-3.c b/gcc/testsuite/gcc.target/powerpc/vadsdu-3.c
index 2b464848259..69ffa9b6294 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsdu-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsdu-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsdu-4.c b/gcc/testsuite/gcc.target/powerpc/vadsdu-4.c
index 2373c396731..b2d124535c6 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsdu-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsdu-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsdu-5.c b/gcc/testsuite/gcc.target/powerpc/vadsdu-5.c
index 2af053b46bd..07801fdd27c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsdu-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsdu-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsdub-1.c b/gcc/testsuite/gcc.target/powerpc/vadsdub-1.c
index 64678c9397c..4a3a33d5c6e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsdub-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsdub-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsdub-2.c b/gcc/testsuite/gcc.target/powerpc/vadsdub-2.c
index ef0aab6c431..9727c68171e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsdub-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsdub-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsduh-1.c b/gcc/testsuite/gcc.target/powerpc/vadsduh-1.c
index ad434a6aebb..ae85ba6da41 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsduh-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsduh-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsduh-2.c b/gcc/testsuite/gcc.target/powerpc/vadsduh-2.c
index 1e9c3591e22..9de7c12ce2a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsduh-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsduh-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsduw-1.c b/gcc/testsuite/gcc.target/powerpc/vadsduw-1.c
index de363d41db8..05c1414f734 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsduw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsduw-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vadsduw-2.c b/gcc/testsuite/gcc.target/powerpc/vadsduw-2.c
index 66a7497fc5a..bd939263469 100644
--- a/gcc/testsuite/gcc.target/powerpc/vadsduw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vadsduw-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cmp-sel.c b/gcc/testsuite/gcc.target/powerpc/vec-cmp-sel.c
index ef000c1cf10..791b45a69fb 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cmp-sel.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cmp-sel.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target powerpc64*-*-* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-maltivec -O2 -mvsx" } */
/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler "vcmpgtsd" } } */
/* { dg-final { scan-assembler-not "xxlnor" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cmp.c b/gcc/testsuite/gcc.target/powerpc/vec-cmp.c
index 537630899bd..1ecfef15d97 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cmp.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cmp.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target lp64 } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times "vcmpgtsb" 4 } } */
/* { dg-final { scan-assembler-times "vcmpgtub" 4 } } */
/* { dg-final { scan-assembler-times "vcmpgtsh" 4 } } */
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-1.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-1.c
index 1cb5b1bd435..e6cf9cbcf1f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-2.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-2.c
index 2aea0baeff4..ed0457fca3d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-3.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-3.c
index 4a15d1e4fbb..c55b30d3f9e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-3.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-4.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-4.c
index fd2bdf10725..c70caa87b6f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-5.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-5.c
index 229ed3d2e30..14cc526c7c6 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-5.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-6.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-6.c
index 9c2cff9088b..7827eda93be 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-6.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-7.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-7.c
index 22192f702b7..9f956dba278 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-7.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-8.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-8.c
index ea0bcc856b5..6d517a208e8 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-8.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
--git a/gcc/testsuite/gcc.target/powerpc/vec-extract-9.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-9.c
index 0648f595e42..dd210e7bbef 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-extract-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-9.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-init-10.c b/gcc/testsuite/gcc.target/powerpc/vec-init-10.c
index 4307e5ee100..4ff53f2362f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-init-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-init-10.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Check that we can optimize sldi + or to rldimi for vector int init. */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-init-3.c b/gcc/testsuite/gcc.target/powerpc/vec-init-3.c
index f64a8b0c72b..59e734cba54 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-init-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-init-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
vector long
merge (long a, long b)
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-init-6.c b/gcc/testsuite/gcc.target/powerpc/vec-init-6.c
index 6e78095e11b..53e9b3bebbf 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-init-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-init-6.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
vector int
merge (int a, int b, int c, int d)
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-init-7.c b/gcc/testsuite/gcc.target/powerpc/vec-init-7.c
index 965960acd6f..b94ead260b2 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-init-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-init-7.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
vector int
splat (int a)
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-minmax-1.c b/gcc/testsuite/gcc.target/powerpc/vec-minmax-1.c
index 6c8347fa8b4..490d996bcc4 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-minmax-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-minmax-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mxvmaxdp\M} 1 } } */
/* { dg-final { scan-assembler-times {\mxvmaxsp\M} 1 } } */
/* { dg-final { scan-assembler-times {\mxvmindp\M} 1 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-minmax-2.c b/gcc/testsuite/gcc.target/powerpc/vec-minmax-2.c
index 79739a32ce6..165cb70e317 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-minmax-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-minmax-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* { dg-final { scan-assembler-times {\mxsmaxcdp\M} 2 } } */
/* { dg-final { scan-assembler-times {\mxsmincdp\M} 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-mul.c b/gcc/testsuite/gcc.target/powerpc/vec-mul.c
index bfcaf80719d..492a8b60fb7 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-mul.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-mul.c
@@ -1,6 +1,6 @@
/* { dg-do run } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O3" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Test that the vec_mul builtin works as expected. */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-perm-ctor.c b/gcc/testsuite/gcc.target/powerpc/vec-perm-ctor.c
index cc59e60035f..7c70df5ac0e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-perm-ctor.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-perm-ctor.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx -fdump-tree-optimized" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* To test all permutations fed by CTOR and CST can be optimized away. */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-set-char.c b/gcc/testsuite/gcc.target/powerpc/vec-set-char.c
index 460324acd79..44330b70b07 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-set-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-set-char.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-set-int.c b/gcc/testsuite/gcc.target/powerpc/vec-set-int.c
index 6ea954f304f..fbf181dfe78 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-set-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-set-int.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-set-short.c b/gcc/testsuite/gcc.target/powerpc/vec-set-short.c
index 78188c64376..7cdce762f48 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-set-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-set-short.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec_reve_1.c b/gcc/testsuite/gcc.target/powerpc/vec_reve_1.c
index 95751d53632..b0de82e7e98 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec_reve_1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec_reve_1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vec_reve_2.c b/gcc/testsuite/gcc.target/powerpc/vec_reve_2.c
index ab7c2d9a091..4fb91bd49ce 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec_reve_2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec_reve_2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vector_float.c b/gcc/testsuite/gcc.target/powerpc/vector_float.c
index 50c3cae82c8..1996ceae082 100644
--- a/gcc/testsuite/gcc.target/powerpc/vector_float.c
+++ b/gcc/testsuite/gcc.target/powerpc/vector_float.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-require-effective-target lp64 } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
+/* { dg-require-effective-target lp64 } */
vector float
test (float *a, float *b, float *c, float *d)
diff --git a/gcc/testsuite/gcc.target/powerpc/versioned-copy-loop.c b/gcc/testsuite/gcc.target/powerpc/versioned-copy-loop.c
index b8baaa3e459..039d42d153d 100644
--- a/gcc/testsuite/gcc.target/powerpc/versioned-copy-loop.c
+++ b/gcc/testsuite/gcc.target/powerpc/versioned-copy-loop.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O3 -mvsx -fdump-tree-vect-details" } */
+/* { dg-require-effective-target powerpc_vsx } */
/* Verify that a pure copy loop with a vectorization factor of two
that requires alignment will not be vectorized. See the cost
diff --git a/gcc/testsuite/gcc.target/powerpc/vslv-0.c b/gcc/testsuite/gcc.target/powerpc/vslv-0.c
index cc8df73b84e..d24df29947e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vslv-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vslv-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vslv-1.c b/gcc/testsuite/gcc.target/powerpc/vslv-1.c
index 2714e4ec13b..c0f1370cd62 100644
--- a/gcc/testsuite/gcc.target/powerpc/vslv-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vslv-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsrv-0.c b/gcc/testsuite/gcc.target/powerpc/vsrv-0.c
index 410e6de5610..3f1d27cd449 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsrv-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsrv-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsrv-1.c b/gcc/testsuite/gcc.target/powerpc/vsrv-1.c
index 9ba985a8a28..7de460ad3e9 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsrv-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsrv-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-0.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-0.c
index 6c42d94a23c..9c7ed7e7ea4 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-1.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-1.c
index 50208b8250f..fdd439d2122 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-10.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-10.c
index f2f8f5be364..83fa45e227e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-10.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-11.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-11.c
index e708dd1f8a3..17f41697b61 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-11.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-12.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-12.c
index b9084f5f6d1..5f72b9f9dd0 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-12.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-13.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-13.c
index 0812652c574..90618968fee 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-13.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-14.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-14.c
index f2d00abd41d..862b9d5dab0 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-14.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-2.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-2.c
index 3378f9f5a5f..f627179c258 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-3.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-3.c
index 38aa56a015f..caef3f691f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-4.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-4.c
index 5a60dff848b..5a252d4eda2 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-5.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-5.c
index 9efbbb1d56f..3e6a8069501 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-6.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-6.c
index 4eb1dbcd046..1d3e761d395 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-6.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-7.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-7.c
index 1b4f0ad0419..5f151223740 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-7.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-8.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-8.c
index 050f07c0434..2252d13e620 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-8.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-9.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-9.c
index c0b68455c18..5a45259fa33 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-ne-9.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-1.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-1.c
index dcbc6616c88..de55ca83956 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-2.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-2.c
index 3666b45c891..2ec049f3334 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-3.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-3.c
index 09b007841eb..ac5159c1bda 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-4.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-4.c
index 7226c0ca0e9..d8be9bb81f7 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-5.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-5.c
index 153e728d87c..b5b639f6c64 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-6.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-6.c
index 29440ead6aa..c452936ba26 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-6.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c
index 45d7493e8cb..bf44953e978 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-0.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-0.c
index 1c6a7275737..66d44b1307c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-0.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-1.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-1.c
index 35da9261408..b56d440cd12 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-10.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-10.c
index 30dfc83a97b..ab6c2c3940f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-10.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-11.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-11.c
index d9d7d3ff7fe..3a53e8f74cd 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-11.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-12.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-12.c
index 8bd5b24b54d..4d65adc0375 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-12.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-13.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-13.c
index 90a59c4b758..f0ace059ec0 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-13.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-14.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-14.c
index 4375bfe21cc..d32c962d2f2 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-14.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-2.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-2.c
index c359975ec7f..1b060ed185f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-2.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-3.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-3.c
index 677db19d5d2..361445159ed 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-4.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-4.c
index 2f2f08c3534..68d48f0f905 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-5.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-5.c
index 8d155509dc4..206e1d1b344 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-6.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-6.c
index 5fea9ac9fdc..bb8d8d72ce5 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-6.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-7.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-7.c
index 254a1161580..beae8283de4 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-7.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-8.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-8.c
index d94ef89f3d0..d2c799f552a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-8.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-9.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-9.c
index efe83cf2ee7..d97cbfa7204 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eq-9.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx } */
#include <altivec.h>
diff --git a/gcc/t