public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-9129] rs6000: Neuter option -mpower{8,9}-vector [PR109987]
@ 2024-02-22 2:42 Kewen Lin
0 siblings, 0 replies; only message in thread
From: Kewen Lin @ 2024-02-22 2:42 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:438ef143679e8421960f0484958664c6c92b1d7e
commit r14-9129-g438ef143679e8421960f0484958664c6c92b1d7e
Author: Kewen Lin <linkw@linux.ibm.com>
Date: Wed Feb 21 20:41:18 2024 -0600
rs6000: Neuter option -mpower{8,9}-vector [PR109987]
As PR109987 and its duplicated bugs show, -mno-power8-vector
(and -mno-power9-vector) cause some problems and as Segher
pointed out in [1] they are workaround options, so this patch
is to remove -m{no,}-power{8,9}-options. Like what we did
for option -mdirect-move before, this patch still keep the
corresponding internal flags and they are automatically set
based on -mcpu. The test suite update takes some efforts,
it consists of some aspects:
- effective target powerpc_p{8,9}vector_ok are removed
and replaced with powerpc_vsx_ok.
- Some cases having -mpower{8,9}-vector are updated with
-mvsx, some of them already have -mdejagnu-cpu. For
those that don't have -mdejagnu-cpu, if -mdejagnu-cpu
is needed for the test point, then it's appended;
otherwise, add additional-options -mdejagnu-cpu=power{8,9}
if has_arch_pwr{8,9} isn't satisfied.
- Some test cases are updated with explicit -mvsx.
- Some test cases with those two option mixed are adjusted
to keep the test points, like -mpower8-vector
-mno-power9-vector are updated with -mdejagnu-cpu=power8
-mvsx etc.
- Some test cases with -mno-power{8,9}-vector are updated
by replacing -mno-power{8,9}-vector with -mno-vsx, or
just removing it.
- For some cases, we don't always specify -mdejagnu-cpu to
avoid to restrict the testing coverage, it would check
has_arch_pwr{8,9} and appended that as need.
- For vect test cases run, it doesn't specify -mcpu=power9
for power10 and up.
Bootstrapped and regtested on:
- powerpc64-linux-gnu P7/P8/P9 {-m32,-m64}
- powerpc64le-linux-gnu P8/P9/P10
Although it's stage4 now, as the discussion in PR113115 we
are still eager to neuter these two options, so is it ok
for trunk?
[1] https://gcc.gnu.org/pipermail/gcc-patches/2022-January/589303.html
PR target/109987
gcc/ChangeLog:
* config/rs6000/constraints.md (we): Update internal doc without
referring to option -mpower9-vector.
* config/rs6000/driver-rs6000.cc (asm_names): Remove mpower9-vector
special handlings.
* config/rs6000/rs6000-cpus.def (OTHER_P9_VECTOR_MASKS,
OTHER_P8_VECTOR_MASKS): Merge to ...
(OTHER_VSX_VECTOR_MASKS): ... here.
* config/rs6000/rs6000.cc (rs6000_option_override_internal): Remove
some error message handlings and explicit option mask adjustments on
explicit option power{8,9}-vector conflicting with other options.
(rs6000_print_isa_options): Update comments.
(rs6000_disable_incompatible_switches): Remove power{8,9}-vector
related array items and handlings.
* config/rs6000/rs6000.h (ASM_CPU_SPEC): Remove mpower9-vector
special handlings.
* config/rs6000/rs6000.opt: Make option power{8,9}-vector as
WarnRemoved.
* doc/extend.texi: Remove documentation referring to option
-mpower8-vector.
* doc/invoke.texi: Remove documentation for option
-mpower{8,9}-vector and adjust some documentation referring to them.
* doc/md.texi: Update documentation for constraint we.
* doc/sourcebuild.texi: Remove documentation for powerpc_p8vector_ok.
libgcc/ChangeLog:
* config/rs6000/t-float128-hw: Replace options -mpower{8,9}-vector
with -mcpu=power9.
* configure.ac: Update use of option -mpower9-vector with
-mcpu=power9.
* configure: Regenerate.
gcc/testsuite/ChangeLog:
* lib/target-supports.exp
(check_effective_target_powerpc_p8vector_ok): Remove.
(check_effective_target_powerpc_p9vector_ok): Remove.
(check_p8vector_hw_available): Replace -mpower8-vector with
-mcpu=power8.
(check_p9vector_hw_available): Replace -mpower9-vector with
-mcpu=power9.
(check_ppc_float128_hw_available): Likewise.
(check_vect_support_and_set_flags): Replace -mpower8-vector with
-mcpu=power8, replace -mpower9-vector with -mcpu=power9 or
nothing if check_power10_hw_available and place -mcpu=970 first
if needed to avoid possible overriding.
* g++.target/powerpc/altivec-19.C: Replace powerpc_p9vector_ok with
powerpc_vsx_ok and append -mvsx to dg-options.
* 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/builtins-3-p9.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/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-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-vector.c: Likewise.
* gcc.target/powerpc/float128-type-2.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.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-char.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-short.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-char.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-float.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-int.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-longlong.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-short.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-char-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-float-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-int-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-short-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-int128-p9.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-int.p9.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-longlong.p9.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-novsx.c: Likewise.
* gcc.target/powerpc/p9-permute.c: Likewise.
* gcc.target/powerpc/p9-sign_extend-runnable.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-fortran/pr80108-1.f90: Likewise.
* gcc.target/powerpc/ppc-round3.c: Likewise.
* gcc.target/powerpc/pr103124.c: Likewise.
* gcc.target/powerpc/pr104015-1.c: Likewise.
* gcc.target/powerpc/pr106769-p9.c: Likewise.
* gcc.target/powerpc/pr107412.c: Likewise.
* gcc.target/powerpc/pr110429.c: Likewise.
* gcc.target/powerpc/pr66144-1.c: Likewise.
* gcc.target/powerpc/pr71186.c: Likewise.
* gcc.target/powerpc/pr71309.c: Likewise.
* gcc.target/powerpc/pr71670.c: Likewise.
* gcc.target/powerpc/pr71698.c: Likewise.
* gcc.target/powerpc/pr71720.c: Likewise.
* gcc.target/powerpc/pr72853.c: Likewise.
* gcc.target/powerpc/pr78056-1.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.p9.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/pr80695-p9.c: Likewise.
* gcc.target/powerpc/pr81348.c: Likewise.
* gcc.target/powerpc/pr81622.c: Likewise.
* gcc.target/powerpc/pr84154-3.c: Likewise.
* gcc.target/powerpc/pr90763.c: Likewise.
* gcc.target/powerpc/pr96933-1.c: Likewise.
* gcc.target/powerpc/sad-vectorize-1.c: Likewise.
* gcc.target/powerpc/sad-vectorize-2.c: Likewise.
* gcc.target/powerpc/signbit-2.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-extract-4.c: Likewise.
* gcc.target/powerpc/vec-init-3.c: Likewise.
* gcc.target/powerpc/vec-minmax-1.c: Likewise.
* gcc.target/powerpc/vec-minmax-2.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_2.c: Likewise.
* gcc.target/powerpc/vector_float.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-builtin-msum.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-qimode.c: Likewise.
* gcc.target/powerpc/vsx-qimode2.c: Likewise.
* gcc.target/powerpc/vsx-qimode3.c: Likewise.
* g++.target/powerpc/pr65240-1.C: Replace powerpc_p8vector_ok with
powerpc_vsx_ok and append -mvsx to dg-options.
* g++.target/powerpc/pr65240-2.C: Likewise.
* g++.target/powerpc/pr65240-3.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.
* gcc.target/powerpc/atomic-p8.c: Likewise.
* gcc.target/powerpc/atomic_load_store-p8.c: Likewise.
* gcc.target/powerpc/bcd-2.c: Likewise.
* gcc.target/powerpc/bcd-3.c: Likewise.
* gcc.target/powerpc/bool2-p8.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-5.c: Likewise.
* gcc.target/powerpc/builtins-9.c: Likewise.
* gcc.target/powerpc/crypto-builtin-1.c: Likewise.
* gcc.target/powerpc/crypto-builtin-2.c: Likewise.
* gcc.target/powerpc/direct-move-double1.c: Likewise.
* gcc.target/powerpc/direct-move-float1.c: Likewise.
* gcc.target/powerpc/direct-move-long1.c: Likewise.
* gcc.target/powerpc/direct-move-vint1.c: Likewise.
* gcc.target/powerpc/float128-type-1.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-char.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-double.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-float.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-int.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-longlong.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-extract-short.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-char-p8.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-float-p8.c: Likewise.
* gcc.target/powerpc/fold-vec-insert-int-p8.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-neg-char.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-floatdouble.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-int.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-short.c: Likewise.
* gcc.target/powerpc/fold-vec-select-double.c: Likewise.
* gcc.target/powerpc/fold-vec-store-builtin_vec_xst-longlong.c: Likewise.
* gcc.target/powerpc/fusion.c: Likewise.
* gcc.target/powerpc/fusion2.c: Likewise.
* gcc.target/powerpc/mul-vectorize-1.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-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/ppc-round2.c: Likewise.
* gcc.target/powerpc/pr100866-1.c: Likewise.
* gcc.target/powerpc/pr100866-2.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/pr106769-p8.c: Likewise.
* gcc.target/powerpc/pr108396.c: Likewise.
* gcc.target/powerpc/pr111449-1.c: Likewise.
* gcc.target/powerpc/pr57744.c: Likewise.
* gcc.target/powerpc/pr58673-1.c: Likewise.
* gcc.target/powerpc/pr58673-2.c: Likewise.
* gcc.target/powerpc/pr60137.c: Likewise.
* gcc.target/powerpc/pr60203.c: Likewise.
* gcc.target/powerpc/pr66144-2.c: Likewise.
* gcc.target/powerpc/pr66144-3.c: Likewise.
* gcc.target/powerpc/pr68163.c: Likewise.
* gcc.target/powerpc/pr69548.c: Likewise.
* gcc.target/powerpc/pr70669.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/pr78056-3.c: Likewise.
* gcc.target/powerpc/pr78056-4.c: Likewise.
* gcc.target/powerpc/pr78102.c: Likewise.
* gcc.target/powerpc/pr78543.c: Likewise.
* gcc.target/powerpc/pr78604.c: Likewise.
* gcc.target/powerpc/pr79251.p8.c: Likewise.
* gcc.target/powerpc/pr79354.c: Likewise.
* gcc.target/powerpc/pr79544.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-2.c: Likewise.
* gcc.target/powerpc/pr80695-p8.c: Likewise.
* gcc.target/powerpc/pr80718.c: Likewise.
* gcc.target/powerpc/pr84154-2.c: Likewise.
* gcc.target/powerpc/pr88558-p8.c: Likewise.
* gcc.target/powerpc/pr88845.c: Likewise.
* gcc.target/powerpc/pr91903.c: Likewise.
* gcc.target/powerpc/pr92923-2.c: Likewise.
* gcc.target/powerpc/pr96933-2.c: Likewise.
* gcc.target/powerpc/pr97019.c: Likewise.
* gcc.target/powerpc/pragma_power8.c: Likewise.
* gcc.target/powerpc/signbit-1.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-46.c: Likewise.
* gcc.target/powerpc/swaps-p8-5.c: Likewise.
* gcc.target/powerpc/unpack-vectorize-3.c: Likewise.
* gcc.target/powerpc/upper-regs-sf.c: Likewise.
* gcc.target/powerpc/vec-cmp.c: Likewise.
* gcc.target/powerpc/vec-extract-1.c: Likewise.
* gcc.target/powerpc/vec-extract-3.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-6.c: Likewise.
* gcc.target/powerpc/vec-init-7.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-simode.c: Likewise.
* gcc.target/powerpc/vsx-simode2.c: Likewise.
* gcc.target/powerpc/vsx-simode3.c: Likewise.
* gcc.target/powerpc/builtins-4-int128-runnable.c: Replace
powerpc_p8vector_ok with powerpc_vsx_ok, replace -mpower8-vector
with -mvsx, and add dg-additional-options -mdejagnu-cpu=power8
if !has_arch_pwr8.
* gcc.target/powerpc/builtins-mergew-mergow.c: Likewise.
* gcc.target/powerpc/direct-move-float3.c: Likewise.
* gcc.target/powerpc/divkc3-2.c: Likewise.
* gcc.target/powerpc/divkc3-3.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-add-4.c: Likewise.
* gcc.target/powerpc/fold-vec-add-7.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-int.h: Likewise.
* gcc.target/powerpc/fold-vec-cmp-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-short.h: 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-ld-longlong.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-longlong.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-mergehl-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-minmax-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-int.c: Likewise.
* gcc.target/powerpc/fold-vec-mult-longlong.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-int.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-longlong.h: Likewise.
* gcc.target/powerpc/fold-vec-pack-double.c: Likewise.
* gcc.target/powerpc/fold-vec-pack-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-st-longlong.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/mmx-packs.c: Likewise.
* gcc.target/powerpc/mmx-packssdw-1.c: Likewise.
* gcc.target/powerpc/mmx-packsswb-1.c: Likewise.
* gcc.target/powerpc/mmx-packuswb-1.c: Likewise.
* gcc.target/powerpc/mmx-paddb-1.c: Likewise.
* gcc.target/powerpc/mmx-paddd-1.c: Likewise.
* gcc.target/powerpc/mmx-paddsb-1.c: Likewise.
* gcc.target/powerpc/mmx-paddsw-1.c: Likewise.
* gcc.target/powerpc/mmx-paddusb-1.c: Likewise.
* gcc.target/powerpc/mmx-paddusw-1.c: Likewise.
* gcc.target/powerpc/mmx-paddw-1.c: Likewise.
* gcc.target/powerpc/mmx-pcmpeqb-1.c: Likewise.
* gcc.target/powerpc/mmx-pcmpeqd-1.c: Likewise.
* gcc.target/powerpc/mmx-pcmpeqw-1.c: Likewise.
* gcc.target/powerpc/mmx-pcmpgtb-1.c: Likewise.
* gcc.target/powerpc/mmx-pcmpgtd-1.c: Likewise.
* gcc.target/powerpc/mmx-pcmpgtw-1.c: Likewise.
* gcc.target/powerpc/mmx-pmaddwd-1.c: Likewise.
* gcc.target/powerpc/mmx-pmulhw-1.c: Likewise.
* gcc.target/powerpc/mmx-pmullw-1.c: Likewise.
* gcc.target/powerpc/mmx-pslld-1.c: Likewise.
* gcc.target/powerpc/mmx-psllw-1.c: Likewise.
* gcc.target/powerpc/mmx-psrad-1.c: Likewise.
* gcc.target/powerpc/mmx-psraw-1.c: Likewise.
* gcc.target/powerpc/mmx-psrld-1.c: Likewise.
* gcc.target/powerpc/mmx-psrlw-1.c: Likewise.
* gcc.target/powerpc/mmx-psubb-2.c: Likewise.
* gcc.target/powerpc/mmx-psubd-2.c: Likewise.
* gcc.target/powerpc/mmx-psubsb-1.c: Likewise.
* gcc.target/powerpc/mmx-psubsw-1.c: Likewise.
* gcc.target/powerpc/mmx-psubusb-1.c: Likewise.
* gcc.target/powerpc/mmx-psubusw-1.c: Likewise.
* gcc.target/powerpc/mmx-psubw-2.c: Likewise.
* gcc.target/powerpc/mmx-punpckhbw-1.c: Likewise.
* gcc.target/powerpc/mmx-punpckhdq-1.c: Likewise.
* gcc.target/powerpc/mmx-punpckhwd-1.c: Likewise.
* gcc.target/powerpc/mmx-punpcklbw-1.c: Likewise.
* gcc.target/powerpc/mmx-punpckldq-1.c: Likewise.
* gcc.target/powerpc/mmx-punpcklwd-1.c: Likewise.
* gcc.target/powerpc/mulkc3-2.c: Likewise.
* gcc.target/powerpc/mulkc3-3.c: Likewise.
* gcc.target/powerpc/p8vector-builtin-8.c: Likewise.
* gcc.target/powerpc/pr37191.c: Likewise.
* gcc.target/powerpc/pr83862.c: Likewise.
* gcc.target/powerpc/pr84154-1.c: Likewise.
* gcc.target/powerpc/pr84220-sld2.c: Likewise.
* gcc.target/powerpc/pr85456.c: Likewise.
* gcc.target/powerpc/pr86731-longlong.c: Likewise.
* gcc.target/powerpc/sse-addps-1.c: Likewise.
* gcc.target/powerpc/sse-addss-1.c: Likewise.
* gcc.target/powerpc/sse-andnps-1.c: Likewise.
* gcc.target/powerpc/sse-andps-1.c: Likewise.
* gcc.target/powerpc/sse-cmpss-1.c: Likewise.
* gcc.target/powerpc/sse-cvtpi16ps-1.c: Likewise.
* gcc.target/powerpc/sse-cvtpi32ps-1.c: Likewise.
* gcc.target/powerpc/sse-cvtpi32x2ps-1.c: Likewise.
* gcc.target/powerpc/sse-cvtpi8ps-1.c: Likewise.
* gcc.target/powerpc/sse-cvtpspi16-1.c: Likewise.
* gcc.target/powerpc/sse-cvtpspi8-1.c: Likewise.
* gcc.target/powerpc/sse-cvtpu16ps-1.c: Likewise.
* gcc.target/powerpc/sse-cvtpu8ps-1.c: Likewise.
* gcc.target/powerpc/sse-cvtsi2ss-1.c: Likewise.
* gcc.target/powerpc/sse-cvtsi2ss-2.c: Likewise.
* gcc.target/powerpc/sse-cvtss2si-1.c: Likewise.
* gcc.target/powerpc/sse-cvtss2si-2.c: Likewise.
* gcc.target/powerpc/sse-cvttss2si-1.c: Likewise.
* gcc.target/powerpc/sse-cvttss2si-2.c: Likewise.
* gcc.target/powerpc/sse-divps-1.c: Likewise.
* gcc.target/powerpc/sse-divss-1.c: Likewise.
* gcc.target/powerpc/sse-maxps-1.c: Likewise.
* gcc.target/powerpc/sse-maxps-2.c: Likewise.
* gcc.target/powerpc/sse-maxss-1.c: Likewise.
* gcc.target/powerpc/sse-minps-1.c: Likewise.
* gcc.target/powerpc/sse-minps-2.c: Likewise.
* gcc.target/powerpc/sse-minss-1.c: Likewise.
* gcc.target/powerpc/sse-movaps-1.c: Likewise.
* gcc.target/powerpc/sse-movaps-2.c: Likewise.
* gcc.target/powerpc/sse-movhlps-1.c: Likewise.
* gcc.target/powerpc/sse-movhps-1.c: Likewise.
* gcc.target/powerpc/sse-movhps-2.c: Likewise.
* gcc.target/powerpc/sse-movlhps-1.c: Likewise.
* gcc.target/powerpc/sse-movlps-1.c: Likewise.
* gcc.target/powerpc/sse-movlps-2.c: Likewise.
* gcc.target/powerpc/sse-movmskb-1.c: Likewise.
* gcc.target/powerpc/sse-movmskps-1.c: Likewise.
* gcc.target/powerpc/sse-movss-1.c: Likewise.
* gcc.target/powerpc/sse-movss-2.c: Likewise.
* gcc.target/powerpc/sse-movss-3.c: Likewise.
* gcc.target/powerpc/sse-mulps-1.c: Likewise.
* gcc.target/powerpc/sse-mulss-1.c: Likewise.
* gcc.target/powerpc/sse-orps-1.c: Likewise.
* gcc.target/powerpc/sse-pavgw-1.c: Likewise.
* gcc.target/powerpc/sse-pmaxsw-1.c: Likewise.
* gcc.target/powerpc/sse-pmaxub-1.c: Likewise.
* gcc.target/powerpc/sse-pminsw-1.c: Likewise.
* gcc.target/powerpc/sse-pminub-1.c: Likewise.
* gcc.target/powerpc/sse-pmulhuw-1.c: Likewise.
* gcc.target/powerpc/sse-psadbw-1.c: Likewise.
* gcc.target/powerpc/sse-rcpps-1.c: Likewise.
* gcc.target/powerpc/sse-rsqrtps-1.c: Likewise.
* gcc.target/powerpc/sse-shufps-1.c: Likewise.
* gcc.target/powerpc/sse-sqrtps-1.c: Likewise.
* gcc.target/powerpc/sse-subps-1.c: Likewise.
* gcc.target/powerpc/sse-subss-1.c: Likewise.
* gcc.target/powerpc/sse-ucomiss-1.c: Likewise.
* gcc.target/powerpc/sse-ucomiss-2.c: Likewise.
* gcc.target/powerpc/sse-ucomiss-3.c: Likewise.
* gcc.target/powerpc/sse-ucomiss-4.c: Likewise.
* gcc.target/powerpc/sse-ucomiss-5.c: Likewise.
* gcc.target/powerpc/sse-ucomiss-6.c: Likewise.
* gcc.target/powerpc/sse-unpckhps-1.c: Likewise.
* gcc.target/powerpc/sse-unpcklps-1.c: Likewise.
* gcc.target/powerpc/sse-xorps-1.c: Likewise.
* gcc.target/powerpc/sse2-addpd-1.c: Likewise.
* gcc.target/powerpc/sse2-addsd-1.c: Likewise.
* gcc.target/powerpc/sse2-andnpd-1.c: Likewise.
* gcc.target/powerpc/sse2-andpd-1.c: Likewise.
* gcc.target/powerpc/sse2-cmppd-1.c: Likewise.
* gcc.target/powerpc/sse2-cmpsd-1.c: Likewise.
* gcc.target/powerpc/sse2-comisd-1.c: Likewise.
* gcc.target/powerpc/sse2-comisd-2.c: Likewise.
* gcc.target/powerpc/sse2-comisd-3.c: Likewise.
* gcc.target/powerpc/sse2-comisd-4.c: Likewise.
* gcc.target/powerpc/sse2-comisd-5.c: Likewise.
* gcc.target/powerpc/sse2-comisd-6.c: Likewise.
* gcc.target/powerpc/sse2-cvtdq2pd-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtdq2ps-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtpd2dq-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtpd2ps-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtps2dq-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtps2pd-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtsd2si-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtsd2si-2.c: Likewise.
* gcc.target/powerpc/sse2-cvtsd2ss-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtsi2sd-1.c: Likewise.
* gcc.target/powerpc/sse2-cvtsi2sd-2.c: Likewise.
* gcc.target/powerpc/sse2-cvtss2sd-1.c: Likewise.
* gcc.target/powerpc/sse2-cvttpd2dq-1.c: Likewise.
* gcc.target/powerpc/sse2-cvttps2dq-1.c: Likewise.
* gcc.target/powerpc/sse2-cvttsd2si-1.c: Likewise.
* gcc.target/powerpc/sse2-cvttsd2si-2.c: Likewise.
* gcc.target/powerpc/sse2-divpd-1.c: Likewise.
* gcc.target/powerpc/sse2-divsd-1.c: Likewise.
* gcc.target/powerpc/sse2-maxpd-1.c: Likewise.
* gcc.target/powerpc/sse2-maxsd-1.c: Likewise.
* gcc.target/powerpc/sse2-minpd-1.c: Likewise.
* gcc.target/powerpc/sse2-minsd-1.c: Likewise.
* gcc.target/powerpc/sse2-mmx.c: Likewise.
* gcc.target/powerpc/sse2-movhpd-1.c: Likewise.
* gcc.target/powerpc/sse2-movhpd-2.c: Likewise.
* gcc.target/powerpc/sse2-movlpd-1.c: Likewise.
* gcc.target/powerpc/sse2-movlpd-2.c: Likewise.
* gcc.target/powerpc/sse2-movmskpd-1.c: Likewise.
* gcc.target/powerpc/sse2-movq-1.c: Likewise.
* gcc.target/powerpc/sse2-movq-2.c: Likewise.
* gcc.target/powerpc/sse2-movq-3.c: Likewise.
* gcc.target/powerpc/sse2-movsd-1.c: Likewise.
* gcc.target/powerpc/sse2-movsd-2.c: Likewise.
* gcc.target/powerpc/sse2-movsd-3.c: Likewise.
* gcc.target/powerpc/sse2-mulpd-1.c: Likewise.
* gcc.target/powerpc/sse2-mulsd-1.c: Likewise.
* gcc.target/powerpc/sse2-orpd-1.c: Likewise.
* gcc.target/powerpc/sse2-packssdw-1.c: Likewise.
* gcc.target/powerpc/sse2-packsswb-1.c: Likewise.
* gcc.target/powerpc/sse2-packuswb-1.c: Likewise.
* gcc.target/powerpc/sse2-paddb-1.c: Likewise.
* gcc.target/powerpc/sse2-paddd-1.c: Likewise.
* gcc.target/powerpc/sse2-paddq-1.c: Likewise.
* gcc.target/powerpc/sse2-paddsb-1.c: Likewise.
* gcc.target/powerpc/sse2-paddsw-1.c: Likewise.
* gcc.target/powerpc/sse2-paddusb-1.c: Likewise.
* gcc.target/powerpc/sse2-paddusw-1.c: Likewise.
* gcc.target/powerpc/sse2-paddw-1.c: Likewise.
* gcc.target/powerpc/sse2-pand-1.c: Likewise.
* gcc.target/powerpc/sse2-pandn-1.c: Likewise.
* gcc.target/powerpc/sse2-pavgb-1.c: Likewise.
* gcc.target/powerpc/sse2-pavgw-1.c: Likewise.
* gcc.target/powerpc/sse2-pcmpeqb-1.c: Likewise.
* gcc.target/powerpc/sse2-pcmpeqd-1.c: Likewise.
* gcc.target/powerpc/sse2-pcmpeqw-1.c: Likewise.
* gcc.target/powerpc/sse2-pcmpgtb-1.c: Likewise.
* gcc.target/powerpc/sse2-pcmpgtd-1.c: Likewise.
* gcc.target/powerpc/sse2-pcmpgtw-1.c: Likewise.
* gcc.target/powerpc/sse2-pextrw.c: Likewise.
* gcc.target/powerpc/sse2-pinsrw.c: Likewise.
* gcc.target/powerpc/sse2-pmaddwd-1.c: Likewise.
* gcc.target/powerpc/sse2-pmaxsw-1.c: Likewise.
* gcc.target/powerpc/sse2-pmaxub-1.c: Likewise.
* gcc.target/powerpc/sse2-pminsw-1.c: Likewise.
* gcc.target/powerpc/sse2-pminub-1.c: Likewise.
* gcc.target/powerpc/sse2-pmovmskb-1.c: Likewise.
* gcc.target/powerpc/sse2-pmulhuw-1.c: Likewise.
* gcc.target/powerpc/sse2-pmulhw-1.c: Likewise.
* gcc.target/powerpc/sse2-pmullw-1.c: Likewise.
* gcc.target/powerpc/sse2-pmuludq-1.c: Likewise.
* gcc.target/powerpc/sse2-por-1.c: Likewise.
* gcc.target/powerpc/sse2-psadbw-1.c: Likewise.
* gcc.target/powerpc/sse2-pshufd-1.c: Likewise.
* gcc.target/powerpc/sse2-pshufhw-1.c: Likewise.
* gcc.target/powerpc/sse2-pshuflw-1.c: Likewise.
* gcc.target/powerpc/sse2-pslld-1.c: Likewise.
* gcc.target/powerpc/sse2-pslld-2.c: Likewise.
* gcc.target/powerpc/sse2-pslldq-1.c: Likewise.
* gcc.target/powerpc/sse2-psllq-1.c: Likewise.
* gcc.target/powerpc/sse2-psllq-2.c: Likewise.
* gcc.target/powerpc/sse2-psllw-1.c: Likewise.
* gcc.target/powerpc/sse2-psllw-2.c: Likewise.
* gcc.target/powerpc/sse2-psrad-1.c: Likewise.
* gcc.target/powerpc/sse2-psrad-2.c: Likewise.
* gcc.target/powerpc/sse2-psraw-1.c: Likewise.
* gcc.target/powerpc/sse2-psraw-2.c: Likewise.
* gcc.target/powerpc/sse2-psrld-1.c: Likewise.
* gcc.target/powerpc/sse2-psrld-2.c: Likewise.
* gcc.target/powerpc/sse2-psrldq-1.c: Likewise.
* gcc.target/powerpc/sse2-psrlq-1.c: Likewise.
* gcc.target/powerpc/sse2-psrlq-2.c: Likewise.
* gcc.target/powerpc/sse2-psrlw-1.c: Likewise.
* gcc.target/powerpc/sse2-psrlw-2.c: Likewise.
* gcc.target/powerpc/sse2-psubb-1.c: Likewise.
* gcc.target/powerpc/sse2-psubd-1.c: Likewise.
* gcc.target/powerpc/sse2-psubq-1.c: Likewise.
* gcc.target/powerpc/sse2-psubsb-1.c: Likewise.
* gcc.target/powerpc/sse2-psubsw-1.c: Likewise.
* gcc.target/powerpc/sse2-psubusb-1.c: Likewise.
* gcc.target/powerpc/sse2-psubusw-1.c: Likewise.
* gcc.target/powerpc/sse2-psubw-1.c: Likewise.
* gcc.target/powerpc/sse2-punpckhbw-1.c: Likewise.
* gcc.target/powerpc/sse2-punpckhdq-1.c: Likewise.
* gcc.target/powerpc/sse2-punpckhqdq-1.c: Likewise.
* gcc.target/powerpc/sse2-punpckhwd-1.c: Likewise.
* gcc.target/powerpc/sse2-punpcklbw-1.c: Likewise.
* gcc.target/powerpc/sse2-punpckldq-1.c: Likewise.
* gcc.target/powerpc/sse2-punpcklqdq-1.c: Likewise.
* gcc.target/powerpc/sse2-punpcklwd-1.c: Likewise.
* gcc.target/powerpc/sse2-pxor-1.c: Likewise.
* gcc.target/powerpc/sse2-shufpd-1.c: Likewise.
* gcc.target/powerpc/sse2-sqrtpd-1.c: Likewise.
* gcc.target/powerpc/sse2-subpd-1.c: Likewise.
* gcc.target/powerpc/sse2-subsd-1.c: Likewise.
* gcc.target/powerpc/sse2-ucomisd-1.c: Likewise.
* gcc.target/powerpc/sse2-ucomisd-2.c: Likewise.
* gcc.target/powerpc/sse2-ucomisd-3.c: Likewise.
* gcc.target/powerpc/sse2-ucomisd-4.c: Likewise.
* gcc.target/powerpc/sse2-ucomisd-5.c: Likewise.
* gcc.target/powerpc/sse2-ucomisd-6.c: Likewise.
* gcc.target/powerpc/sse2-unpckhpd-1.c: Likewise.
* gcc.target/powerpc/sse2-unpcklpd-1.c: Likewise.
* gcc.target/powerpc/sse2-xorpd-1.c: Likewise.
* gcc.target/powerpc/sse3-addsubpd.c: Likewise.
* gcc.target/powerpc/sse3-addsubps.c: Likewise.
* gcc.target/powerpc/sse3-haddpd.c: Likewise.
* gcc.target/powerpc/sse3-haddps.c: Likewise.
* gcc.target/powerpc/sse3-hsubpd.c: Likewise.
* gcc.target/powerpc/sse3-hsubps.c: Likewise.
* gcc.target/powerpc/sse3-lddqu.c: Likewise.
* gcc.target/powerpc/sse3-movddup.c: Likewise.
* gcc.target/powerpc/sse3-movshdup.c: Likewise.
* gcc.target/powerpc/sse3-movsldup.c: Likewise.
* gcc.target/powerpc/sse4_1-blendpd.c: Likewise.
* gcc.target/powerpc/sse4_1-blendps-2.c: Likewise.
* gcc.target/powerpc/sse4_1-blendps.c: Likewise.
* gcc.target/powerpc/sse4_1-blendvpd.c: Likewise.
* gcc.target/powerpc/sse4_1-blendvps.c: Likewise.
* gcc.target/powerpc/sse4_1-ceilpd.c: Likewise.
* gcc.target/powerpc/sse4_1-ceilps.c: Likewise.
* gcc.target/powerpc/sse4_1-ceilsd.c: Likewise.
* gcc.target/powerpc/sse4_1-ceilss.c: Likewise.
* gcc.target/powerpc/sse4_1-floorpd.c: Likewise.
* gcc.target/powerpc/sse4_1-floorps.c: Likewise.
* gcc.target/powerpc/sse4_1-floorsd.c: Likewise.
* gcc.target/powerpc/sse4_1-floorss.c: Likewise.
* gcc.target/powerpc/sse4_1-pblendvb.c: Likewise.
* gcc.target/powerpc/sse4_1-pblendw-2.c: Likewise.
* gcc.target/powerpc/sse4_1-pblendw.c: Likewise.
* gcc.target/powerpc/sse4_1-pcmpeqq.c: Likewise.
* gcc.target/powerpc/sse4_1-pinsrb.c: Likewise.
* gcc.target/powerpc/sse4_1-pinsrd.c: Likewise.
* gcc.target/powerpc/sse4_1-pinsrq.c: Likewise.
* gcc.target/powerpc/sse4_1-pmovsxbq.c: Likewise.
* gcc.target/powerpc/sse4_1-pmovsxdq.c: Likewise.
* gcc.target/powerpc/sse4_1-pmovsxwq.c: Likewise.
* gcc.target/powerpc/sse4_1-pmuldq.c: Likewise.
* gcc.target/powerpc/sse4_1-ptest-1.c: Likewise.
* gcc.target/powerpc/sse4_1-roundpd-2.c: Likewise.
* gcc.target/powerpc/sse4_1-roundpd-3.c: Likewise.
* gcc.target/powerpc/sse4_2-pcmpgtq.c: Likewise.
* gcc.target/powerpc/ssse3-pabsb.c: Likewise.
* gcc.target/powerpc/ssse3-pabsd.c: Likewise.
* gcc.target/powerpc/ssse3-pabsw.c: Likewise.
* gcc.target/powerpc/ssse3-palignr.c: Likewise.
* gcc.target/powerpc/ssse3-phaddd.c: Likewise.
* gcc.target/powerpc/ssse3-phaddsw.c: Likewise.
* gcc.target/powerpc/ssse3-phaddw.c: Likewise.
* gcc.target/powerpc/ssse3-phsubd.c: Likewise.
* gcc.target/powerpc/ssse3-phsubsw.c: Likewise.
* gcc.target/powerpc/ssse3-phsubw.c: Likewise.
* gcc.target/powerpc/ssse3-pmaddubsw.c: Likewise.
* gcc.target/powerpc/ssse3-pmulhrsw.c: Likewise.
* gcc.target/powerpc/ssse3-pshufb.c: Likewise.
* gcc.target/powerpc/ssse3-psignb.c: Likewise.
* gcc.target/powerpc/ssse3-psignd.c: Likewise.
* gcc.target/powerpc/ssse3-psignw.c: Likewise.
* gcc.target/powerpc/vec-cmp-sel.c: Likewise.
* gcc.target/powerpc/vec-sld-modulo.c: Likewise.
* gcc.target/powerpc/vec-srad-modulo.c: Likewise.
* gcc.target/powerpc/vec-srd-modulo.c: Likewise.
* gcc.target/powerpc/amo1.c: Replace powerpc_p9vector_ok with
powerpc_vsx_ok, replace -mpower9-vector with -mvsx, and add
dg-additional-options -mdejagnu-cpu=power9 if !has_arch_pwr9.
* gcc.target/powerpc/amo2.c: Likewise.
* gcc.target/powerpc/dform-1.c: Likewise.
* gcc.target/powerpc/dform-2.c: Likewise.
* gcc.target/powerpc/float128-5.c: Likewise.
* gcc.target/powerpc/float128-complex-2.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-hw11.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-minmax.c: Likewise.
* gcc.target/powerpc/float128-odd.c: Likewise.
* gcc.target/powerpc/float128-sqrt1.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-int.p9.c: Likewise.
* gcc.target/powerpc/gnuattr2.c: Likewise.
* gcc.target/powerpc/pr71656-1.c: Likewise.
* gcc.target/powerpc/pr71656-2.c: Likewise.
* gcc.target/powerpc/pr81959.c: Likewise.
* gcc.target/powerpc/pr82748-1.c: Likewise.
* gcc.target/powerpc/pr82748-2.c: Likewise.
* gcc.target/powerpc/pr111449-2.c: Replace powerpc_p8vector_ok
with powerpc_vsx_ok.
* gcc.target/powerpc/pr98914.c: Likewise.
* gcc.target/powerpc/versioned-copy-loop.c: Replace
powerpc_p8vector_ok with powerpc_vsx_ok and append -mvsx to
dg-options.
* gcc.target/powerpc/clone2.c: Replace powerpc_p9vector_ok with
powerpc_vsx_ok.
* gcc.target/powerpc/p9-options-1.c: Replace powerpc_p9vector_ok
with powerpc_vsx_ok, replace -mno-power9-vector with -mno-vsx.
* gcc.target/powerpc/pr84226.c: Replace powerpc_p9vector_ok with
powerpc_vsx_ok and append -mvsx to dg-options.
* g++.dg/pr69667.C: Replace powerpc_p8vector_ok with
powerpc_vsx_ok and append -mvsx to dg-options.
* gcc.dg/vect/costmodel/ppc/costmodel-slp-perm.c: Replace
powerpc_p9vector_ok with powerpc_vsx_ok and replace
-mpower9-vector with -mvsx.
* gcc.dg/vect/pr109011-1.c: Replace powerpc_p8vector_ok with
powerpc_vsx_ok, and replace -mpower8-vector with
-mdejagnu-cpu=power8 -mvsx or -mvsx under different conditions.
* gcc.dg/vect/pr109011-2.c: Replace powerpc_p9vector_ok
with powerpc_vsx_ok, and replace -mpower9-vector with
-mdejagnu-cpu=power9 -mvsx or -mvsx under different conditions.
* gcc.dg/vect/pr109011-4.c: Likewise.
* gcc.dg/vect/pr109011-3.c: Replace powerpc_p8vector_ok with
powerpc_vsx_ok, and replace -mpower8-vector -mno-power9-vector
with -mdejagnu-cpu=power8 -mvsx.
* gcc.dg/vect/pr109011-5.c: Likewise.
* gcc.target/powerpc/altivec-35.c: Remove -mno-power8-vector.
* gcc.target/powerpc/vsx-vector-7.c: Replace -mno-power8-vector
with -mdejagnu-cpu=power7.
* gcc.dg/vect/O3-pr70130.c: Replace -mcpu=power7 with options
-mdejagnu-cpu=power7 -mvsx and remove option -mno-power9-vector
-mno-power8-vector.
* gfortran.dg/vect/pr45714-b.f: Likewise.
* gcc.dg/vect/pr48765.c: Remove dg-skip-if and replace -mcpu=power7
with option -mdejagnu-cpu=power6.
* gcc.target/powerpc/pr78056-2.c: Likewise.
* gcc.target/powerpc/altivec-2-runnable.c: Replace
powerpc_p8vector_ok with powerpc_vsx_ok, remove -mpower8-vector
and add dg-additional-options -mdejagnu-cpu=power8 if !has_arch_pwr8.
* gcc.target/powerpc/altivec-37.c: Likewise.
* gcc.target/powerpc/fold-vec-abs-longlong-fwrapv.p8.c: Replace
powerpc_p8vector_ok with powerpc_vsx_ok and replace -mpower8-vector
with -mvsx.
* gcc.target/powerpc/fold-vec-abs-longlong.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-char.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-int.p8.c: Likewise.
* gcc.target/powerpc/fold-vec-cmp-short.p8.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-mult-int128-p8.c: Likewise.
* gcc.target/powerpc/fold-vec-neg-longlong.p8.c: Likewise.
* gcc.target/powerpc/pr104124.c: Likewise.
* gcc.target/powerpc/vec-cmpne-long.c: Likewise.
* gcc.target/powerpc/pr86731-fwrapv-longlong.c: Replace
powerpc_p8vector_ok with powerpc_vsx_ok, replace -mpower8-vector with
-mvsx and add dg-additional-options -mdejagnu-cpu=power8 if
!has_arch_pwr8.
* gcc.target/powerpc/pr80098-1.c: Replace powerpc_p9vector_ok with
powerpc_vsx_ok and replace -mno-power9-vector with -mno-vsx.
* gcc.target/powerpc/pr80098-2.c: Replace powerpc_p8vector_ok with
powerpc_vsx_ok and replace -mno-power8-vector with -mno-vsx.
* gcc.target/powerpc/pragma_misc9.c: Replace powerpc_p9vector_ok
with powerpc_vsx_ok.
Diff:
---
gcc/config/rs6000/constraints.md | 4 +-
gcc/config/rs6000/driver-rs6000.cc | 7 +-
gcc/config/rs6000/rs6000-cpus.def | 20 ++----
gcc/config/rs6000/rs6000.cc | 60 ++----------------
gcc/config/rs6000/rs6000.h | 8 +--
gcc/config/rs6000/rs6000.opt | 4 +-
gcc/doc/extend.texi | 4 +-
gcc/doc/invoke.texi | 26 +++-----
gcc/doc/md.texi | 4 +-
gcc/doc/sourcebuild.texi | 3 -
gcc/testsuite/g++.dg/pr69667.C | 4 +-
gcc/testsuite/g++.target/powerpc/altivec-19.C | 4 +-
gcc/testsuite/g++.target/powerpc/pr65240-1.C | 4 +-
gcc/testsuite/g++.target/powerpc/pr65240-2.C | 4 +-
gcc/testsuite/g++.target/powerpc/pr65240-3.C | 4 +-
gcc/testsuite/g++.target/powerpc/pr65242.C | 4 +-
gcc/testsuite/g++.target/powerpc/pr67211.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr71294.C | 4 +-
gcc/testsuite/g++.target/powerpc/pr84279.C | 4 +-
gcc/testsuite/g++.target/powerpc/pr93974.C | 4 +-
gcc/testsuite/gcc.dg/vect/O3-pr70130.c | 2 +-
.../gcc.dg/vect/costmodel/ppc/costmodel-slp-perm.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 +-
gcc/testsuite/gcc.dg/vect/pr48765.c | 3 +-
.../gcc.target/powerpc/altivec-2-runnable.c | 7 +-
gcc/testsuite/gcc.target/powerpc/altivec-35.c | 2 +-
gcc/testsuite/gcc.target/powerpc/altivec-37.c | 7 +-
gcc/testsuite/gcc.target/powerpc/amo1.c | 5 +-
gcc/testsuite/gcc.target/powerpc/amo2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/atomic-p8.c | 4 +-
.../gcc.target/powerpc/atomic_load_store-p8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/bcd-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/bcd-3.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-eq-0.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-eq-1.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-gt-0.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-gt-1.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-lt-0.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-lt-1.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c | 4 +-
.../powerpc/bfp/scalar-cmp-exp-unordered-0.c | 4 +-
.../powerpc/bfp/scalar-cmp-exp-unordered-1.c | 4 +-
.../powerpc/bfp/scalar-cmp-exp-unordered-2.c | 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-0.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-1.c | 4 +-
.../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 | 4 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-3.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-4.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-insert-exp-5.c | 4 +-
.../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 +-
.../powerpc/bfp/scalar-test-data-class-0.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-1.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-10.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-11.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-2.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-3.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-4.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-5.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-6.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-7.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-8.c | 4 +-
.../powerpc/bfp/scalar-test-data-class-9.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-test-neg-0.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-test-neg-1.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-test-neg-2.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-test-neg-3.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-test-neg-4.c | 4 +-
.../gcc.target/powerpc/bfp/scalar-test-neg-5.c | 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
.../gcc.target/powerpc/bfp/vec-insert-exp-0.c | 4 +-
.../gcc.target/powerpc/bfp/vec-insert-exp-1.c | 4 +-
.../gcc.target/powerpc/bfp/vec-insert-exp-2.c | 4 +-
.../gcc.target/powerpc/bfp/vec-insert-exp-3.c | 4 +-
.../gcc.target/powerpc/bfp/vec-insert-exp-4.c | 4 +-
.../gcc.target/powerpc/bfp/vec-insert-exp-5.c | 4 +-
.../gcc.target/powerpc/bfp/vec-insert-exp-6.c | 4 +-
.../gcc.target/powerpc/bfp/vec-insert-exp-7.c | 4 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-0.c | 4 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-1.c | 4 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-2.c | 4 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-3.c | 4 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-4.c | 4 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-5.c | 4 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-6.c | 4 +-
.../gcc.target/powerpc/bfp/vec-test-data-class-7.c | 4 +-
gcc/testsuite/gcc.target/powerpc/bool2-p8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/bool3-p8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/builtins-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/builtins-3-p8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/builtins-3-p9.c | 4 +-
.../powerpc/builtins-4-int128-runnable.c | 3 +-
gcc/testsuite/gcc.target/powerpc/builtins-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/builtins-9.c | 4 +-
.../gcc.target/powerpc/builtins-mergew-mergow.c | 3 +-
.../gcc.target/powerpc/byte-in-either-range-0.c | 4 +-
.../gcc.target/powerpc/byte-in-either-range-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/byte-in-range-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c | 4 +-
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 | 4 +-
gcc/testsuite/gcc.target/powerpc/clone2.c | 2 +-
.../gcc.target/powerpc/crypto-builtin-1.c | 4 +-
.../gcc.target/powerpc/crypto-builtin-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/ctz-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/ctz-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/darn-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/darn-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/darn-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dform-1.c | 5 +-
gcc/testsuite/gcc.target/powerpc/dform-2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/dform-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-20.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-22.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-23.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-24.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-25.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-27.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-28.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-29.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-40.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-42.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-43.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-44.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-45.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-47.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-48.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-49.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-60.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-62.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-63.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-64.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-65.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-67.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-68.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-69.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-7.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-9.c | 4 +-
.../gcc.target/powerpc/direct-move-double1.c | 4 +-
.../gcc.target/powerpc/direct-move-float1.c | 4 +-
.../gcc.target/powerpc/direct-move-float3.c | 5 +-
.../gcc.target/powerpc/direct-move-long1.c | 4 +-
.../gcc.target/powerpc/direct-move-vector.c | 4 +-
.../gcc.target/powerpc/direct-move-vint1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/divkc3-2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/divkc3-3.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-5.c | 5 +-
.../gcc.target/powerpc/float128-complex-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/float128-fma1.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw10.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw11.c | 3 +-
gcc/testsuite/gcc.target/powerpc/float128-hw2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw3.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw4.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw5.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw6.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw7.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw8.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-hw9.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-minmax.c | 3 +-
gcc/testsuite/gcc.target/powerpc/float128-odd.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-sqrt1.c | 5 +-
gcc/testsuite/gcc.target/powerpc/float128-type-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/float128-type-2.c | 4 +-
.../powerpc/fold-vec-abs-int-fwrapv.p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-abs-int.p9.c | 4 +-
.../powerpc/fold-vec-abs-longlong-fwrapv.c | 5 +-
.../powerpc/fold-vec-abs-longlong-fwrapv.p8.c | 4 +-
.../powerpc/fold-vec-abs-longlong-fwrapv.p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-abs-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-abs-longlong.p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-abs-longlong.p9.c | 4 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-add-4.c | 5 +-
gcc/testsuite/gcc.target/powerpc/fold-vec-add-7.c | 5 +-
.../gcc.target/powerpc/fold-vec-cmp-char.p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-cmp-char.p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-cmp-int.h | 5 +-
.../gcc.target/powerpc/fold-vec-cmp-int.p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-cmp-int.p9.c | 5 +-
.../gcc.target/powerpc/fold-vec-cmp-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-cmp-short.h | 5 +-
.../gcc.target/powerpc/fold-vec-cmp-short.p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-cmp-short.p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-cntlz-char.c | 5 +-
.../gcc.target/powerpc/fold-vec-cntlz-int.c | 5 +-
.../gcc.target/powerpc/fold-vec-cntlz-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-cntlz-short.c | 5 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
.../gcc.target/powerpc/fold-vec-insert-char-p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-insert-char-p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-insert-float-p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-insert-float-p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-insert-int-p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-insert-int-p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-insert-longlong.c | 4 +-
.../gcc.target/powerpc/fold-vec-insert-short-p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-insert-short-p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-ld-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-logical-eqv-char.c | 5 +-
.../powerpc/fold-vec-logical-eqv-float.c | 5 +-
.../powerpc/fold-vec-logical-eqv-floatdouble.c | 5 +-
.../gcc.target/powerpc/fold-vec-logical-eqv-int.c | 5 +-
.../powerpc/fold-vec-logical-eqv-longlong.c | 5 +-
.../powerpc/fold-vec-logical-eqv-short.c | 5 +-
.../powerpc/fold-vec-logical-ors-longlong.c | 7 +-
.../powerpc/fold-vec-logical-other-char.c | 5 +-
.../powerpc/fold-vec-logical-other-int.c | 5 +-
.../powerpc/fold-vec-logical-other-longlong.c | 5 +-
.../powerpc/fold-vec-logical-other-short.c | 5 +-
.../powerpc/fold-vec-mergeeo-floatdouble.c | 4 +-
.../gcc.target/powerpc/fold-vec-mergeeo-int.c | 4 +-
.../gcc.target/powerpc/fold-vec-mergeeo-longlong.c | 4 +-
.../gcc.target/powerpc/fold-vec-mergehl-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-minmax-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-mult-int.c | 5 +-
.../gcc.target/powerpc/fold-vec-mult-int128-p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-mult-int128-p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-mult-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-neg-char.c | 2 +-
.../gcc.target/powerpc/fold-vec-neg-floatdouble.c | 4 +-
.../gcc.target/powerpc/fold-vec-neg-int.c | 5 +-
.../gcc.target/powerpc/fold-vec-neg-int.p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-neg-int.p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-neg-longlong.h | 5 +-
.../gcc.target/powerpc/fold-vec-neg-longlong.p8.c | 4 +-
.../gcc.target/powerpc/fold-vec-neg-longlong.p9.c | 4 +-
.../gcc.target/powerpc/fold-vec-neg-short.c | 2 +-
.../gcc.target/powerpc/fold-vec-pack-double.c | 5 +-
.../gcc.target/powerpc/fold-vec-pack-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-select-double.c | 4 +-
.../powerpc/fold-vec-shift-left-longlong-fwrapv.c | 5 +-
.../powerpc/fold-vec-shift-left-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-shift-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-st-longlong.c | 5 +-
.../fold-vec-store-builtin_vec_xst-longlong.c | 2 +-
.../gcc.target/powerpc/fold-vec-sub-int128.c | 5 +-
.../gcc.target/powerpc/fold-vec-sub-longlong.c | 5 +-
.../gcc.target/powerpc/fold-vec-unpack-float.c | 5 +-
.../gcc.target/powerpc/fold-vec-unpack-int.c | 5 +-
gcc/testsuite/gcc.target/powerpc/fusion.c | 2 +-
gcc/testsuite/gcc.target/powerpc/fusion2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/gnuattr2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/mmx-packs.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-packssdw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-packsswb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-packuswb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-paddb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-paddd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-paddsb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-paddsw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-paddusb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-paddusw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-paddw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pmaddwd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pmulhw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pmullw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-pslld-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psllw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psrad-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psraw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psrld-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psrlw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psubb-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psubd-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psubsb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psubsw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psubusb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psubusw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-psubw-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-punpckhbw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-punpckhdq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-punpckhwd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-punpcklbw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-punpckldq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mmx-punpcklwd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/mul-vectorize-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/mulkc3-2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/mulkc3-3.c | 5 +-
.../gcc.target/powerpc/p8-vec-xl-xst-v2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p8-vec-xl-xst.c | 4 +-
.../gcc.target/powerpc/p8vector-builtin-1.c | 4 +-
.../gcc.target/powerpc/p8vector-builtin-2.c | 4 +-
.../gcc.target/powerpc/p8vector-builtin-3.c | 4 +-
.../gcc.target/powerpc/p8vector-builtin-4.c | 4 +-
.../gcc.target/powerpc/p8vector-builtin-5.c | 4 +-
.../gcc.target/powerpc/p8vector-builtin-6.c | 4 +-
.../gcc.target/powerpc/p8vector-builtin-7.c | 4 +-
.../gcc.target/powerpc/p8vector-builtin-8.c | 5 +-
gcc/testsuite/gcc.target/powerpc/p8vector-fp.c | 4 +-
.../gcc.target/powerpc/p8vector-int128-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p8vector-ldst.c | 4 +-
.../gcc.target/powerpc/p8vector-vbpermq.c | 4 +-
.../gcc.target/powerpc/p8vector-vectorize-1.c | 4 +-
.../gcc.target/powerpc/p8vector-vectorize-2.c | 4 +-
.../gcc.target/powerpc/p8vector-vectorize-3.c | 4 +-
.../gcc.target/powerpc/p8vector-vectorize-4.c | 4 +-
.../gcc.target/powerpc/p8vector-vectorize-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-dimode1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-dimode2.c | 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
gcc/testsuite/gcc.target/powerpc/p9-fpcvt-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-fpcvt-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-fpcvt-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-lxvx-stxvx-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-minmax-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-minmax-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-minmax-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-novsx.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-options-1.c | 8 +--
gcc/testsuite/gcc.target/powerpc/p9-permute.c | 4 +-
.../gcc.target/powerpc/p9-sign_extend-runnable.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-splat-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-vbpermd.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-epil-1.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-epil-2.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-epil-3.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-epil-4.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-epil-5.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-epil-6.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-epil-7.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-epil-8.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-full-1.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-full-2.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-full-3.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-full-4.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-full-5.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-full-6.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-full-7.c | 4 +-
.../gcc.target/powerpc/p9-vec-length-full-8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-vneg.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-vparity.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-vpermr.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-xxbr-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-xxbr-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/p9-xxbr-3.c | 4 +-
.../gcc.target/powerpc/ppc-fortran/pr80108-1.f90 | 2 +-
gcc/testsuite/gcc.target/powerpc/ppc-round2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/ppc-round3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr100866-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr100866-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr103124.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr104015-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr104124.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr104239-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr104239-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr104239-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr106769-p8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr106769-p9.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr107412.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr108396.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr110429.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr111449-1.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr111449-2.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr37191.c | 3 +-
gcc/testsuite/gcc.target/powerpc/pr57744.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr58673-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr58673-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr60137.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr60203.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr66144-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr66144-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr66144-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr68163.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr69548.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr70669.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr71186.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr71309.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr71656-1.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr71656-2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr71670.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr71698.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr71720.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr71977-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr71977-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr72717.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr72853.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr78056-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr78056-2.c | 6 +-
gcc/testsuite/gcc.target/powerpc/pr78056-3.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr78056-4.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pr78102.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr78543.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr78604.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr78658.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr78953.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79004.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79038-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79179.c | 4 +-
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 | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79544.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79799-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79799-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79799-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79799-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79907.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr79951.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr80098-1.c | 6 +-
gcc/testsuite/gcc.target/powerpc/pr80098-2.c | 6 +-
gcc/testsuite/gcc.target/powerpc/pr80315-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr80315-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr80315-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr80315-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr80510-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr80695-p8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr80695-p9.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr80718.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr81348.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr81622.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr81959.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr82748-1.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr82748-2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr83862.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr84154-1.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr84154-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr84154-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr84220-sld2.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr84226.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr85456.c | 5 +-
.../gcc.target/powerpc/pr86731-fwrapv-longlong.c | 7 +-
.../gcc.target/powerpc/pr86731-longlong.c | 5 +-
gcc/testsuite/gcc.target/powerpc/pr88558-p8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr88845.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr90763.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr91903.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr92923-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr96933-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr96933-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr97019.c | 4 +-
gcc/testsuite/gcc.target/powerpc/pr98914.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pragma_misc9.c | 2 +-
gcc/testsuite/gcc.target/powerpc/pragma_power8.c | 2 +-
gcc/testsuite/gcc.target/powerpc/sad-vectorize-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/sad-vectorize-2.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/sse-addps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-addss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-andnps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-andps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cmpss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtpi16ps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtpi32ps-1.c | 3 +-
.../gcc.target/powerpc/sse-cvtpi32x2ps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtpi8ps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtpspi16-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtpspi8-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtpu16ps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtpu8ps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-divps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-divss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-maxps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-maxps-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-maxss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-minps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-minps-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-minss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movaps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movaps-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movhlps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movhps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movhps-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movlhps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movlps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movlps-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movmskb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movmskps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movss-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-movss-3.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-mulps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-mulss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-orps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-pavgw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-pmaxsw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-pmaxub-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-pminsw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-pminub-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-pmulhuw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-psadbw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-rcpps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-rsqrtps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-shufps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-sqrtps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-subps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-subss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-ucomiss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-ucomiss-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-ucomiss-3.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-ucomiss-4.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-ucomiss-5.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-ucomiss-6.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-unpckhps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-unpcklps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse-xorps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-addpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-addsd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-andnpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-andpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cmppd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cmpsd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-comisd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-comisd-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-comisd-3.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-comisd-4.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-comisd-5.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-comisd-6.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2pd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2ps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2dq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2ps-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtps2dq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtps2pd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2ss-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-cvtss2sd-1.c | 3 +-
.../gcc.target/powerpc/sse2-cvttpd2dq-1.c | 3 +-
.../gcc.target/powerpc/sse2-cvttps2dq-1.c | 3 +-
.../gcc.target/powerpc/sse2-cvttsd2si-1.c | 3 +-
.../gcc.target/powerpc/sse2-cvttsd2si-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-divpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-divsd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-maxpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-maxsd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-minpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-minsd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-mmx.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movhpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movhpd-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movlpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movlpd-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movmskpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movq-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movq-3.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movsd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movsd-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-movsd-3.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-mulpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-mulsd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-orpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-packssdw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-packsswb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-packuswb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-paddb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-paddd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-paddq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-paddsb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-paddsw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-paddusb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-paddusw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-paddw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pand-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pandn-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pavgb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pavgw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pextrw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pinsrw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pmaddwd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pmaxsw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pmaxub-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pminsw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pminub-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pmovmskb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pmulhuw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pmulhw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pmullw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pmuludq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-por-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psadbw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pshufd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pshufhw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pshuflw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pslld-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pslld-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pslldq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psllq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psllq-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psllw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psllw-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrad-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrad-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psraw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psraw-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrld-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrld-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrldq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrlq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrlq-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrlw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psrlw-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psubb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psubd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psubq-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psubsb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psubsw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psubusb-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psubusw-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-psubw-1.c | 3 +-
.../gcc.target/powerpc/sse2-punpckhbw-1.c | 3 +-
.../gcc.target/powerpc/sse2-punpckhdq-1.c | 3 +-
.../gcc.target/powerpc/sse2-punpckhqdq-1.c | 3 +-
.../gcc.target/powerpc/sse2-punpckhwd-1.c | 3 +-
.../gcc.target/powerpc/sse2-punpcklbw-1.c | 3 +-
.../gcc.target/powerpc/sse2-punpckldq-1.c | 3 +-
.../gcc.target/powerpc/sse2-punpcklqdq-1.c | 3 +-
.../gcc.target/powerpc/sse2-punpcklwd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-pxor-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-shufpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-sqrtpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-subpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-subsd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-ucomisd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-ucomisd-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-ucomisd-3.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-ucomisd-4.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-ucomisd-5.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-ucomisd-6.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-unpckhpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-unpcklpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse2-xorpd-1.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-addsubpd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-addsubps.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-haddpd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-haddps.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-hsubpd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-hsubps.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-lddqu.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-movddup.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-movshdup.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse3-movsldup.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-blendpd.c | 3 +-
.../gcc.target/powerpc/sse4_1-blendps-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-blendps.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-blendvpd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-blendvps.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-ceilpd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-ceilps.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-ceilsd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-ceilss.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-floorpd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-floorps.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-floorsd.c | 3 +-
| 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pblendvb.c | 3 +-
.../gcc.target/powerpc/sse4_1-pblendw-2.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pblendw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pcmpeqq.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pinsrb.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pinsrd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pinsrq.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pmovsxbq.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pmovsxdq.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pmovsxwq.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-pmuldq.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_1-ptest-1.c | 3 +-
.../gcc.target/powerpc/sse4_1-roundpd-2.c | 3 +-
.../gcc.target/powerpc/sse4_1-roundpd-3.c | 3 +-
gcc/testsuite/gcc.target/powerpc/sse4_2-pcmpgtq.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-pabsb.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-pabsd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-pabsw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-palignr.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-phaddd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-phaddsw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-phaddw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-phsubd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-phsubsw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-phsubw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-pmaddubsw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-pmulhrsw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-pshufb.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-psignb.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-psignd.c | 3 +-
gcc/testsuite/gcc.target/powerpc/ssse3-psignw.c | 3 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-12.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-14.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-15.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-16.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-17.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-18.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-19.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-22.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-23.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-24.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-25.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-26.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-27.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-30.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-33.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-36.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-39.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-42.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-45.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-46.c | 4 +-
gcc/testsuite/gcc.target/powerpc/swaps-p8-5.c | 4 +-
.../gcc.target/powerpc/unpack-vectorize-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/upper-regs-sf.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsdu-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsdub-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsdub-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsduh-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsduh-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsduw-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vadsduw-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-cmp-sel.c | 5 +-
gcc/testsuite/gcc.target/powerpc/vec-cmp.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-cmpne-long.c | 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
| 4 +-
gcc/testsuite/gcc.target/powerpc/vec-init-10.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-init-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-init-6.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-init-7.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-minmax-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-minmax-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-set-char.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-set-int.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-set-short.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vec-sld-modulo.c | 3 +-
gcc/testsuite/gcc.target/powerpc/vec-srad-modulo.c | 3 +-
gcc/testsuite/gcc.target/powerpc/vec-srd-modulo.c | 3 +-
gcc/testsuite/gcc.target/powerpc/vec_reve_2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vector_float.c | 4 +-
.../gcc.target/powerpc/versioned-copy-loop.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vslv-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vslv-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsrv-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsrv-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-0.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-10.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-11.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-12.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-13.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-14.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-5.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-6.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-7.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-8.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-ne-9.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-nez-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-nez-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-nez-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-nez-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-nez-5.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-nez-6.c | 4 +-
.../gcc.target/powerpc/vsu/vec-all-nez-7.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-0.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-10.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-11.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-12.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-13.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-14.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-5.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-6.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-7.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-8.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eq-9.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eqz-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eqz-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eqz-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eqz-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eqz-5.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eqz-6.c | 4 +-
.../gcc.target/powerpc/vsu/vec-any-eqz-7.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-6.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-8.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpne-9.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cmpnez-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cmpnez-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cmpnez-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cmpnez-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cmpnez-5.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cmpnez-6.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cmpnez-7.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cntlz-lsbb-0.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cntlz-lsbb-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cntlz-lsbb-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cntlz-lsbb-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cnttz-lsbb-0.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cnttz-lsbb-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cnttz-lsbb-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-cnttz-lsbb-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-0.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-10.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-11.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-12.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-13.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-5.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-6.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-7.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-8.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xl-len-9.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-6.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-0.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-1.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-4.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-5.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-6.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-0.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-1.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-10.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-11.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-12.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-13.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-2.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-3.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-4.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-5.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-6.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-7.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-8.c | 4 +-
.../gcc.target/powerpc/vsu/vec-xst-len-9.c | 4 +-
.../gcc.target/powerpc/vsx-builtin-msum.c | 4 +-
| 4 +-
| 4 +-
| 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-himode.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-himode2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-himode3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-qimode.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-qimode2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-qimode3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-simode.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-simode2.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-simode3.c | 4 +-
gcc/testsuite/gcc.target/powerpc/vsx-vector-7.c | 2 +-
gcc/testsuite/gfortran.dg/vect/pr45714-b.f | 2 +-
gcc/testsuite/lib/target-supports.exp | 74 ++++------------------
libgcc/config/rs6000/t-float128-hw | 2 +-
libgcc/configure | 2 +-
libgcc/configure.ac | 2 +-
1003 files changed, 2097 insertions(+), 1836 deletions(-)
diff --git a/gcc/config/rs6000/constraints.md b/gcc/config/rs6000/constraints.md
index c99997bf82bd..369a7b75042d 100644
--- a/gcc/config/rs6000/constraints.md
+++ b/gcc/config/rs6000/constraints.md
@@ -78,8 +78,8 @@
;; It is currently used for that purpose in LLVM.
(define_register_constraint "we" "rs6000_constraints[RS6000_CONSTRAINT_we]"
- "@internal Like @code{wa}, if @option{-mpower9-vector} and @option{-m64} are
- used; otherwise, @code{NO_REGS}.")
+ "@internal Like @code{wa}, if this is a POWER9 or later and @option{-mvsx}
+ and @option{-m64} are used; otherwise, @code{NO_REGS}.")
;; NO_REGs register constraint, used to merge mov{sd,sf}, since movsd can use
;; direct move directly, and movsf can't to move between the register sets.
diff --git a/gcc/config/rs6000/driver-rs6000.cc b/gcc/config/rs6000/driver-rs6000.cc
index 244b3388c2ad..3ebbaa42622a 100644
--- a/gcc/config/rs6000/driver-rs6000.cc
+++ b/gcc/config/rs6000/driver-rs6000.cc
@@ -476,13 +476,13 @@ static const struct asm_name asm_names[] = {
{ "power6", "-mpower6 %{!mvsx:%{!maltivec:-maltivec}}" },
{ "power6x", "-mpower6 %{!mvsx:%{!maltivec:-maltivec}}" },
{ "power7", "-mpower7" },
- { "power8", "%{mpower9-vector:-mpower9;:-mpower8}" },
+ { "power8", "-mpower8" },
{ "power9", "-mpower9" },
{ "power10", "-mpower10" },
{ "a2", "-ma2" },
{ "powerpc", "-mppc" },
{ "powerpc64", "-mppc64" },
- { "powerpc64le", "%{mpower9-vector:-mpower9;:-mpower8}" },
+ { "powerpc64le", "-mpower8" },
{ "rs64", "-mppc64" },
{ "401", "-mppc" },
{ "403", "-m403" },
@@ -526,8 +526,7 @@ static const struct asm_name asm_names[] = {
{ "e6500", "-me6500" },
{ "titan", "-mtitan" },
{ NULL, "\
-%{mpower9-vector: -mpower9; \
- mpower8-vector|mcrypto|mdirect-move|mhtm: -mpower8; \
+%{mcrypto|mdirect-move|mhtm: -mpower8; \
mvsx: -mpower7; \
mpowerpc64: -mppc64; \
: %(asm_default)}" },
diff --git a/gcc/config/rs6000/rs6000-cpus.def b/gcc/config/rs6000/rs6000-cpus.def
index 276f3cdecaf1..28249600318f 100644
--- a/gcc/config/rs6000/rs6000-cpus.def
+++ b/gcc/config/rs6000/rs6000-cpus.def
@@ -86,21 +86,15 @@
| OPTION_MASK_POWER10 \
| OTHER_POWER10_MASKS)
-/* Flags that need to be turned off if -mno-power9-vector. */
-#define OTHER_P9_VECTOR_MASKS (OPTION_MASK_FLOAT128_HW \
- | OPTION_MASK_P9_MINMAX)
-
-/* Flags that need to be turned off if -mno-power8-vector. */
-#define OTHER_P8_VECTOR_MASKS (OTHER_P9_VECTOR_MASKS \
- | OPTION_MASK_P9_VECTOR \
- | OPTION_MASK_DIRECT_MOVE \
- | OPTION_MASK_CRYPTO)
-
/* Flags that need to be turned off if -mno-vsx. */
-#define OTHER_VSX_VECTOR_MASKS (OTHER_P8_VECTOR_MASKS \
- | OPTION_MASK_EFFICIENT_UNALIGNED_VSX \
+#define OTHER_VSX_VECTOR_MASKS (OPTION_MASK_EFFICIENT_UNALIGNED_VSX \
| OPTION_MASK_FLOAT128_KEYWORD \
- | OPTION_MASK_P8_VECTOR)
+ | OPTION_MASK_P8_VECTOR \
+ | OPTION_MASK_DIRECT_MOVE \
+ | OPTION_MASK_CRYPTO \
+ | OPTION_MASK_P9_VECTOR \
+ | OPTION_MASK_FLOAT128_HW \
+ | OPTION_MASK_P9_MINMAX)
/* Flags that need to be turned off if -mno-altivec. */
#define OTHER_ALTIVEC_MASKS (OTHER_VSX_VECTOR_MASKS \
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index a2a679d8eeda..6ba9df4f02e7 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -3866,8 +3866,8 @@ rs6000_option_override_internal (bool global_init_p)
dwarf_offset_size = POINTER_SIZE_UNITS;
#endif
- /* Handle explicit -mno-{altivec,vsx,power8-vector,power9-vector} and turn
- off all of the options that depend on those flags. */
+ /* Handle explicit -mno-{altivec,vsx} and turn off all of
+ the options that depend on those flags. */
ignore_masks = rs6000_disable_incompatible_switches ();
/* For the newer switches (vsx, dfp, etc.) set some of the older options,
@@ -3947,31 +3947,10 @@ rs6000_option_override_internal (bool global_init_p)
}
if (TARGET_P8_VECTOR && !TARGET_ALTIVEC)
- {
- if (rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR)
- error ("%qs requires %qs", "-mpower8-vector", "-maltivec");
- rs6000_isa_flags &= ~OPTION_MASK_P8_VECTOR;
- }
+ rs6000_isa_flags &= ~OPTION_MASK_P8_VECTOR;
if (TARGET_P8_VECTOR && !TARGET_VSX)
- {
- if ((rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR)
- && (rs6000_isa_flags_explicit & OPTION_MASK_VSX))
- error ("%qs requires %qs", "-mpower8-vector", "-mvsx");
- else if ((rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR) == 0)
- {
- rs6000_isa_flags &= ~OPTION_MASK_P8_VECTOR;
- if (rs6000_isa_flags_explicit & OPTION_MASK_VSX)
- rs6000_isa_flags_explicit |= OPTION_MASK_P8_VECTOR;
- }
- else
- {
- /* OPTION_MASK_P8_VECTOR is explicit, and OPTION_MASK_VSX is
- not explicit. */
- rs6000_isa_flags |= OPTION_MASK_VSX;
- rs6000_isa_flags_explicit |= OPTION_MASK_VSX;
- }
- }
+ rs6000_isa_flags &= ~OPTION_MASK_P8_VECTOR;
if (TARGET_DFP && !TARGET_HARD_FLOAT)
{
@@ -4058,28 +4037,7 @@ rs6000_option_override_internal (bool global_init_p)
/* ISA 3.0 vector instructions include ISA 2.07. */
if (TARGET_P9_VECTOR && !TARGET_P8_VECTOR)
- {
- /* We prefer to not mention undocumented options in
- error messages. However, if users have managed to select
- power9-vector without selecting power8-vector, they
- already know about undocumented flags. */
- if ((rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) &&
- (rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR))
- error ("%qs requires %qs", "-mpower9-vector", "-mpower8-vector");
- else if ((rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) == 0)
- {
- rs6000_isa_flags &= ~OPTION_MASK_P9_VECTOR;
- if (rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR)
- rs6000_isa_flags_explicit |= OPTION_MASK_P9_VECTOR;
- }
- else
- {
- /* OPTION_MASK_P9_VECTOR is explicit and
- OPTION_MASK_P8_VECTOR is not explicit. */
- rs6000_isa_flags |= OPTION_MASK_P8_VECTOR;
- rs6000_isa_flags_explicit |= OPTION_MASK_P8_VECTOR;
- }
- }
+ rs6000_isa_flags &= ~OPTION_MASK_P9_VECTOR;
/* Set -mallow-movmisalign to explicitly on if we have full ISA 2.07
support. If we only have ISA 2.06 support, and the user did not specify
@@ -25190,12 +25148,6 @@ rs6000_print_isa_options (FILE *file, int indent, const char *string,
2.07, and 3.0 options that relate to the vector unit (-mdirect-move,
-mupper-regs-df, etc.).
- If the user used -mno-power8-vector, we need to turn off all of the implicit
- ISA 2.07 and 3.0 options that relate to the vector unit.
-
- If the user used -mno-power9-vector, we need to turn off all of the implicit
- ISA 3.0 options that relate to the vector unit.
-
This function does not handle explicit options such as the user specifying
-mdirect-move. These are handled in rs6000_option_override_internal, and
the appropriate error is given if needed.
@@ -25214,8 +25166,6 @@ rs6000_disable_incompatible_switches (void)
const HOST_WIDE_INT dep_flags; /* flags that depend on this option. */
const char *const name; /* name of the switch. */
} flags[] = {
- { OPTION_MASK_P9_VECTOR, OTHER_P9_VECTOR_MASKS, "power9-vector" },
- { OPTION_MASK_P8_VECTOR, OTHER_P8_VECTOR_MASKS, "power8-vector" },
{ OPTION_MASK_VSX, OTHER_VSX_VECTOR_MASKS, "vsx" },
{ OPTION_MASK_ALTIVEC, OTHER_ALTIVEC_MASKS, "altivec" },
};
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 2291fe8d3a34..68bc45d65baa 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -103,13 +103,12 @@
/* Common ASM definitions used by ASM_SPEC among the various targets for
handling -mcpu=xxx switches. There is a parallel list in driver-rs6000.cc to
provide the default assembler options if the user uses -mcpu=native, so if
- you make changes here, make them also there. PR63177: Do not pass -mpower8
- to the assembler if -mpower9-vector was also used. */
+ you make changes here, make them also there. */
#define ASM_CPU_SPEC \
"%{mcpu=native: %(asm_cpu_native); \
mcpu=power10: -mpower10; \
mcpu=power9: -mpower9; \
- mcpu=power8|mcpu=powerpc64le: %{mpower9-vector: -mpower9;: -mpower8}; \
+ mcpu=power8|mcpu=powerpc64le: -mpower8; \
mcpu=power7: -mpower7; \
mcpu=power6x: -mpower6 %{!mvsx:%{!maltivec:-maltivec}}; \
mcpu=power6: -mpower6 %{!mvsx:%{!maltivec:-maltivec}}; \
@@ -163,8 +162,7 @@
mcpu=e5500: -me5500; \
mcpu=e6500: -me6500; \
mcpu=titan: -mtitan; \
- !mcpu*: %{mpower9-vector: -mpower9; \
- mpower8-vector|mcrypto|mdirect-move|mhtm: -mpower8; \
+ !mcpu*: %{mcrypto|mdirect-move|mhtm: -mpower8; \
mvsx: -mpower7; \
mpowerpc64: -mppc64;: %(asm_default)}; \
:%eMissing -mcpu option in ASM_CPU_SPEC?\n} \
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 5e32ee9b685d..83197681b661 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -479,7 +479,7 @@ Target Undocumented Mask(P8_FUSION_SIGN) Var(rs6000_isa_flags)
Allow sign extension in fusion operations.
mpower8-vector
-Target Mask(P8_VECTOR) Var(rs6000_isa_flags)
+Target Undocumented Mask(P8_VECTOR) Var(rs6000_isa_flags) WarnRemoved
Use vector and scalar instructions added in ISA 2.07.
mpower10-fusion
@@ -522,7 +522,7 @@ Target Undocumented Mask(P9_MISC) Var(rs6000_isa_flags)
Use certain scalar instructions added in ISA 3.0.
mpower9-vector
-Target Undocumented Mask(P9_VECTOR) Var(rs6000_isa_flags)
+Target Undocumented Mask(P9_VECTOR) Var(rs6000_isa_flags) WarnRemoved
Use vector instructions added in ISA 3.0.
mpower9-minmax
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 2135dfde9c81..52b5a1f255e0 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -21381,8 +21381,8 @@ available on the PowerPC family of processors starting with ISA 2.07
or later. Unless specific options are explicitly disabled on the
command line, specifying option @option{-mcpu=power8} has the effect of
enabling all the same options as for @option{-mcpu=power7} in
-addition to the @option{-mpower8-fusion}, @option{-mpower8-vector},
-@option{-mcrypto}, @option{-mhtm}, @option{-mquad-memory}, and
+addition to the @option{-mpower8-fusion}, @option{-mcrypto},
+@option{-mhtm}, @option{-mquad-memory}, and
@option{-mquad-memory-atomic} options.
This section intentionally empty.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index b4e4ee9fb816..8219a6a59476 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -1317,7 +1317,7 @@ See RS/6000 and PowerPC Options.
-mveclibabi=@var{type} -mfriz -mno-friz
-mpointers-to-nested-functions -mno-pointers-to-nested-functions
-msave-toc-indirect -mno-save-toc-indirect
--mpower8-fusion -mno-mpower8-fusion -mpower8-vector -mno-power8-vector
+-mpower8-fusion -mno-mpower8-fusion
-mcrypto -mno-crypto -mhtm -mno-htm
-mquad-memory -mno-quad-memory
-mquad-memory-atomic -mno-quad-memory-atomic
@@ -31160,7 +31160,7 @@ following options:
-mpopcntb -mpopcntd -mpowerpc64
-mpowerpc-gpopt -mpowerpc-gfxopt
-mmulhw -mdlmzb -mmfpgpr -mvsx
--mcrypto -mhtm -mpower8-fusion -mpower8-vector
+-mcrypto -mhtm -mpower8-fusion
-mquad-memory -mquad-memory-atomic -mfloat128
-mfloat128-hardware -mprefixed -mpcrel -mmma
-mrop-protect}
@@ -31283,15 +31283,6 @@ Generate code that keeps (does not keeps) some integer operations
adjacent so that the instructions can be fused together on power8 and
later processors.
-@opindex mpower8-vector
-@opindex mno-power8-vector
-@item -mpower8-vector
-@itemx -mno-power8-vector
-Generate code that uses (does not use) the vector and scalar
-instructions that were added in version 2.07 of the PowerPC ISA. Also
-enable the use of built-in functions that allow more direct access to
-the vector instructions.
-
@opindex mquad-memory
@opindex mno-quad-memory
@item -mquad-memory
@@ -31323,13 +31314,12 @@ supported on Linux.
The default for @option{-mfloat128} is enabled on PowerPC Linux
systems using the VSX instruction set, and disabled on other systems.
-If you use the ISA 3.0 instruction set (@option{-mpower9-vector} or
-@option{-mcpu=power9}) on a 64-bit system, the IEEE 128-bit floating
-point support will also enable the generation of ISA 3.0 IEEE 128-bit
-floating point instructions. Otherwise, if you do not specify to
-generate ISA 3.0 instructions or you are targeting a 32-bit big endian
-system, IEEE 128-bit floating point will be done with software
-emulation.
+If you use the ISA 3.0 instruction set (@option{-mcpu=power9}) on a
+64-bit system, the IEEE 128-bit floating point support will also enable
+the generation of ISA 3.0 IEEE 128-bit floating point instructions.
+Otherwise, if you do not specify to generate ISA 3.0 instructions or you
+are targeting a 32-bit big endian system, IEEE 128-bit floating point
+will be done with software emulation.
@opindex mfloat128-hardware
@opindex mno-float128-hardware
diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
index 33b37e79cd4a..5730bda80dc8 100644
--- a/gcc/doc/md.texi
+++ b/gcc/doc/md.texi
@@ -3425,8 +3425,8 @@ Any condition register field, @code{cr0}@dots{}@code{cr7}.
The carry bit, @code{XER[CA]}.
@item we
-Like @code{wa}, if @option{-mpower9-vector} and @option{-m64} are used;
-otherwise, @code{NO_REGS}.
+Like @code{wa}, if this is a POWER9 or later and @option{-mvsx}
+and @option{-m64} are used; otherwise, @code{NO_REGS}.
@item wn
No register (@code{NO_REGS}).
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index 7b747bfa6cb0..efab862b94f0 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -2443,9 +2443,6 @@ PowerPC target supports hardware double-precision floating-point.
@item powerpc_htm_ok
PowerPC target supports @code{-mhtm}
-@item powerpc_p8vector_ok
-PowerPC target supports @code{-mpower8-vector}
-
@item powerpc_popcntb_ok
PowerPC target supports the @code{popcntb} instruction, indicating
that this target supports @code{-mcpu=power5}.
diff --git a/gcc/testsuite/g++.dg/pr69667.C b/gcc/testsuite/g++.dg/pr69667.C
index 422116dd5995..cfe25a82fb11 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -w -std=c++14" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -w -std=c++14" } */
/* 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 5879e72dfd21..4a1bf1889837 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 " } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 " } */
#include <altivec.h>
diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-1.C b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
index 1cf158c69097..c22c2c2d1a55 100644
--- a/gcc/testsuite/g++.target/powerpc/pr65240-1.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mno-fp-in-toc -Wno-return-type" } */
+/* { 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 } } */
/* 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 32d1c799b0db..99ca68cf7cd3 100644
--- a/gcc/testsuite/g++.target/powerpc/pr65240-2.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mfp-in-toc -Wno-return-type" } */
+/* { 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 } } */
/* 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 02567647f304..a8869d5510aa 100644
--- a/gcc/testsuite/g++.target/powerpc/pr65240-3.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
@@ -1,6 +1,6 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -Wno-return-type" } */
+/* { 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 } } */
/* 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 3f5c2eaa9099..278fe960159f 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
class A {
public:
diff --git a/gcc/testsuite/g++.target/powerpc/pr67211.C b/gcc/testsuite/g++.target/powerpc/pr67211.C
index 7d5dd42765fe..95d90dabd4a2 100644
--- a/gcc/testsuite/g++.target/powerpc/pr67211.C
+++ b/gcc/testsuite/g++.target/powerpc/pr67211.C
@@ -1,5 +1,5 @@
/* { dg-skip-if "" { *-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3 -w" } */
/* 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 7f12c8d5c90a..85b9f811d11e 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_p8vector_ok } */
-// { dg-options "-mdejagnu-cpu=power8 -O3 -fstack-protector" }
+// { dg-require-effective-target powerpc_vsx_ok } */
+// { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -fstack-protector" }
// 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 02632420744a..ee9747cc48bb 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_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target fpic } */
-/* { dg-options "-O3 -mdejagnu-cpu=power8 -g -fPIC -fvisibility=hidden -fstack-protector-strong" } */
+/* { dg-options "-O3 -mdejagnu-cpu=power8 -mvsx -g -fPIC -fvisibility=hidden -fstack-protector-strong" } */
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 562de0a60172..86401bd4629d 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -fstack-protector-strong" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -fstack-protector-strong" } */
class a {
double b[2];
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr70130.c b/gcc/testsuite/gcc.dg/vect/O3-pr70130.c
index 17ce6c392546..378ec5118aac 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr70130.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr70130.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target vsx_hw { target powerpc*-*-* } } */
-/* { dg-additional-options "-mcpu=power7 -mno-power9-vector -mno-power8-vector" { target powerpc*-*-* } } */
+/* { dg-additional-options "-mdejagnu-cpu=power7 -mvsx" { target powerpc*-*-* } } */
#include "tree-vect.h"
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 e5c4dceddfb7..624881b581f7 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_p9vector_ok } */
+/* { 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 -mpower9-vector" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9 -mvsx" } */
/* Verify we cost the exact count for required vec_perm. */
diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-1.c b/gcc/testsuite/gcc.dg/vect/pr109011-1.c
index 9bb8ee10a377..98362d6bc407 100644
--- a/gcc/testsuite/gcc.dg/vect/pr109011-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-1.c
@@ -3,7 +3,8 @@
/* { dg-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 "-mpower8-vector" { target powerpc_p8vector_ok } } */
+/* { 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 "-march=z13 -mzarch" { target s390_vx } } */
void
@@ -15,7 +16,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_p8vector_ok || s390_vx } } } } */
+/* { dg-final { scan-tree-dump-times " = \.POPCOUNT \\\(vect" 1 "optimized" { target { powerpc_vsx_ok || s390_vx } } } } */
void
bar (long long *p, long long *q)
@@ -26,4 +27,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_p8vector_ok || s390_vx } } } } */
+/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 1 "optimized" { target { powerpc_vsx_ok || s390_vx } } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-2.c b/gcc/testsuite/gcc.dg/vect/pr109011-2.c
index 6d18eb28bcf2..a737e3fa03ae 100644
--- a/gcc/testsuite/gcc.dg/vect/pr109011-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-2.c
@@ -2,7 +2,8 @@
/* { dg-do compile } */
/* { dg-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 "-mpower9-vector" { target powerpc_p9vector_ok } } */
+/* { 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 "-march=z13 -mzarch" { target s390_vx } } */
void
@@ -30,6 +31,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_p9vector_ok } } } */
+/* { dg-final { scan-tree-dump-times " = \.CTZ \\\(vect" 3 "optimized" { target powerpc_vsx_ok } } } */
/* { 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 0c6c82617903..21c364dfdfd9 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-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 "-mpower8-vector -mno-power9-vector" { target powerpc_p8vector_ok } } */
+/* { dg-additional-options "-mdejagnu-cpu=power8 -mvsx" { target powerpc_vsx_ok } } */
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_p8vector_ok } } } */
+/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 3 "optimized" { target powerpc_vsx_ok } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-4.c b/gcc/testsuite/gcc.dg/vect/pr109011-4.c
index 7bb337794b9a..76af78842248 100644
--- a/gcc/testsuite/gcc.dg/vect/pr109011-4.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-4.c
@@ -2,7 +2,8 @@
/* { dg-do compile } */
/* { dg-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 "-mpower9-vector" { target powerpc_p9vector_ok } } */
+/* { 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 "-march=z13 -mzarch" { target s390_vx } } */
void
@@ -30,6 +31,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_p9vector_ok } } } */
+/* { dg-final { scan-tree-dump-times " = \.CTZ \\\(vect" 3 "optimized" { target powerpc_vsx_ok } } } */
/* { 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 61fac0bb5492..19dbfb3356a6 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-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 "-mpower8-vector -mno-power9-vector" { target powerpc_p8vector_ok } } */
+/* { dg-additional-options "-mdejagnu-cpu=power8 -mvsx" { target powerpc_vsx_ok } } */
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_p8vector_ok } } } */
+/* { dg-final { scan-tree-dump-times " = \.CLZ \\\(vect" 3 "optimized" { target powerpc_vsx_ok } } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr48765.c b/gcc/testsuite/gcc.dg/vect/pr48765.c
index b091a145d0f6..23748a9f151b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr48765.c
+++ b/gcc/testsuite/gcc.dg/vect/pr48765.c
@@ -1,6 +1,5 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" } { "-mcpu=power6" } } */
-/* { dg-additional-options "-O3 -mcpu=power6 -mno-power9-vector -mno-power8-vector -mno-vsx" } */
+/* { dg-additional-options "-O3 -mdejagnu-cpu=power6 -mno-vsx" } */
enum reg_class
{
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c b/gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c
index 041edcb213db..7d1eda909f70 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-2-runnable.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
@@ -33,7 +34,7 @@ int main ()
/* Use of 'double' and ‘long long’ in AltiVec types requires -mvsx */
/* __builtin_altivec_vupkhsw and __builtin_altivec_vupklsw
- requires the -mpower8-vector option */
+ requires the -mcpu=power8 -mvsx option */
vec_bi_arg = (vector bool int){ 0, 1, 1, 0 };
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-35.c b/gcc/testsuite/gcc.target/powerpc/altivec-35.c
index 08365285b092..8173dca94ac4 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-35.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-35.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-options "-maltivec -mno-vsx -mno-power8-vector -O0" } */
+/* { dg-options "-maltivec -mno-vsx -O0" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-37.c b/gcc/testsuite/gcc.target/powerpc/altivec-37.c
index 06d4bb155f0e..2a84e0bdb357 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-37.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-37.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -mvsx" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
@@ -14,7 +15,7 @@ int main ()
/* use of ‘long long’ in AltiVec types requires -mvsx */
/* __builtin_altivec_vupkhsw and __builtin_altivec_vupklsw
- requires the -mpower8-vector option */
+ requires the -mcpu=power8 and -mvsx option */
*vecublli++ = vec_unpackh(vecubi[0]);
*vecublli++ = vec_unpackl(vecubi[0]);
*vecslli++ = vec_unpackh(vecsi[0]);
diff --git a/gcc/testsuite/gcc.target/powerpc/amo1.c b/gcc/testsuite/gcc.target/powerpc/amo1.c
index 152f0e5874b0..d2a67d81bc5d 100644
--- a/gcc/testsuite/gcc.target/powerpc/amo1.c
+++ b/gcc/testsuite/gcc.target/powerpc/amo1.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mpower9-vector -mpower9-misc -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -mpower9-misc -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
/* Verify P9 atomic memory operations. */
diff --git a/gcc/testsuite/gcc.target/powerpc/amo2.c b/gcc/testsuite/gcc.target/powerpc/amo2.c
index cc7cfe4b450e..9cb493da53e9 100644
--- a/gcc/testsuite/gcc.target/powerpc/amo2.c
+++ b/gcc/testsuite/gcc.target/powerpc/amo2.c
@@ -1,6 +1,7 @@
/* { dg-do run { target { powerpc*-*-linux* && { lp64 && p9vector_hw } } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-O2 -mpower9-vector -mpower9-misc" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mvsx -mpower9-misc" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
#include <amo.h>
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/atomic-p8.c b/gcc/testsuite/gcc.target/powerpc/atomic-p8.c
index 1588d74ad8d1..b24ca4cbfd87 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 1fc96ae4228e..94b21ba99731 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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-2.c b/gcc/testsuite/gcc.target/powerpc/bcd-2.c
index 95c3699a144c..a5b4f2cf3d61 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 9891f4ff08ed..ff35ef54eb35 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 92fea8937b44..f1b3bc3fd538 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 fec8b9b577ab..720ba5d5fa90 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 604dbbc0a979..46c459cbb76f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 0eb99ce53985..e412d73f7d06 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 33f155518ac5..bd9f5229de2e 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 2f01b87fe551..b9f306dd0765 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 511f79f4af8e..ca25ac24c7a1 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 6ee364fd40de..77302a3d9f52 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 75969c28a593..6045bda6c4cb 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 48528590fc94..1893fc5eb56e 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 8bc1eac1495f..45acdb4a5e74 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 f59b4a352800..64176314058e 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 d971833748e8..b59fdd6d3f71 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 1cb438f9b701..32179cd134ac 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 8ddf87cfc869..48a0ee2117f9 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 850ff6204900..ae3ab80873fd 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 8cbb3191e31d..79956d7698b7 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 d22f7d1b2744..92e894413edd 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* { 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 64747d73a515..848fce33d860 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* { 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 148b5fbd9fa1..b8c89ac00c5a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 3225a557f84b..d3ae94b4f007 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 32a53c6fffd7..24e382fe494b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 f3b64734d107..7f86801e2285 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 88d775641583..ae345915f5be 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* { 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 2f219ddc83ae..50a21f9aa68f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* { 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 769d3b0546a6..743cf4401bc2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 bee5460b60e9..469f6d94eab6 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 956c1183beb6..a3ab1f2d007a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 afa2b83f2d28..fe0a7a7eac6c 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* { 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 6dc06dd34ea2..7078a677eaa8 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* { 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 9a7949fb89a9..5ccc7aee9621 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 f81dff4e1adc..3aca1ae7770b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 2e03e15d0254..2651745c1619 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 b1be8284b4e5..265b4ae1cbe9 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 209f82dd7996..84a0156c2e64 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 a74028be4896..7d69447f7382 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 ec31cff9232d..403f54ba6b79 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 fcf6a9dca79d..45f380f9ce59 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
@@ -2,8 +2,8 @@
/* 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 7c6fca2b7292..170f641b587c 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 9130c9714bfd..b519dd6dcd2f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 b863bb2bc274..3beb620a9523 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 83ddffa77a36..1687f965d715 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 101a919c9e4a..465af2db76ff 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 7fb6601e54b1..014ebb713fd6 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 02e9ec51881a..4c46db9f5b87 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 a9e107a816cf..7fa834e879cd 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 f87851c2c5f2..3998d45fe411 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 cebca0a468bb..941187efe547 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 65a6462e5a5d..215437c79d4f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 46d743a899b5..abdac3ade491 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 bfc892b116eb..f4774a937e70 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 4a3f25e7f634..112023cf9230 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 8c55c1cfb5ca..3bee45d9851a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 4147891445f4..9979aa988603 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 ca67a750cca9..981bcb474197 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 86d0260ccd84..efd7d4abf3ec 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 e909a2648be9..94f8c79dfac8 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 afac62360c2b..03a91b228d69 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 ee243fe11c6f..60e090d489e8 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 eab667304ef7..4f079e81e006 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 ab1967b1be97..7843cb5cd764 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 dcdf6688bdb1..96dc96a70979 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 5f2c350b5525..fcc6bee6352d 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 6aa6b4039874..6d8198ff9cd0 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 ab4c2f1f2e39..b4b88c2d9b56 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 d69a315eeaa0..c654f7ec323f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 95ceb835f572..f0a41e16df3b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 70ed82b6a20a..0a893a10276d 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 eb5dda41e5ba..b0f81a5cf803 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 ddf8bb430605..1cad09ccf837 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 90dcf1364984..4baa2ae4aa2f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 f53efdc02484..f463152e5214 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 5ec7019e7a07..e0e346a547f5 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 448406c0d477..f6fa7d046534 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 64a52a154391..29387071b995 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 5f35e0e368a4..41652778456e 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 bda2c6d9db38..d6301d07ea17 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/bool2-p8.c b/gcc/testsuite/gcc.target/powerpc/bool2-p8.c
index 76f6043b101a..545d523608c7 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
/* { 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-p8.c b/gcc/testsuite/gcc.target/powerpc/bool3-p8.c
index 3660e69b0f37..f2b1b1df5e7e 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
/* { 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 28cd1aa6b1a9..155895ffef87 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { dg-additional-options "-mbig" { target powerpc64le-*-* } } */
#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 1633dfab3934..e5a7db6d83d4 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_p8vector_ok } */
-/* { dg-options "-maltivec -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -mdejagnu-cpu=power8 -mvsx" } */
#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 96bdc4852ecf..c354fd5f198b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O1" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-4-int128-runnable.c b/gcc/testsuite/gcc.target/powerpc/builtins-4-int128-runnable.c
index 4f4e7a9ee5e4..62c11132cf33 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-4-int128-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-4-int128-runnable.c
@@ -1,7 +1,8 @@
/* { dg-do run } */
/* { dg-require-effective-target int128 } */
/* { dg-require-effective-target p8vector_hw } */
-/* { dg-options "-mpower8-vector" } */
+/* { dg-options "-mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <inttypes.h>
#include <altivec.h> // vector
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-5.c b/gcc/testsuite/gcc.target/powerpc/builtins-5.c
index c6c7ebf3aefd..fc3cf211d372 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O0 -dp" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O0 -dp" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-9.c b/gcc/testsuite/gcc.target/powerpc/builtins-9.c
index fa486e06102b..d1b7dba8f3c2 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_p8vector_ok } */
-/* { dg-options "-maltivec -mdejagnu-cpu=power8 -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -mdejagnu-cpu=power8 -mvsx -O3" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-mergew-mergow.c b/gcc/testsuite/gcc.target/powerpc/builtins-mergew-mergow.c
index 51c8701f22f3..e17f20092de5 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-mergew-mergow.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-mergew-mergow.c
@@ -1,6 +1,7 @@
/* { dg-do run } */
/* { dg-require-effective-target p8vector_hw } */
-/* { dg-options "-mpower8-vector" } */
+/* { dg-options "-mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h> // vector
#include <stdlib.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 647186d16786..c93e2eff5c21 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 3a07f7fba9d1..59040a53c932 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 960317738cdc..12668b77b3bd 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 ec1740d79301..fb97f3efe529 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 16126bf49c71..b709378537e2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 53fa5d8b3290..6b8b414935d7 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 4c676ba356dd..bbdcbbd08f57 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/clone1.c b/gcc/testsuite/gcc.target/powerpc/clone1.c
index 74323ca0e8c1..0506b141fc22 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 -O2" } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { 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/clone2.c b/gcc/testsuite/gcc.target/powerpc/clone2.c
index ecad5eb8e293..e64940b79527 100644
--- a/gcc/testsuite/gcc.target/powerpc/clone2.c
+++ b/gcc/testsuite/gcc.target/powerpc/clone2.c
@@ -1,6 +1,6 @@
/* { dg-do run { target { powerpc*-*-linux* } } } */
/* { dg-options "-mvsx -O2" } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target ppc_cpu_supports_hw } */
#include <stddef.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c
index 89895bd7097b..b8ff3b5760b1 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { 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" } */
#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 b3a6c737a3ef..734f1ac29f32 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8 -mno-crypto" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -mno-crypto" } */
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 a36a5c8b68c4..0481d0233b1d 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { 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" } */
#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 74d305a8fbc5..ebff89f3ea03 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/darn-0.c b/gcc/testsuite/gcc.target/powerpc/darn-0.c
index 64d98f5f91d7..ca339a1cebad 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 f483a89862d0..d3a2a6202f4f 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/darn-2.c b/gcc/testsuite/gcc.target/powerpc/darn-2.c
index 56a9ffb677b4..0bbd69be3c7b 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/dform-1.c b/gcc/testsuite/gcc.target/powerpc/dform-1.c
index 1a0b0cf4c342..9d0e87025541 100644
--- a/gcc/testsuite/gcc.target/powerpc/dform-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/dform-1.c
@@ -1,8 +1,9 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { 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 "-mpower9-vector -O2 -fno-tree-vectorize" } */
+/* { dg-options "-mvsx -O2 -fno-tree-vectorize" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
#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 cc91f55b82df..d9d011163872 100644
--- a/gcc/testsuite/gcc.target/powerpc/dform-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/dform-2.c
@@ -1,8 +1,9 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { 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 "-mpower9-vector -O2 -fno-tree-vectorize" } */
+/* { dg-options "-mvsx -O2 -fno-tree-vectorize" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
#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 d4114f5578b9..84885ecbcb6f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#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 4f7562b9c38e..4903184a8da7 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 6338a0e4278a..6e1750d37ff2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 822030bf7379..b8d5662d2a1b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 044e7683cf16..706ba22ff685 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 4feb39187679..642814adcae3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 cc54c6b265e9..ec22452349a4 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 ef4d6ad707b0..1b9fe4178804 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 54d2557fa2f2..19158a18feda 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 8626c579a25b..da3ba1cb6446 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 5a9ab5126fc9..6c5b608ba153 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 8ce9390feaff..c612e6672e1f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 f1918a251c2a..586b43a6cef2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 b353d63f5a5c..daf123089590 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 ee098bcb999f..03e8c2eec072 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 0d47cc278977..0d157eea92a1 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 464dc66d4576..3d9249bbcaff 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 236f39393e04..66bc0d2052fa 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 6e5e07b1c88b..eb58202c34af 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 1390c8381f81..98dbba4956a9 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 f070a0c4a7be..9a96dd9a1e7b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 d8760cefc945..6ffd1e7582b9 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 a2b922955f6c..f8dbc8d70bf3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 fed06bbbb6c8..dcc85579a36f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 af07fbb4a01e..01c0d69d2f3a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 6d8869e5435e..d7a8df16bc5b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 439fcb2a548a..97bf3d5d814a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 868146c8f53c..2ca7e1183351 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 6d978a097500..92539502b1b6 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 de174998d218..0731a8964328 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 fdafaf9ceb85..5dd564ec1bba 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 822f6d57003f..e7aca95cefba 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 1e5ff356ceb1..01f7154d96f3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 fce744cd916d..6f8fddb72f69 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 b5f886d861af..ee7799956892 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 ad840bf54655..485f8a71b5b3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 4663fc653bb0..a6a2c592df8d 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 451a9e74c287..a790ed57c230 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 586c86f2ab72..68827dcd2313 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 9c194374187d..0e4c4bc15a93 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 dc01b7fc6141..dc3580a70ec9 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 5c6fcc4ec837..3097f1ef2814 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 d0833c80f605..a36df7f473ae 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 9ff41263531a..a49dfea99494 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 9a94371da350..65a920f6aacf 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 5040ac87ed6e..1d4db3300bf8 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 6f57baf01500..c5be1ca11f0b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 25b35ed4bc9c..d67c0a375bc1 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 e6b5fe5469ef..a35903412b3b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 a79e6b5dbb12..817ea469e1b9 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 d11f497b1372..85e2ec827df8 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 5e9a93fd05ed..57590d850475 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 912ae7f3492e..6646d8e91b75 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 218d2f64d3ef..b80d4fefaea8 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 ec2abc6499f7..04f729d2c7b2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 0626d87d9be6..ff81cbbcf706 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 6f63d0f831fb..dfd566d0c97f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 d889bdd385c2..c3ab62d4614c 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 c584d988b4bc..06c2ed8e19ea 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 1a54150617ef..dbdf64fbe299 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 4786be7bb488..f0f8cbbf9439 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 e7d2a27ecfd6..527f656d6680 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 c406d4d1ca87..f2de23ab4114 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 7c75265de08c..a1ddc103a500 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 74269fac3284..b7adb7eaa4d2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 d7b3b6f01aca..9f4961c17531 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 1bda795b55a6..35de6a5f9c79 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 bc9ced3ceb00..ed9bc04b9211 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 dcfe162c832f..52a34f625757 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 875354c9ab86..7ef9f4cbf16d 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 68758cf535a2..1848b1e72751 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 04d950e3df54..55aa7c87bcb6 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 f368c38204bb..8c525ca4049f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 369312d84ea3..c8b108da1ff2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 910fb7d98c89..089a71fd13a6 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
/* 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 d867a987df85..f3354797386e 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 ca6c739a0456..6bca0d62f6e3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 3034300f72bf..300e5b6b7966 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 9ee60cfe8e29..53ac646630ed 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 28bc10c31459..59df46e44583 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 9a9ff3899f27..c6749f2ebc0a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx" } */
#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 e75daec24567..03402f1d14e2 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 285aca65ca4d..5e5097be5206 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 f6c5f23808af..0eb194562862 100644
--- a/gcc/testsuite/gcc.target/powerpc/direct-move-float3.c
+++ b/gcc/testsuite/gcc.target/powerpc/direct-move-float3.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* 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 ad90b2ed2329..931f1e917546 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 16f2674fc711..1d06cd8a28f3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 2db8dbcfd866..8e22297b1593 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 e34ed40bac21..223f413453c6 100644
--- a/gcc/testsuite/gcc.target/powerpc/divkc3-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/divkc3-2.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target longdouble128 } */
-/* { dg-options "-O2 -mpower8-vector -mabi=ieeelongdouble -Wno-psabi" } */
+/* { dg-options "-O2 -mvsx -mabi=ieeelongdouble -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* 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 c0fda8b24527..3a33b506304d 100644
--- a/gcc/testsuite/gcc.target/powerpc/divkc3-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/divkc3-3.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target longdouble128 } */
-/* { dg-options "-O2 -mpower8-vector -mabi=ibmlongdouble -Wno-psabi" } */
+/* { dg-options "-O2 -mvsx -mabi=ibmlongdouble -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* 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/float128-5.c b/gcc/testsuite/gcc.target/powerpc/float128-5.c
index 17f2fb203c3e..85da4b870926 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-5.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-O2 -mpower9-vector -mno-float128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mvsx -mno-float128" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
/* 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-complex-2.c b/gcc/testsuite/gcc.target/powerpc/float128-complex-2.c
index 01f45b1ad981..339af47f39e6 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-complex-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-complex-2.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target { powerpc*-*-linux* } } } */
/* { dg-require-effective-target powerpc_float128_hw_ok } */
-/* { dg-options "-O2 -mpower9-vector -mfloat128-hardware" } */
+/* { dg-options "-O2 -mvsx -mfloat128-hardware" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
#ifndef NO_FLOAT
typedef _Complex float float_complex;
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-fma1.c b/gcc/testsuite/gcc.target/powerpc/float128-fma1.c
index 5c90e7eac48d..1ce1caa96c07 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-fma1.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-fma1.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
__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 8c9beafa90ad..74c0e92e07f6 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
#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 539337c78791..983c372da5f7 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw10.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw10.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
extern _Float128 floorf128 (_Float128);
extern _Float128 ceilf128 (_Float128);
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw11.c b/gcc/testsuite/gcc.target/powerpc/float128-hw11.c
index dc78cf2f6165..a3fe8d0b95d6 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw11.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw11.c
@@ -1,7 +1,8 @@
/* { dg-do run { target lp64 } } */
/* { dg-require-effective-target p9vector_hw } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-hw2.c b/gcc/testsuite/gcc.target/powerpc/float128-hw2.c
index 1e3408b3757b..663032e2e69f 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw2.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw2.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2 -ffast-math -std=gnu11" } */
+/* { dg-options "-mvsx -O2 -ffast-math -std=gnu11" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
/* 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 630c93dfcb7d..7f9bb6ce5155 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw3.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw3.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2 -ffast-math -std=c11 -mno-pcrel" } */
+/* { dg-options "-mvsx -O2 -ffast-math -std=c11 -mno-pcrel" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
/* 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 fc149169bc63..c07d34dc33bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw4.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw4.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2 -mabi=ieeelongdouble -Wno-psabi" } */
+/* { dg-options "-mvsx -O2 -mabi=ieeelongdouble -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
/* 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 b0edafbd3f44..3dd960a1f599 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw5.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw5.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2 -ffast-math" } */
+/* { dg-options "-mvsx -O2 -ffast-math" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
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 a96edc8b1b60..05bb2dc5320e 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw6.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw6.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
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 ffed847095ca..300ca2367b0f 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw7.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw7.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
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 23f9ec23577b..6555fed923bd 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw8.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw8.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
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 e37fd1b63976..ac6cf686e830 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-hw9.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-hw9.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2 -ffast-math" } */
+/* { dg-options "-mvsx -O2 -ffast-math" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
extern _Float128 sqrtf128 (_Float128);
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-minmax.c b/gcc/testsuite/gcc.target/powerpc/float128-minmax.c
index ef8f729d9c28..e9ace19ef091 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-minmax.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-minmax.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target ppc_float128_hw } */
-/* { dg-options "-mpower9-vector -O2 -ffast-math" } */
+/* { dg-options "-mvsx -O2 -ffast-math" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
#ifndef TYPE
#define TYPE _Float128
diff --git a/gcc/testsuite/gcc.target/powerpc/float128-odd.c b/gcc/testsuite/gcc.target/powerpc/float128-odd.c
index 8c8a34c74cae..3b82568d1bed 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-odd.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-odd.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
/* 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 7020664e4fdd..ca9b24adcb2d 100644
--- a/gcc/testsuite/gcc.target/powerpc/float128-sqrt1.c
+++ b/gcc/testsuite/gcc.target/powerpc/float128-sqrt1.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target float128 } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
__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 53f9e357535a..0fbd7f2cb058 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -mno-float128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -mno-float128" } */
/* 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 02dbad1fa4f2..459402133cb1 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -mno-float128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mno-float128" } */
/* 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-int-fwrapv.p9.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p9.c
index 07d5890567ab..d7fc9d30eb84 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_p9vector_ok } */
-/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9 -fwrapv" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9 -mvsx -fwrapv" } */
#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 3c0ffb01b362..569104e9aadf 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_p9vector_ok } */
-/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9 -mvsx" } */
#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 6c3108c60c78..cd681d63a225 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,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2 -fwrapv" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2 -fwrapv" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 5b746e51327f..d4062a70b227 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_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#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 fb8dffc09fae..471244b74d41 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_p9vector_ok } */
-/* { dg-options "-mpower9-vector -O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
#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 4f5148ed2374..edd2c4e3031c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 6a499f4c0428..9650a470017f 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_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#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 fb8dffc09fae..471244b74d41 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_p9vector_ok } */
-/* { dg-options "-mpower9-vector -O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
#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 389a20ccfd26..3db3ff104f77 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-4.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-maltivec -mvsx -mpower8-vector" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 71de0b6a22b9..38f1fcb6b9ab 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-7.c
@@ -2,9 +2,10 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
-/* { dg-options "-maltivec -mvsx -mpower8-vector" } */
+/* { dg-options "-maltivec -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
#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 bf17dea86569..606b773c745e 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_p8vector_ok } */
-/* { dg-options "-mpower8-vector -mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#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 66c14cf166f9..385df08a7db2 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_p9vector_ok } */
-/* { dg-options "-mpower8-vector -mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include "fold-vec-cmp-char.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 0da58e0e0a9c..5de4ff99a99a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.h
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-int.h
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.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 c8ce72c1e6db..8a5128ef7d0f 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_p8vector_ok } */
-/* { dg-options "-mpower8-vector -mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#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 3ece8fc8bef1..9f5b4bd939a6 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,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mpower9-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
#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 536ee75a8546..36f90b1735dc 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 5729db4aaee8..596be67f9d15 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.h
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cmp-short.h
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 36cad0c89d93..832ea69e27f9 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_p8vector_ok } */
-/* { dg-options "-mpower8-vector -mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#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 46b1be1f5c42..87a87f3a78e9 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_p9vector_ok } */
-/* { dg-options "-mpower9-vector -mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#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 61dfbccd672f..4257bef76cea 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-char.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-maltivec -mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 ae4dd5776928..36ff16594af1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-int.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-maltivec -mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 1a72a2d38c7f..1811a6f3d64f 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mvsx -mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 0f05cace2e65..afecc249a5c7 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-cntlz-short.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-maltivec -mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
--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 f3b9556b2e65..2f6589999ec3 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
// 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 8a4c380edad5..f96eb7b91b01 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 " } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 " } */
/* { 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 2b8dbb0182ab..42e83f46583f 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
// targeting P8, BE and LE. 2 tests.
// P8 (LE) constants: xxlor
--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 4b1d75ee26d0..ce4e43c1fb46 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
// 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 aaa8a92b1629..19a84e9fe382 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 " } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 " } */
/* { 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.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-int.p8.c
index f5f953320d82..152fbdd041be 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
// 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 1abf19da40d4..d6e71b9e7e9d 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 " } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 " } */
// Targeting P9 (LE). 6 tests total.
// P9 constant: li, vextuwrx, (1:extsw)
--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 8ddce3fd2d85..a49822d52aaf 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
// 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 29814ed13dbe..0b83f3858d66 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
// targeting P9 (LE), six tests.
// p9 constants: mfvsrd
--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 0ddecb4e4b55..9eabc5068d49 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
// 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 fac35cb792ff..7e6c122fbfab 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
// 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 e0c7ee17bde4..209f3c45a89c 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
/* 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 c18444d50b6e..7fdcad562c48 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_p9vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
/* 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-float-p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-insert-float-p8.c
index 1866ce271764..fef29c84190b 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#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 1c5767231464..c2eacc0cdbd9 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_p9vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
#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 bcee9b2989e2..78e74ec9af3b 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#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 5512810ee46e..95c03edaa724 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_p9vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
#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 8ca4ac724433..bf982b6a8807 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#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 0d9d4e78d5ff..2ac723001489 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#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 050adb2c49ea..10fb3c3497ee 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_p9vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
#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 9b4a952d6f01..d5dd84c4c39b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 6810848dee1c..75d913b3321c 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,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 d206cfe7d663..edbf2d4ff37d 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,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 56b7cac503dd..7a1ff0b4ce11 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,8 +2,9 @@
double inputs for VSX produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 f5d292e8550d..ea0785277e5a 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,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 342b2bd8ec74..45673c10f607 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,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 79ca8aa90296..995c6cbcf7d0 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,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 10c69d3d87b5..d15ee5b02cfa 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,8 +2,9 @@
* long long inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
@@ -153,7 +154,7 @@ test6_nor (vector unsigned long long x, vector unsigned long long y)
// The number of xxlor instructions generated varies between 6 and 24 for
// older systems (power6,power7), as well as for 32-bit versus 64-bit targets.
-// For simplicity, this test now only targets "powerpc_p8vector_ok" environments
+// For simplicity, this test now only targets "powerpc_vsx_ok" environments
// where the answer is expected to be 6.
/* { dg-final { scan-assembler-times {\mxxlor\M} 6 } } */
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 7fe3e0b8e0e9..62a084f34ea5 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,8 +3,9 @@
* vec_nand) were added as part of ISA 2.07 (P8). */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O1" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 61d34059b675..4dde6bc9f8a4 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,8 +3,9 @@
* vec_nand) were added as part of ISA 2.07 (P8). */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O1" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 d33006c17e0e..a8af3b059b97 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,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O1" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 cc354b935dcc..dbb7884d6b7a 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,8 +3,9 @@
* vec_nand) were added as part of ISA 2.07 (P8). */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O1" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 b604b3fb4827..4e4f4450b327 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -mpower8-vector " } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 4c67a32121df..815e466824a1 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_p8vector_ok } */
-/* { dg-options "-mpower8-vector -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 73d1e73940b1..c733522d8d0b 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_p8vector_ok } */
-/* { dg-options "-mpower8-vector -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#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 3cb566c3007d..ad7e51b1253c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 234d078b07c8..af6ba51189a6 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 b536bcedaa9f..49c28f032ce5 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-int.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 83052e75e3ff..b1250d59f4a6 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,10 +2,10 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
/* { dg-require-effective-target lp64 } */
-/* { dg-options "-mpower8-vector -mdejagnu-cpu=power8 -O2" } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
#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 0223191fdb30..dc82b59238f1 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,9 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
-/* { dg-options "-mpower9-vector -mdejagnu-cpu=power9 -O2" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
#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 dff073d372de..2d791838936a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-maltivec -mvsx -mpower8-vector" } */
+/* { 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* } } */
#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 116b2497136d..8cb686bcb9d4 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-char.c
@@ -2,7 +2,7 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mdejagnu-cpu=power8" } */
#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 1202eeafea8b..ad4b874be99b 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_p8vector_ok } */
-/* { dg-options "-mvsx -O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#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 f7682adfdd81..35b211f914c6 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-int.c
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 058ea0d9b113..878cf794ad87 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#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 cc9f886966e9..7635d0adef1d 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_p9vector_ok } */
-/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -O2 -mdejagnu-cpu=power9 -mvsx" } */
#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 53312ac00d0b..2c9daa40619e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.h
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-longlong.h
@@ -4,8 +4,9 @@
/* vec_neg testcase, included by fold-vec-neg-longlong.p*.c */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 16e05609f367..ceb28a75c83c 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_p8vector_ok } */
-/* { dg-options "-mpower8-vector -mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#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 af59037222a3..54b583729567 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#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 8b4e71b24c48..e777d358718e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-neg-short.c
@@ -2,7 +2,7 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mdejagnu-cpu=power8" } */
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 362ba0c19b51..d5164f46a802 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-double.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-double.c
@@ -2,8 +2,9 @@
double inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mvsx -mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 25c3c3710d23..b5e8db2ec42a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mvsx -mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 bb7dce10f017..14dcd1210d9f 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#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 486426a4318f..72aa5f0cd959 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,8 +2,9 @@
/* This test covers the shift left tests with the -fwrapv option. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2 -fwrapv" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2 -fwrapv" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 4116dbc5fdb8..6afa91797fb3 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,8 +2,9 @@
* This is a counterpart to the fold-vec-shift-left-frwapv test. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 97b82cf31171..9403552d4da8 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 a33f64e37270..bc81123f4d5e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 bb72d9b2a998..6df11514d514 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,7 +1,7 @@
/* Verify that overloaded built-ins for __builtin_vec_xst with long long
inputs produce the right code. */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2 -mdejagnu-cpu=power8" } */
#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 13caa9e6455f..2c7b454edba0 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int128.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int128.c
@@ -2,9 +2,10 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
-/* { dg-options "-maltivec -mvsx -mpower8-vector" } */
+/* { dg-options "-maltivec -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-additional-options "-maix64" { target powerpc-ibm-aix* } } */
#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 889fba4b2aa2..f38312cb6bbd 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-longlong.c
@@ -2,8 +2,9 @@
inputs produce the right results. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-maltivec -mvsx -mpower8-vector" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 78e8eb35e73b..4e1d603a28f5 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-float.c
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#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 621c4eb250de..17e4ad797bea 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-int.c
@@ -2,8 +2,9 @@
inputs produce the right code. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/fusion.c b/gcc/testsuite/gcc.target/powerpc/fusion.c
index 2a115580439a..2906f8a91591 100644
--- a/gcc/testsuite/gcc.target/powerpc/fusion.c
+++ b/gcc/testsuite/gcc.target/powerpc/fusion.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3 -dp" } */
#define LARGE 0x12345
diff --git a/gcc/testsuite/gcc.target/powerpc/fusion2.c b/gcc/testsuite/gcc.target/powerpc/fusion2.c
index 40ca00a74054..925b6d83fd20 100644
--- a/gcc/testsuite/gcc.target/powerpc/fusion2.c
+++ b/gcc/testsuite/gcc.target/powerpc/fusion2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
/* { dg-skip-if "" { powerpc*le-*-* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3" } */
vector double fusion_vector (vector double *p) { return p[2]; }
diff --git a/gcc/testsuite/gcc.target/powerpc/gnuattr2.c b/gcc/testsuite/gcc.target/powerpc/gnuattr2.c
index 32a4ba255a8b..70efb7b34c87 100644
--- a/gcc/testsuite/gcc.target/powerpc/gnuattr2.c
+++ b/gcc/testsuite/gcc.target/powerpc/gnuattr2.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target { powerpc*-linux-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-O2 -mpower9-vector -mabi=ieeelongdouble -Wno-psabi" } */
+/* { 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-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/mmx-packs.c b/gcc/testsuite/gcc.target/powerpc/mmx-packs.c
index dd8cc96cc5ae..b6da584a444e 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-packs.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-packs.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-packssdw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-packssdw-1.c
index ecfe2d694cd7..dff0e3cd573c 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-packssdw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-packssdw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-packsswb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-packsswb-1.c
index 4ca69b126a97..63f787a8637a 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-packsswb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-packsswb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-packuswb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-packuswb-1.c
index 2f74e1308237..54c63f01f227 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-packuswb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-packuswb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-paddb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-paddb-1.c
index 0affc3ac0efe..7b4cc274639d 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-paddb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-paddb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-paddd-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-paddd-1.c
index ed7ca449246e..517de1d26184 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-paddd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-paddd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-paddsb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-paddsb-1.c
index 16b758905978..16afd1fd050a 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-paddsb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-paddsb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-paddsw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-paddsw-1.c
index d53e08aa8ef2..166fb33c3caa 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-paddsw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-paddsw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-paddusb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-paddusb-1.c
index 1336cdc909e9..4cd3d3a62ae7 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-paddusb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-paddusb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-paddusw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-paddusw-1.c
index 16f2ce8d0b44..8f410901d63b 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-paddusw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-paddusw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-paddw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-paddw-1.c
index 0768de79128a..be0b711457cd 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-paddw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-paddw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqb-1.c
index b4b62b381044..58f93ad24738 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqd-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqd-1.c
index e9bc6d58c561..d3c94894b8c9 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqw-1.c
index ee90ab495d6a..7e691e0b9f60 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpeqw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtb-1.c
index ab81bd4976e3..d27838681912 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtd-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtd-1.c
index 84074726861f..39a81700bf05 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtw-1.c
index 348d1bfa7e6e..99d2a49ac80b 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pcmpgtw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pmaddwd-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pmaddwd-1.c
index 1a8bd3fada0e..e92aa8b89f14 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pmaddwd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pmaddwd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pmulhw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pmulhw-1.c
index 631324c4cd96..ce3577022a2d 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pmulhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pmulhw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pmullw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pmullw-1.c
index c3c33f54e544..9377dd7bee63 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pmullw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pmullw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-pslld-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-pslld-1.c
index 857d0d95e54c..73b46e7ad40e 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-pslld-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-pslld-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psllw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psllw-1.c
index 1c072f99e66a..5671398af702 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psllw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psllw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psrad-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psrad-1.c
index a421a168bc95..5f62c7a0376c 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psrad-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psrad-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psraw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psraw-1.c
index 1f486aee44fb..595bf5d71399 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psraw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psraw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psrld-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psrld-1.c
index 97c74f8fc12e..bfdade7a583f 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psrld-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psrld-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psrlw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psrlw-1.c
index 4b039e8a7885..d3206a1cbe44 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psrlw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psrlw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psubb-2.c b/gcc/testsuite/gcc.target/powerpc/mmx-psubb-2.c
index 6dfb88dca6dd..9dee536e4cd6 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psubb-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psubb-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psubd-2.c b/gcc/testsuite/gcc.target/powerpc/mmx-psubd-2.c
index 178590177f08..db4fd5e13b4b 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psubd-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psubd-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psubsb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psubsb-1.c
index 70dff88a9742..b74c9c015b48 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psubsb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psubsb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psubsw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psubsw-1.c
index e204dd411ff4..5dd89c97ca7b 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psubsw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psubsw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psubusb-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psubusb-1.c
index f98f550e099d..372188748549 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psubusb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psubusb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psubusw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-psubusw-1.c
index 52fbe4142dff..eca45dec3d06 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psubusw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psubusw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-psubw-2.c b/gcc/testsuite/gcc.target/powerpc/mmx-psubw-2.c
index 04b57bf9082e..1b70c1e9a7b6 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-psubw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-psubw-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-punpckhbw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-punpckhbw-1.c
index 26c6f44f096f..2a7363ae8271 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-punpckhbw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-punpckhbw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-punpckhdq-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-punpckhdq-1.c
index 81b9f6d8fac9..040721abdb33 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-punpckhdq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-punpckhdq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-punpckhwd-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-punpckhwd-1.c
index 8c44fe90dcfe..177ad5248d1f 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-punpckhwd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-punpckhwd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-punpcklbw-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-punpcklbw-1.c
index 4030850110cd..af9bf0493fdb 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-punpcklbw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-punpcklbw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-punpckldq-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-punpckldq-1.c
index df76e05a63f8..9a68bbc5678c 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-punpckldq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-punpckldq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mmx-punpcklwd-1.c b/gcc/testsuite/gcc.target/powerpc/mmx-punpcklwd-1.c
index ef8ae17719dc..a8e61c2e07be 100644
--- a/gcc/testsuite/gcc.target/powerpc/mmx-punpcklwd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mmx-punpcklwd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/mul-vectorize-1.c b/gcc/testsuite/gcc.target/powerpc/mul-vectorize-1.c
index ba01d5cec8f4..bd9e1f9ee51b 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fdump-tree-vect-details" } */
+/* { 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" } */
/* 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 eee6de9e2a54..6c59a284a9fe 100644
--- a/gcc/testsuite/gcc.target/powerpc/mulkc3-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/mulkc3-2.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target longdouble128 } */
-/* { dg-options "-O2 -mpower8-vector -mabi=ieeelongdouble -Wno-psabi" } */
+/* { dg-options "-O2 -mvsx -mabi=ieeelongdouble -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* 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 b6d2bdf73ccb..54671f813efa 100644
--- a/gcc/testsuite/gcc.target/powerpc/mulkc3-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/mulkc3-3.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target longdouble128 } */
-/* { dg-options "-O2 -mpower8-vector -mabi=ibmlongdouble -Wno-psabi" } */
+/* { dg-options "-O2 -mvsx -mabi=ibmlongdouble -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* 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 f5c3858725c0..7a624297ae9e 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* 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 ed31e6082960..46d5d6f6fe9a 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* 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 f1dd62c65140..47a5f88c4ec1 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { 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" } */
#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 102e1d1f8136..d3aab195bef1 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { 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" } */
#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 33304fe6132d..ca354c54ed5b 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -ftree-vectorize -fvect-cost-model=dynamic" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ftree-vectorize -fvect-cost-model=dynamic" } */
#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 8329e2bae5ae..074d23c5d919 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -ftree-vectorize -fvect-cost-model=dynamic" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ftree-vectorize -fvect-cost-model=dynamic" } */
#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 1f50043b05b1..35b7e2a189f9 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { 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" } */
#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 0a349ba7e71b..6a10054146a9 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
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 fcfac7c50b18..9f2d80cdef3e 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#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 0cfbe68c3a4c..d8f23d1741d9 100644
--- a/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/p8vector-builtin-8.c
@@ -1,7 +1,8 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-fp.c b/gcc/testsuite/gcc.target/powerpc/p8vector-fp.c
index a86f05b2f172..d990691f4992 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -fno-math-errno" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -fno-math-errno" } */
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 28b148c692ce..c763187cda9e 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_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3" } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p8vector-ldst.c b/gcc/testsuite/gcc.target/powerpc/p8vector-ldst.c
index 856029f56688..6ac5d4654386 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
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 c2ab68ba7612..486ae40cd933 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_p8vector_ok } */
-/* { dg-options "-O3 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O3 -mdejagnu-cpu=power8 -mvsx" } */
/* { 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 a58d959af398..a2dd1a4f55fc 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { 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" } */
#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 78ff176f4ef8..46dc31807f86 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic" } */
#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 2f32b352c48d..b464bdce246c 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fvect-cost-model=dynamic" } */
#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 e767af37e237..1f2a0cd06efc 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { 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" } */
#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 bd27a9eb9509..1d161968b14e 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic -fno-unroll-loops -fno-unroll-all-loops" } */
+/* { 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" } */
#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 9914f94a5633..125252e74237 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 6d747289da50..d4392d4cf089 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 d7d3ad77aea8..5c0f00e4cd6f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 ffbc6b93fdda..824665a20f66 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#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 3c1361d3b6d7..1317c59e587b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 347f63ddc6fa..8968696040e3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 3ad81980e8f8..19b2c0dc0a66 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
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 c7ea1c299283..2356815ad5eb 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
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 19701c84addb..fbb73a56535c 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 553942907b65..936a0377b92c 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3" } */
/* { 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 edab61648140..b8e1e78623b3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O1" } */
/* { 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 3cb28ee5b2a3..2d3f63f56eb6 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 -O3 -mfloat128" } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { 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 686fdccb850d..616c2f01151e 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -mpower9-minmax -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mpower9-minmax -ffast-math" } */
/* { 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 78a3d9ae2176..73ec1607a729 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -mpower9-minmax" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mpower9-minmax" } */
/* { 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 3248b9aa62ae..c97eedecd4ee 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -mpower9-minmax" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mpower9-minmax" } */
/* { dg-final { scan-assembler-not "xsmaxcdp" } } */
/* { dg-final { scan-assembler-not "xsmincdp" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-novsx.c b/gcc/testsuite/gcc.target/powerpc/p9-novsx.c
index d847274d6ca8..719267665d2e 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-novsx.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-novsx.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -mno-vsx -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -mno-vsx -O1" } */
/* { dg-final { scan-assembler-times "lvx %?v?2,%?r?3" 1 } } */
/* { dg-final { scan-assembler-times "stvx %?v?2,%?r?3" 1 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-options-1.c b/gcc/testsuite/gcc.target/powerpc/p9-options-1.c
index 5685b4a66cd4..9da4d3630c00 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-options-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-options-1.c
@@ -1,11 +1,11 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -mno-power9-vector" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mno-vsx" } */
#include <altivec.h>
/* This program's "test for excess errors" demonstrates that combining
- the target options -mcpu=power9 and -mno-power9-vector does not
+ the target options -mcpu=power9 and -mno-vsx does not
result in an error. A previous version of the compiler aborted
with the error message:
@@ -14,7 +14,7 @@
when these two options were used in combination.
The newer version of the compiler, instead, automatically disables
- power9-dform when the -mno-power9-vector command-line option is
+ power9-dform when the -mno-vsx command-line option is
specified. */
int
test_any_equal (vector bool char *arg1_p, vector bool char *arg2_p)
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-permute.c b/gcc/testsuite/gcc.target/powerpc/p9-permute.c
index b9bf05ad5ae3..9ac9493986f7 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-sign_extend-runnable.c b/gcc/testsuite/gcc.target/powerpc/p9-sign_extend-runnable.c
index 03c0f1201e43..f0514993bc0d 100644
--- a/gcc/testsuite/gcc.target/powerpc/p9-sign_extend-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/p9-sign_extend-runnable.c
@@ -1,6 +1,6 @@
/* { dg-do run { target { *-*-linux* && { lp64 && p9vector_hw } } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9 -save-temps" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx -save-temps" } */
/* These builtins were not defined until ISA 3.1 but only require ISA 3.0
support. */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-splat-1.c b/gcc/testsuite/gcc.target/powerpc/p9-splat-1.c
index ecb8d26961e8..72ff87c0249f 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 -O2" } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#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 efbe7e1a2295..55492506d269 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 -O2" } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#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 3cfacb2914c2..8bd3fec0e85e 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 -O2" } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#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 b31744500eea..886a75c31c52 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 -O2" } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#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 46faa38bbdf7..3f9e729b8b96 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* { 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 b26a8f99d2f9..83606dda8c20 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 f57d9457bd94..e28da9eaf9b5 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 19856407d277..499dcef34fd9 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 eaea96d1eadd..cf28122d56e8 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 01991325ca8b..83c67ff4a0ef 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 c68faa8c557a..0f31dcdda2b7 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 18076cc8218c..ac4de8fad5dc 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 4e37c0a0095d..89f8d3476bb8 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,7 +1,7 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
/* Pass cunroll isn't disabled by -fno-unroll-loops, so use explicit
disabling option for it. */
-/* { dg-options "-mdejagnu-cpu=power9 -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 -fdisable-tree-cunroll" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=1" } */
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 0f3cd0722682..fbd1a353ade3 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 2818bac36a2f..a501873967ff 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 b476910753f5..d30feff9ff0f 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 0f502423c88a..ecef0fd13939 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 20ddfb392e11..0c8f223f1227 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 0bad6938bf8c..0165eed62f99 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 a73178e3ad39..ff66a1141958 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
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 b50ff3cf6ef2..f5b2d1abe962 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,7 +1,7 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
/* Pass cunroll isn't disabled by -fno-unroll-loops, so use explicit
disabling option for it. */
-/* { dg-options "-mdejagnu-cpu=power9 -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 -fdisable-tree-cunroll" } */
/* { dg-additional-options "--param=vect-partial-vector-usage=2" } */
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 94f2aa48f57f..daf62ac8f463 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,5 +1,5 @@
-/* { dg-do compile { target { lp64 && powerpc_p9vector_ok } } } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fno-trapping-math" } */
+/* { dg-do compile { target { lp64 && powerpc_vsx_ok } } } */
+/* { 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" } */
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vneg.c b/gcc/testsuite/gcc.target/powerpc/p9-vneg.c
index 7d6e9bcb5eb3..e07bc437e72d 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 8f6f1239f7a0..978ddefaf92f 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/p9-vpermr.c b/gcc/testsuite/gcc.target/powerpc/p9-vpermr.c
index 6f87640d2681..07c86e6264cf 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 a449dda9cb17..956f6c101036 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3" } */
#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 a14ac68f1c56..7e89daafe5c3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#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 62a946fd2b3f..efb9acf4fc1a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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-fortran/pr80108-1.f90 b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr80108-1.f90
index dac5c3616898..00392b5fed99 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr80108-1.f90
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr80108-1.f90
@@ -1,6 +1,6 @@
! Originally contributed by Tobias Burnas.
! { dg-do compile { target { powerpc*-*-* } } }
-! { dg-require-effective-target powerpc_p9vector_ok }
+! { dg-require-effective-target powerpc_vsx_ok }
! { dg-options "-mdejagnu-cpu=405 -mpower9-minmax -mfloat128" }
! { dg-excess-errors "expect error due to conflicting target options" }
! Since the error message is not associated with a particular line
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-round2.c b/gcc/testsuite/gcc.target/powerpc/ppc-round2.c
index bebecfae99da..c50f00825b0d 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
/* { 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 043fce7958bc..873c90ae3352 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_p9vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
/* { 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 63872f21bf8b..856d7b7b93b2 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
/* { 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 4357d1beb095..79193cfdd179 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
/* { dg-final { scan-assembler {\mvspltish\M} } } */
/* { dg-final { scan-assembler {\mvrlh\M} } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr103124.c b/gcc/testsuite/gcc.target/powerpc/pr103124.c
index dc7bb9c91d43..c6942e4724e0 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
/* { dg-final { scan-assembler-not {\mmr\M} } } */
vector __int128 add (long long a)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104015-1.c b/gcc/testsuite/gcc.target/powerpc/pr104015-1.c
index 895c243aaf86..272499cfa5cb 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details" } */
/* 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 30e3b6f86ebb..7859ca2608c4 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 -mpower8-vector -O2" } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { 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 eacdedd5c38c..8c1862a329b7 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 -DNO_WARN_X86_INTRINSICS" } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -DNO_WARN_X86_INTRINSICS" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#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 1bf316f97015..b021550a038d 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 -DNO_WARN_X86_INTRINSICS" } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -DNO_WARN_X86_INTRINSICS" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#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 6d64e5dcbac3..7436597f19b4 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 -DNO_WARN_X86_INTRINSICS -std=c89" } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -DNO_WARN_X86_INTRINSICS -std=c89" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr106769-p8.c b/gcc/testsuite/gcc.target/powerpc/pr106769-p8.c
index e7cdbc762984..51e72477566a 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 2248b525d430..b602e7d57686 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* { 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 4526ea8639d5..9e21f96be59e 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target lp64 } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -ftree-vectorize -fno-vect-cost-model -funroll-loops -fno-tree-loop-distribute-patterns --param vect-partial-vector-usage=2 -fdump-tree-optimized" } */
+/* { 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" } */
/* 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 a783f0823a67..262a44686758 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_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* Verify there is no error message. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr110429.c b/gcc/testsuite/gcc.target/powerpc/pr110429.c
index d0ea3e56ae8d..b9241ed7d14e 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* { 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 0c9e176d2889..ce97e4f7dfbf 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr111449-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr111449-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* 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 7003bdc02084..49871cab8993 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr111449-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr111449-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target { has_arch_pwr8 } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mvsx -O2" } */
/* Ensure 16-byte by pieces move is enabled. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr37191.c b/gcc/testsuite/gcc.target/powerpc/pr37191.c
index 1b69c3b7785d..bff90dfa38f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr37191.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr37191.c
@@ -1,6 +1,7 @@
/* { dg-do compile } */
/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/pr57744.c b/gcc/testsuite/gcc.target/powerpc/pr57744.c
index 617ac56f09c2..9e51dc7fb9c0 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr57744.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr57744.c
@@ -1,7 +1,7 @@
/* { dg-do run { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
void abort (void);
diff --git a/gcc/testsuite/gcc.target/powerpc/pr58673-1.c b/gcc/testsuite/gcc.target/powerpc/pr58673-1.c
index dd2194fc4d7e..9ebe3c579d6e 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O1" } */
enum typecode
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr58673-2.c b/gcc/testsuite/gcc.target/powerpc/pr58673-2.c
index d70f061fc700..d59cc217bb5f 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -funroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -funroll-loops" } */
#include <stddef.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr60137.c b/gcc/testsuite/gcc.target/powerpc/pr60137.c
index 6ec6adf0add9..1b1b69aab394 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr60137.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr60137.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -mno-vsx" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -mno-vsx" } */
/* target/60137, compiler got a 'could not split insn error'. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr60203.c b/gcc/testsuite/gcc.target/powerpc/pr60203.c
index a5a574a88372..56b676fde9b1 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
#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/pr66144-1.c b/gcc/testsuite/gcc.target/powerpc/pr66144-1.c
index dea4d00b75d3..4fd5fc5ce6c8 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 7f4a19395e65..6b12f25fd228 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* 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 488bb6cc987a..46bf2e3fc8dc 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize" } */
/* 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/pr68163.c b/gcc/testsuite/gcc.target/powerpc/pr68163.c
index 25371caa7716..736fad172eb7 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* 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/pr69548.c b/gcc/testsuite/gcc.target/powerpc/pr69548.c
index 6782f6b7235e..259d8d287c07 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr69548.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr69548.c
@@ -1,7 +1,7 @@
/* { dg-do assemble { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -Os -mbig" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -Os -mbig" } */
__int128
quad_exchange (__int128 *ptr, __int128 newval)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70669.c b/gcc/testsuite/gcc.target/powerpc/pr70669.c
index 225681d38675..3082e292607a 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -mfloat128" } */
#ifndef TYPE
#define TYPE __float128
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71186.c b/gcc/testsuite/gcc.target/powerpc/pr71186.c
index 3d01609a61a8..acc354ff2d9b 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 -O2" } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
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 e1cbcea7e763..97489ad67adb 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target lp64 } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
#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 52e2295bbd2e..7009d990042e 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71656-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71656-1.c
@@ -1,7 +1,8 @@
/* Test for reload ICE arising from POWER9 Vector Dform code generation. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-O1 -mpower9-vector" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O1 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
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 c2a054f085fb..9ec1fca7aaf4 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71656-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71656-2.c
@@ -1,7 +1,8 @@
/* Test for reload ICE arising from POWER9 Vector Dform code generation. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-O3 -mpower9-vector -funroll-loops -fno-aggressive-loop-optimizations" } */
+/* { 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 } } } */
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 fec3e8731fed..f6a38ebbe141 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O1" } */
volatile int a;
int b;
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71698.c b/gcc/testsuite/gcc.target/powerpc/pr71698.c
index e763741bc16f..a34c410005e5 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target dfp } */
-/* { dg-options "-O1 -mdejagnu-cpu=power9" } */
+/* { dg-options "-O1 -mdejagnu-cpu=power9 -mvsx" } */
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 dba540d74fc9..236faa6a0094 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* Verify that we generate xxspltw <reg>,<reg>,0 for V4SFmode splat. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71977-1.c b/gcc/testsuite/gcc.target/powerpc/pr71977-1.c
index 6b6ff0928a98..ca60f204a0c1 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr71977-2.c b/gcc/testsuite/gcc.target/powerpc/pr71977-2.c
index efb72882524e..85b7a2292d1c 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr72717.c b/gcc/testsuite/gcc.target/powerpc/pr72717.c
index d6565faa88b7..d9bea5a56361 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
typedef long V __attribute__((__vector_size__(32)));
diff --git a/gcc/testsuite/gcc.target/powerpc/pr72853.c b/gcc/testsuite/gcc.target/powerpc/pr72853.c
index 89c73cbc2da1..de69bd9ecc00 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O3 -funroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3 -funroll-loops" } */
/* derived from 20021120-1.c, compiled for -mcpu=power9. */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78056-1.c b/gcc/testsuite/gcc.target/powerpc/pr78056-1.c
index 0b9bec8d787d..1af42296306e 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* This test should succeed on both 32- and 64-bit configurations. */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78056-2.c b/gcc/testsuite/gcc.target/powerpc/pr78056-2.c
index da650fa6e861..5cda9d6193b2 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78056-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78056-2.c
@@ -1,8 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-skip-if "" { powerpc_p9vector_ok } } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-skip-if "" { powerpc_vsx_ok } } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
/* 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 fcdfbfce4c1e..545e93b3a708 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78056-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78056-3.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* { dg-options "-mdejagnu-cpu=power7" } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78056-4.c b/gcc/testsuite/gcc.target/powerpc/pr78056-4.c
index 2a663599c5cc..0bea0f895fac 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr78056-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr78056-4.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* powerpc_vsx_ok represents power7 */
/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-skip-if "" { powerpc_p8vector_ok } } */
+/* { dg-skip-if "" { powerpc_vsx_ok } } */
/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* { dg-options "-mdejagnu-cpu=power7" } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78102.c b/gcc/testsuite/gcc.target/powerpc/pr78102.c
index 0b5091082754..7ae0d02b835c 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 -DNO_WARN_X86_INTRINSICS" } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx -DNO_WARN_X86_INTRINSICS" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
#include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78543.c b/gcc/testsuite/gcc.target/powerpc/pr78543.c
index ac2dfd50fc26..9c5454df47e7 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O1" } */
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 7a371af8c28c..f6ac7f15985b 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -ftree-vectorize -fdump-tree-vect-details -fno-unroll-loops" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -ftree-vectorize -fdump-tree-vect-details -fno-unroll-loops" } */
#ifndef SIZE
#define SIZE 1024
diff --git a/gcc/testsuite/gcc.target/powerpc/pr78658.c b/gcc/testsuite/gcc.target/powerpc/pr78658.c
index 303c4fc0c0a8..228736afcb2a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 9ee8ead77d92..a1b66cbd94a2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79004.c b/gcc/testsuite/gcc.target/powerpc/pr79004.c
index 30cdebaad362..caf1f6c1eefe 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mfloat128" } */
#include <math.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79038-1.c b/gcc/testsuite/gcc.target/powerpc/pr79038-1.c
index bf93595fe654..fdf0c1a26d38 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mfloat128" } */
#ifndef TYPE
#define TYPE _Float128
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79179.c b/gcc/testsuite/gcc.target/powerpc/pr79179.c
index ed09702cd42a..f2f48c4e73f2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3" } */
/* Compile with -O3 -mcpu=power9. It originally generated
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79251.p8.c b/gcc/testsuite/gcc.target/powerpc/pr79251.p8.c
index 4fc3ea063820..7d83e72a7b70 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79251.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79251.p8.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
#include <stddef.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79251.p9.c b/gcc/testsuite/gcc.target/powerpc/pr79251.p9.c
index 9312aa604099..8ce6858e6cec 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr79251.p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr79251.p9.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
#include <stddef.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79354.c b/gcc/testsuite/gcc.target/powerpc/pr79354.c
index c9b1bb5d702c..cdb2c363fae2 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { 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 3f782489bbd2..172b95116751 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79799-1.c b/gcc/testsuite/gcc.target/powerpc/pr79799-1.c
index 8d568409c72c..a8d8d1df28d0 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79799-2.c b/gcc/testsuite/gcc.target/powerpc/pr79799-2.c
index fb1dd8c81ada..fe27e5c0da2a 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79799-3.c b/gcc/testsuite/gcc.target/powerpc/pr79799-3.c
index c1fd7aac4752..542601629ad2 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79799-5.c b/gcc/testsuite/gcc.target/powerpc/pr79799-5.c
index be01bb8fe7bc..037bfc0895ff 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr79907.c b/gcc/testsuite/gcc.target/powerpc/pr79907.c
index 385d03aa7e41..9597201fe9f6 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3" } */
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 6b070c55d8ba..796fa7cbbbce 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -S -mno-cmpb" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -S -mno-cmpb" } */
float testf (float x, float y)
{
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80098-1.c b/gcc/testsuite/gcc.target/powerpc/pr80098-1.c
index 202c4bf2e909..f22c8d93fb47 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80098-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80098-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc64*-*-* } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -mno-power9-vector -mpower9-minmax" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mno-vsx -mpower9-minmax" } */
int i;
-/* { dg-error "'-mno-power9-vector' turns off '-mpower9-minmax'" "PR80098" { target *-*-* } 0 } */
+/* { dg-error "'-mno-vsx' turns off '-mpower9-minmax'" "PR80098" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80098-2.c b/gcc/testsuite/gcc.target/powerpc/pr80098-2.c
index 7bf474ac5108..964b849111b7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80098-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80098-2.c
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc64*-*-* } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -mno-power8-vector -mcrypto" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mno-vsx -mcrypto" } */
int i;
-/* { dg-error "'-mno-power8-vector' turns off '-mcrypto'" "PR80098" { target *-*-* } 0 } */
+/* { dg-error "'-mno-vsx' turns off '-mcrypto'" "PR80098" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-1.c b/gcc/testsuite/gcc.target/powerpc/pr80315-1.c
index 7198611258fb..b846e19a4718 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
int
main()
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-2.c b/gcc/testsuite/gcc.target/powerpc/pr80315-2.c
index 0f77f775ad38..64b062837003 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
int
main ()
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-3.c b/gcc/testsuite/gcc.target/powerpc/pr80315-3.c
index 398c512274d6..2c335e766051 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-4.c b/gcc/testsuite/gcc.target/powerpc/pr80315-4.c
index 4326ff64c189..c003c9ba799a 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr80510-2.c b/gcc/testsuite/gcc.target/powerpc/pr80510-2.c
index d041d967c8ba..627e52412d59 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_p8vector_ok } */
+/* { 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 -O2 -fno-tree-vectorize" } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -fno-tree-vectorize" } */
/* 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 9719f295bcba..7d2d81804c7b 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80695-p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80695-p8.c
@@ -1,6 +1,6 @@
-/* { dg-do compile { target { powerpc_p8vector_ok } } } */
+/* { dg-do compile { target { powerpc_vsx_ok } } } */
/* { dg-require-effective-target vect_int } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -fdump-tree-slp-details" } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -fdump-tree-slp-details" } */
/* 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 dc2488ab6819..f35e45beb4a9 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr80695-p9.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr80695-p9.c
@@ -1,6 +1,6 @@
-/* { dg-do compile { target { powerpc_p9vector_ok } } } */
+/* { dg-do compile { target { powerpc_vsx_ok } } } */
/* { dg-require-effective-target vect_int } */
-/* { dg-options "-mdejagnu-cpu=power9 -O3 -fdump-tree-slp-details" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O3 -fdump-tree-slp-details" } */
/* 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 a72fc94b1889..8ef2e80392df 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O3 -ffast-math" } */
/* 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 16a46c817f46..c275d5b0c101 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -Og" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -Og" } */
/* 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 34dcfb2ff6a0..4cd4528e620b 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
void
foo (void)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr81959.c b/gcc/testsuite/gcc.target/powerpc/pr81959.c
index c4cc37338419..31d2163df833 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr81959.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr81959.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target { powerpc64*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mpower9-vector -O2 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2 -mfloat128" } */
+/* { dg-additional-options "-mdejagnu-cpu=power9" { target { ! has_arch_pwr9 } } } */
/* 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/pr82748-1.c b/gcc/testsuite/gcc.target/powerpc/pr82748-1.c
index 15a746bcf63e..fe053d9cc202 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr82748-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr82748-1.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mpower9-vector -O2 -mabi=ieeelongdouble -Wno-psabi" } */
+/* { 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 } } } */
/* 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 0079394b1016..fb8e9a5330c9 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr82748-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr82748-2.c
@@ -1,6 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mpower9-vector -O2 -mabi=ibmlongdouble -Wno-psabi" } */
+/* { 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 } } } */
/* 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/pr83862.c b/gcc/testsuite/gcc.target/powerpc/pr83862.c
index 3cadb57962b5..e605194b5289 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr83862.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr83862.c
@@ -1,8 +1,9 @@
/* PR target/83862.c */
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-require-effective-target ppc_float128_sw } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2 -mabi=ieeelongdouble -Wno-psabi" } */
+/* { 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 } } } */
/* 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 c7c61be0defa..286b885fef67 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84154-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84154-1.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mpower8-vector -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -O2" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* 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 acf00cbe6327..64b355f51b11 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* 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 6afadc23a349..3bb663e71bb3 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_p9vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 5e973e01aa4e..9f319864fdba 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84220-sld2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84220-sld2.c
@@ -2,8 +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_p8vector_ok } */
-/* { dg-options "-maltivec -mpower8-vector" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-maltivec -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr84226.c b/gcc/testsuite/gcc.target/powerpc/pr84226.c
index aae922ba905d..e3e771f28160 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_p9vector_ok } */
-/* { dg-options "-mpower9-misc -O1" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mvsx -mpower9-misc -O1" } */
#include "builtins-revb-runnable.c"
diff --git a/gcc/testsuite/gcc.target/powerpc/pr85456.c b/gcc/testsuite/gcc.target/powerpc/pr85456.c
index 3f327fc2d03a..7fb7a7a87a6e 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr85456.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr85456.c
@@ -1,7 +1,8 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target longdouble128 } */
-/* { dg-options "-O2 -mpower8-vector -mabi=ieeelongdouble -Wno-psabi" } */
+/* { dg-options "-O2 -mvsx -mabi=ieeelongdouble -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* 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 018e1cf97497..ea759d54bf6c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c
@@ -3,12 +3,13 @@
explicitly specifies -fwrapv, which is a condition for the
gimple folding of the vec_sl() intrinsic. */
-/* specify -mpower8-vector, which provides vec_sl(long long,...) support. */
+/* specify -mcpu=power8 -mvsx, which provides vec_sl(long long,...) support. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target lp64 } */
-/* { dg-options "-maltivec -O3 -fwrapv -mpower8-vector " } */
+/* { dg-options "-maltivec -O3 -fwrapv -mvsx " } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c b/gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c
index b86209178e18..8a7a9ce77532 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr86731-longlong.c
@@ -2,9 +2,10 @@
left shift properly. */
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target lp64 } */
-/* { dg-options "-maltivec -O3 -mpower8-vector " } */
+/* { dg-options "-maltivec -O3 -mvsx " } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c b/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c
index fffb5b88c209..c1fe3e04bfb4 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_p8vector_ok } */
-/* { dg-options "-O2 -fno-math-errno -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -fno-math-errno -mdejagnu-cpu=power8 -mvsx" } */
/* -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 f3d02c5a52db..002690a1be1e 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2" } */
/* { dg-final { scan-assembler {\mmtvsrd\M} { target { lp64 } } } } */
/* { dg-final { scan-assembler {\mxscvspdpn\M} { target { lp64 } } } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr90763.c b/gcc/testsuite/gcc.target/powerpc/pr90763.c
index 2f4c4f4c0f1a..0094b4ef70c2 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target int128 } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2" } */
/* 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 7f9470ee9059..b304a9e2f7f2 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx" } */
#include <stdlib.h>
#include <stdio.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr92923-2.c b/gcc/testsuite/gcc.target/powerpc/pr92923-2.c
index ebecb69915f5..9dea626cb82b 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_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -fdump-tree-gimple" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -fdump-tree-gimple" } */
/* 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/pr96933-1.c b/gcc/testsuite/gcc.target/powerpc/pr96933-1.c
index 71d72084413e..7c425721b190 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_p9vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power9 -mvsx" } */
/* 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 9fa15125d8d6..2eacc24296d3 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_p8vector_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
/* 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 81b1bda320fe..d82866b07b6c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr97019.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr97019.c
@@ -2,8 +2,8 @@
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_p8vector_ok && le } } } */
-/* { dg-options "-O2 -mdejagnu-cpu=power8" } */
+/* { dg-do compile { target { powerpc_vsx_ok && le } } } */
+/* { dg-options "-O2 -mdejagnu-cpu=power8 -mvsx" } */
/* 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 e4d78e3e6b3a..54d9f48c3066 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr98914.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr98914.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-Og -mvsx" } */
vector int
diff --git a/gcc/testsuite/gcc.target/powerpc/pragma_misc9.c b/gcc/testsuite/gcc.target/powerpc/pragma_misc9.c
index c1667d9f7db1..b99b3e29d404 100644
--- a/gcc/testsuite/gcc.target/powerpc/pragma_misc9.c
+++ b/gcc/testsuite/gcc.target/powerpc/pragma_misc9.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-require-effective-target powerpc_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target lp64 } */
/* { dg-options "-mdejagnu-cpu=power9 -maltivec -O2" } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pragma_power8.c b/gcc/testsuite/gcc.target/powerpc/pragma_power8.c
index cb0f30844d38..8de815e5a9e5 100644
--- a/gcc/testsuite/gcc.target/powerpc/pragma_power8.c
+++ b/gcc/testsuite/gcc.target/powerpc/pragma_power8.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power6 -maltivec -O2" } */
#include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/sad-vectorize-1.c b/gcc/testsuite/gcc.target/powerpc/sad-vectorize-1.c
index 326a821add8d..1049437cf652 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_p9vector_ok } */
-/* { dg-options "-O3 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O3 -mdejagnu-cpu=power9 -mvsx" } */
/* 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 3ae5c4805f9d..73a68eb9ee23 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_p9vector_ok } */
-/* { dg-options "-O3 -mdejagnu-cpu=power9" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-O3 -mdejagnu-cpu=power9 -mvsx" } */
/* Verify that we vectorize this SAD loop using vabsduh. */
diff --git a/gcc/testsuite/gcc.target/powerpc/signbit-1.c b/gcc/testsuite/gcc.target/powerpc/signbit-1.c
index 1642bf46d7a2..21c5b77916ce 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-require-effective-target lp64 } */
/* { dg-require-effective-target ppc_float128_sw } */
-/* { dg-require-effective-target powerpc_p8vector_ok } */
-/* { dg-options "-mdejagnu-cpu=power8 -O2 -mfloat128" } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
+/* { dg-options "-mdejagnu-cpu=power8 -mvsx -O2 -mfloat128" } */
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 1b792916eba8..a5b669f2a760 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_p9vector_ok } */
+/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-require-effective-target ppc_float128_sw } */
-/* { dg-options "-mdejagnu-cpu=power9 -O2 -mfloat128" } */
+/* { dg-options "-mdejagnu-cpu=power9 -mvsx -O2 -mfloat128" } */
int do_signbit_kf (__float128 *a) { return __builtin_signbit (*a); }
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-addps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-addps-1.c
index c5827e128bae..5e2ffd3dfaa7 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-addps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-addps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-addss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-addss-1.c
index 782bae8de0db..004f7ebda996 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-addss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-addss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-andnps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-andnps-1.c
index 9851621de374..e376d3139c7b 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-andnps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-andnps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run { target le } } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-andps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-andps-1.c
index 3a636669deed..a4ffaac0c51c 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-andps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-andps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cmpss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cmpss-1.c
index 1826949da4bd..ab8440addb8b 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cmpss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cmpss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtpi16ps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtpi16ps-1.c
index 5b8b535f257a..ca163ae92a66 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtpi16ps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtpi16ps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtpi32ps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtpi32ps-1.c
index 4b313b5a6a30..b5f300b840a9 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtpi32ps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtpi32ps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtpi32x2ps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtpi32x2ps-1.c
index a2539af1c77b..ea90185153ca 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtpi32x2ps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtpi32x2ps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtpi8ps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtpi8ps-1.c
index 5278980715ee..c8ef487ae61a 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtpi8ps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtpi8ps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtpspi16-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtpspi16-1.c
index ca66afcce214..6b0d9c752160 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtpspi16-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtpspi16-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtpspi8-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtpspi8-1.c
index fd80648551cb..dcff66532d29 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtpspi8-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtpspi8-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtpu16ps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtpu16ps-1.c
index 0cf187be1901..90b147938d6c 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtpu16ps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtpu16ps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtpu8ps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtpu8ps-1.c
index 742f5723fba2..39803c2c693f 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtpu8ps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtpu8ps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-1.c
index 42c296751cb0..228a25ad6943 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-2.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-2.c
index 8782d1fe3ef5..7d934aee9b38 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtsi2ss-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-1.c
index c12a98102e6e..7bf48b0aa4bf 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-2.c b/gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-2.c
index 023446eb7fb2..226b9f223304 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvtss2si-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-1.c b/gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-1.c
index c7f68afb0805..ebbe1f8111af 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-2.c b/gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-2.c
index af0a1840598d..6cfa339ec76a 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-cvttss2si-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-divps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-divps-1.c
index 2e60dad9305f..ac8cf9122db9 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-divps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-divps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-divss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-divss-1.c
index c1dea93b48b9..ebeebc97bd66 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-divss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-divss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-maxps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-maxps-1.c
index f8a4422343ae..5a88ca2c17b8 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-maxps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-maxps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-maxps-2.c b/gcc/testsuite/gcc.target/powerpc/sse-maxps-2.c
index 002aee9b32f8..9ce55ca77bc2 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-maxps-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-maxps-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-maxss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-maxss-1.c
index cc78fba6e4e9..05634ce40c8f 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-maxss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-maxss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-minps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-minps-1.c
index a27cd794c7c5..93b7bfef8f79 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-minps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-minps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-minps-2.c b/gcc/testsuite/gcc.target/powerpc/sse-minps-2.c
index 212c896d08f8..8d9b5300c555 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-minps-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-minps-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-minss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-minss-1.c
index c1ada313e777..a3cdc5c1d0d1 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-minss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-minss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movaps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-movaps-1.c
index de3bb39060da..418305b7f62d 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movaps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movaps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movaps-2.c b/gcc/testsuite/gcc.target/powerpc/sse-movaps-2.c
index 964e2915ea0e..6a86eeca4f94 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movaps-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movaps-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movhlps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-movhlps-1.c
index 5bd2d906e7e1..3d8a325d70a1 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movhlps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movhlps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movhps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-movhps-1.c
index a0666e51fd34..2ee93f1f9e84 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movhps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movhps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run { target le } } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movhps-2.c b/gcc/testsuite/gcc.target/powerpc/sse-movhps-2.c
index 29dde687ba99..0f5523a09fa1 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movhps-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movhps-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movlhps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-movlhps-1.c
index cf44d69b5c88..b8cb1be17d88 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movlhps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movlhps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movlps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-movlps-1.c
index 281d49c75a64..622bc4312dc3 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movlps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movlps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run { target le } } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movlps-2.c b/gcc/testsuite/gcc.target/powerpc/sse-movlps-2.c
index a2f1ed1babbc..d098b1d5e925 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movlps-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movlps-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movmskb-1.c b/gcc/testsuite/gcc.target/powerpc/sse-movmskb-1.c
index ab68dc4a666d..ed493d9f3c68 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movmskb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movmskb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movmskps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-movmskps-1.c
index 427e3491fd4d..8b621ffa0f54 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movmskps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movmskps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-movss-1.c
index 8d09892ed3a1..c7d005c66a34 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movss-2.c b/gcc/testsuite/gcc.target/powerpc/sse-movss-2.c
index fe85f6f3d6a6..6a885dc57419 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movss-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movss-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-movss-3.c b/gcc/testsuite/gcc.target/powerpc/sse-movss-3.c
index 81d4def86e25..17ca36bdbc31 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-movss-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-movss-3.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-mulps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-mulps-1.c
index 59a58d176adc..6a0f68c03115 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-mulps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-mulps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-mulss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-mulss-1.c
index da152dc7019d..af909972ab4d 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-mulss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-mulss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-orps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-orps-1.c
index 645c4ef93c79..1a489fc7e7df 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-orps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-orps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-pavgw-1.c b/gcc/testsuite/gcc.target/powerpc/sse-pavgw-1.c
index 6f8721ad38cd..d7361dab2cea 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-pavgw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-pavgw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-pmaxsw-1.c b/gcc/testsuite/gcc.target/powerpc/sse-pmaxsw-1.c
index 456864b1a842..7a9ceeffa681 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-pmaxsw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-pmaxsw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-pmaxub-1.c b/gcc/testsuite/gcc.target/powerpc/sse-pmaxub-1.c
index c046a0910445..7413dbd5b229 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-pmaxub-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-pmaxub-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-pminsw-1.c b/gcc/testsuite/gcc.target/powerpc/sse-pminsw-1.c
index ca81962d99d6..d8c09cfb2842 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-pminsw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-pminsw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-pminub-1.c b/gcc/testsuite/gcc.target/powerpc/sse-pminub-1.c
index 875e567a1af1..0bc263723a48 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-pminub-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-pminub-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-pmulhuw-1.c b/gcc/testsuite/gcc.target/powerpc/sse-pmulhuw-1.c
index f2c2dd37e6d7..75cc9d5f00db 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-pmulhuw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-pmulhuw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-psadbw-1.c b/gcc/testsuite/gcc.target/powerpc/sse-psadbw-1.c
index c06f4982f97e..63e1dbb95379 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-psadbw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-psadbw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-rcpps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-rcpps-1.c
index e90b729eafc1..dde20854861d 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-rcpps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-rcpps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-rsqrtps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-rsqrtps-1.c
index 9f5d05a333aa..98fabe74e214 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-rsqrtps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-rsqrtps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-shufps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-shufps-1.c
index 29658b7c7c4c..5f82fae0bfb2 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-shufps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-shufps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-sqrtps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-sqrtps-1.c
index ba865a4ede60..a45971f4168d 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-sqrtps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-sqrtps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-subps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-subps-1.c
index 01a1a6c852a8..636c66c3e0b0 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-subps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-subps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-subss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-subss-1.c
index 329404c07446..54c6ae130342 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-subss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-subss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-1.c b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-1.c
index ef3e4a76e2b9..8c43ef82f3b5 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-2.c b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-2.c
index dbac47f8f2f6..cf8c814d375b 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-3.c b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-3.c
index d4072233410f..1d6b769e4dc1 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-3.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-4.c b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-4.c
index efaf673ba83d..f1c0702c4741 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-4.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-5.c b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-5.c
index 6d4468bb0d44..37b76f158412 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-5.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-6.c b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-6.c
index 76027d5ecec8..bc1d749d257a 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-ucomiss-6.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-unpckhps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-unpckhps-1.c
index 2526936a348f..db5e3a631370 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-unpckhps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-unpckhps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-unpcklps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-unpcklps-1.c
index 060105ad165a..c22188c98a54 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-unpcklps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-unpcklps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse-xorps-1.c b/gcc/testsuite/gcc.target/powerpc/sse-xorps-1.c
index a0ae4236e841..6083d9cc44c0 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse-xorps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse-xorps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-addpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-addpd-1.c
index 1cba6bc67495..e87c54e2f6ff 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-addpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-addpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-addsd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-addsd-1.c
index 634746a2a97d..00f226525add 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-addsd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-addsd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-andnpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-andnpd-1.c
index 747bcc9387a4..f6eebd5d5117 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-andnpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-andnpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run { target le } } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-andpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-andpd-1.c
index 5034bf9f5fab..0a9df60f87a0 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-andpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-andpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cmppd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cmppd-1.c
index 1890535751c2..458e0d428328 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cmppd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cmppd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cmpsd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cmpsd-1.c
index 0c8babfc51ee..3ca25a24b727 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cmpsd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cmpsd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-1.c
index ed3e5ebee02d..f1d6c71af9bd 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-2.c
index 941a4fdd6e4f..8653ea79f96f 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-3.c b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-3.c
index 5bb03c30fd40..94cffb705078 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-3.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-4.c b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-4.c
index 8732e1aad2f7..991436b65aa8 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-4.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-5.c b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-5.c
index bbc12aefd92b..e915c75509e8 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-5.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-6.c b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-6.c
index 1ec50890804b..0af8994d8565 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-comisd-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-comisd-6.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2pd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2pd-1.c
index 6565b42dd00f..141d838556d7 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2pd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2pd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2ps-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2ps-1.c
index 2b2c631940e8..cfa2f122c663 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2ps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtdq2ps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2dq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2dq-1.c
index 26efa7f9354b..4378723051b6 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2dq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2dq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2ps-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2ps-1.c
index 80be7fdeb94b..82096bdba2a4 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2ps-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtpd2ps-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtps2dq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtps2dq-1.c
index b9cd6f1d753a..a2e493aa0f42 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtps2dq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtps2dq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtps2pd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtps2pd-1.c
index 8e1b67b683e6..1217a253c6af 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtps2pd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtps2pd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-1.c
index 7f71527fcffe..4aead4afbdd4 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-2.c
index 00387a7a25b3..12a673ee4276 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2si-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2ss-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2ss-1.c
index fc76d3ba9ecf..aedf55a997f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2ss-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsd2ss-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-1.c
index 91f936c35e1d..d596f25b51fd 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-2.c
index 2ed11ed06774..4150c54df632 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtsi2sd-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvtss2sd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvtss2sd-1.c
index 5b3ebe60e439..19f2aa0ad1e7 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvtss2sd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvtss2sd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvttpd2dq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvttpd2dq-1.c
index 8ea6bef7fcdd..29f1668331ae 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvttpd2dq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvttpd2dq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvttps2dq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvttps2dq-1.c
index 67ce96776dd9..695c3a4a6d47 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvttps2dq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvttps2dq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-1.c
index 0523a1369561..5420bce95d17 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-2.c
index e944d4a69617..4331f8376638 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-cvttsd2si-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-divpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-divpd-1.c
index 2350289e2e87..b2d660aae285 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-divpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-divpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-divsd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-divsd-1.c
index 6d5ac9aff533..7d441f85d28a 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-divsd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-divsd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-maxpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-maxpd-1.c
index 021cc4cd91f7..faebbd03082f 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-maxpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-maxpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-maxsd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-maxsd-1.c
index 7bb70b7f3f2c..494d5cb940ac 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-maxsd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-maxsd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-minpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-minpd-1.c
index 2af5a0893e42..fc6c9055de66 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-minpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-minpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-minsd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-minsd-1.c
index 1d085a3043d5..5ec5b6454bff 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-minsd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-minsd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-mmx.c b/gcc/testsuite/gcc.target/powerpc/sse2-mmx.c
index 1841a46007ca..6e95a606b034 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-mmx.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-mmx.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector" } */
+/* { dg-options "-O3 -mvsx" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#include "sse2-check.h"
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movhpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-movhpd-1.c
index 168f470b2d68..a9f4fa97c853 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movhpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movhpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movhpd-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-movhpd-2.c
index 4aacbe049553..d89cb7dd3cd2 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movhpd-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movhpd-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movlpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-movlpd-1.c
index 38bbc9d7206a..0a16551177f9 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movlpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movlpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movlpd-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-movlpd-2.c
index de178663340e..9d82a913d425 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movlpd-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movlpd-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movmskpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-movmskpd-1.c
index 933412afadcf..d66874e65b35 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movmskpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movmskpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-movq-1.c
index 1eaf2f39ea17..47dbda18840a 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movq-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-movq-2.c
index b3e3a794970c..a2e22d13f1eb 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movq-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movq-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movq-3.c b/gcc/testsuite/gcc.target/powerpc/sse2-movq-3.c
index a1cc90dd3893..8edfd43abc57 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movq-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movq-3.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movsd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-movsd-1.c
index 4f513765d530..f31bace11d76 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movsd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movsd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movsd-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-movsd-2.c
index f9c493447144..cd611d141bb1 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movsd-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movsd-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-movsd-3.c b/gcc/testsuite/gcc.target/powerpc/sse2-movsd-3.c
index beb908dc7552..040c40387a2b 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-movsd-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-movsd-3.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-mulpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-mulpd-1.c
index 06adddd14584..76fdd894b1cc 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-mulpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-mulpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-mulsd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-mulsd-1.c
index 02b50d0d445e..2731924ca751 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-mulsd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-mulsd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-orpd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-orpd-1.c
index cdc057e25232..e2c236246e56 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-orpd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-orpd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-packssdw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-packssdw-1.c
index 9fbc750df319..d0c52a37bc79 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-packssdw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-packssdw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-packsswb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-packsswb-1.c
index ed09138f1692..526eb33ff15a 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-packsswb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-packsswb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-packuswb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-packuswb-1.c
index 3024e54e05ff..123fc7811c74 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-packuswb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-packuswb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-paddb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-paddb-1.c
index f3dcfb08ac3b..2d93dc5f03de 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-paddb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-paddb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-paddd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-paddd-1.c
index 7d5307d7b6b3..895a60c3d2ab 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-paddd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-paddd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-paddq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-paddq-1.c
index 033a202a7c94..702deb8fa778 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-paddq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-paddq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-paddsb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-paddsb-1.c
index 3864185dbc9d..9166f8c21af7 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-paddsb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-paddsb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-paddsw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-paddsw-1.c
index 40e366509254..6bffbd8536ca 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-paddsw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-paddsw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-paddusb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-paddusb-1.c
index b7066094487d..85416a2f1d13 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-paddusb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-paddusb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-paddusw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-paddusw-1.c
index 93471771a249..0b62723f9236 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-paddusw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-paddusw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-paddw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-paddw-1.c
index 6b3a9e16fb8c..d50413d3cc33 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-paddw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-paddw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pand-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pand-1.c
index 0ccd5f491a07..f2e8177752b5 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pand-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pand-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pandn-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pandn-1.c
index 05e8407c682d..14938db8a8d5 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pandn-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pandn-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pavgb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pavgb-1.c
index dbe2d478068c..4fb4e9859476 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pavgb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pavgb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pavgw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pavgw-1.c
index 1afff28fee4b..48c46bee50a4 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pavgw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pavgw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqb-1.c
index 67c46cd25a0a..2f11b7b6eba1 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqd-1.c
index 67075293302f..376c97a43be2 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqw-1.c
index 03050d25361f..b1b5d40bb198 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpeqw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtb-1.c
index 3497a3b1ebe5..893369e30810 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtd-1.c
index 9f32a1cedc45..13f19571090c 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtw-1.c
index 1ed268fd43bc..ad4b50c0977b 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pcmpgtw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pextrw.c b/gcc/testsuite/gcc.target/powerpc/sse2-pextrw.c
index 93aabfa4d5ed..54926bd7e305 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pextrw.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pextrw.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pinsrw.c b/gcc/testsuite/gcc.target/powerpc/sse2-pinsrw.c
index 7ca485930f9e..aa87e298c1a6 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pinsrw.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pinsrw.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pmaddwd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pmaddwd-1.c
index 674c4d41d8a2..b20924c0dcdf 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pmaddwd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pmaddwd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pmaxsw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pmaxsw-1.c
index 287ab3cd5e9d..6bc48a2fcb9a 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pmaxsw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pmaxsw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pmaxub-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pmaxub-1.c
index c0c939eec281..8ab8eec0c057 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pmaxub-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pmaxub-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pminsw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pminsw-1.c
index a9dc4ad9548f..7f0c8836d6b8 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pminsw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pminsw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pminub-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pminub-1.c
index d00f92d4b461..ac41d76ad0e4 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pminub-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pminub-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pmovmskb-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pmovmskb-1.c
index 921cfe3dbd73..8740835c29d4 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pmovmskb-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pmovmskb-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pmulhuw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pmulhuw-1.c
index 0b4dd2ece86d..71bca1d24bab 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pmulhuw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pmulhuw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pmulhw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pmulhw-1.c
index b15d2e2b87d7..0d2e16aa890f 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pmulhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pmulhw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pmullw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pmullw-1.c
index 62a052401b41..e824e8e77e18 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pmullw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pmullw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#define NO_WARN_X86_INTRINSICS 1
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pmuludq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pmuludq-1.c
index 1e41d464b14c..883f1bb6cde0 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pmuludq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pmuludq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-por-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-por-1.c
index b4ae8804d9e8..b8538563d624 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-por-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-por-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psadbw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psadbw-1.c
index 82b8230c5997..03b25cc44c32 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psadbw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psadbw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pshufd-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pshufd-1.c
index b8263bae0314..b40ef6ce8103 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pshufd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pshufd-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pshufhw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pshufhw-1.c
index 7830fd432886..e7c4f3348b1c 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pshufhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pshufhw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pshuflw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pshuflw-1.c
index 5a014751afc9..3f407e899137 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pshuflw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pshuflw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pslld-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pslld-1.c
index 094dfb4d022d..5b4e4dd0a8fe 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pslld-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pslld-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pslld-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-pslld-2.c
index 00a85963efd0..f12b63ebdbb7 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pslld-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pslld-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-pslldq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-pslldq-1.c
index 22a31d0e9bd0..7b3afb9efbd9 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-pslldq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-pslldq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psllq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psllq-1.c
index bb1167fd9255..63f40b0583b0 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psllq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psllq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psllq-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-psllq-2.c
index 253793e1932d..d9d3d1c3ed49 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psllq-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psllq-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psllw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psllw-1.c
index beca23c33723..aafbe6bc5244 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psllw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psllw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psllw-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-psllw-2.c
index cb132aa54c38..0ac9e4031717 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psllw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psllw-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrad-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrad-1.c
index caf3e7525d8d..86abf256b692 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrad-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrad-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrad-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrad-2.c
index 782b47a995a0..43f79ac410c1 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrad-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrad-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psraw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psraw-1.c
index c66733851fee..86d97bdd9546 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psraw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psraw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psraw-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-psraw-2.c
index b00988c0c974..c72e7369fa6f 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psraw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psraw-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrld-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrld-1.c
index 594cd15178ca..28cf7845dd9d 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrld-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrld-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrld-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrld-2.c
index 083c09a7684a..806e68ad8046 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrld-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrld-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrldq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrldq-1.c
index 41bfc4f64777..81b35d97d720 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrldq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrldq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrlq-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrlq-1.c
index 09df3e789e2c..e33504fd1dea 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrlq-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrlq-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrlq-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrlq-2.c
index 3d160d90323d..ded7537cd67b 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrlq-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrlq-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrlw-1.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrlw-1.c
index 5104cf8cdaf5..aabec7161cec 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrlw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrlw-1.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! has_arch_pwr8 } } } */
/* { dg-require-effective-target p8vector_hw } */
#ifndef CHECK_H
diff --git a/gcc/testsuite/gcc.target/powerpc/sse2-psrlw-2.c b/gcc/testsuite/gcc.target/powerpc/sse2-psrlw-2.c
index a2cef4458d6d..f94c50bbd4e9 100644
--- a/gcc/testsuite/gcc.target/powerpc/sse2-psrlw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/sse2-psrlw-2.c
@@ -1,5 +1,6 @@
/* { dg-do run } */
-/* { dg-options "-O3 -mpower8-vector -Wno-psabi" } */
+/* { dg-options "-O3 -mvsx -Wno-psabi" } */
+/* { dg-additional-options "-mdejagnu-cpu=power8" { target { ! h[...]
[diff truncated at 524288 bytes]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-02-22 2:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-22 2:42 [gcc r14-9129] rs6000: Neuter option -mpower{8,9}-vector [PR109987] Kewen Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).