i386: Adjust AVX10.2 testcases options

Before we change AVX10.2 options in GCC 15, we need to adjust
all related test options to -mavx10.2 to avoid breakage. Since
-mavx10.2 is now 512 bit and will be the final option we will
use. It will also be an one-time change for these tests on
options.

gcc/testsuite/ChangeLog:

	* g++.dg/other/i386-2.C: Use -mavx10.2.
	* g++.dg/other/i386-3.C: Ditto.
	* gcc.target/i386/avx-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-bf16-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-bf16-vector-cmp-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-bf16-vector-fma-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-bf16-vector-operations-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-bf16-vector-smaxmin-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-convert-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-media-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-minmax-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-movrs-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-satcvt-1.c: Ditto.
	* gcc.target/i386/avx10_2-512-vaddbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcmpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvt2ph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvt2ph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvt2ph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvt2ph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvt2ps2phx-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtbf162ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtbf162iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtbiasph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtbiasph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtbiasph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtbiasph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvthf82ph-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtph2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtph2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtps2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvtps2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttbf162ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttbf162iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttpd2dqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttpd2qqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttpd2udqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttpd2uqqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttph2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttph2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttps2dqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttps2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttps2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttps2qqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttps2udqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vcvttps2uqqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vdivbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vdpphps-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vfmaddXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vfmsubXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vfnmaddXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vfnmsubXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vfpclassbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vgetexpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vgetmantbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vmaxbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vminbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vminmaxbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vminmaxpd-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vminmaxph-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vminmaxps-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vmpsadbw-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vmulbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpbssd-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpbssds-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpbsud-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpbsuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpbuud-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpbuuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpwsud-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpwsuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpwusd-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpwusds-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpwuud-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vpdpwuuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vrcpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vreducebf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vrndscalebf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vrsqrtbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vscalefbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vsqrtbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-512-vsubbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-bf16-1.c: Ditto.
	* gcc.target/i386/avx10_2-bf16-vector-cmp-1.c: Ditto.
	* gcc.target/i386/avx10_2-bf16-vector-fma-1.c: Ditto.
	* gcc.target/i386/avx10_2-bf16-vector-operations-1.c: Ditto.
	* gcc.target/i386/avx10_2-bf16-vector-smaxmin-1.c: Ditto.
	* gcc.target/i386/avx10_2-builtin-1.c: Ditto.
	* gcc.target/i386/avx10_2-builtin-2.c: Ditto.
	* gcc.target/i386/avx10_2-comibf-1.c: Ditto.
	* gcc.target/i386/avx10_2-comibf-2.c: Ditto.
	* gcc.target/i386/avx10_2-comibf-3.c: Ditto.
	* gcc.target/i386/avx10_2-comibf-4.c: Ditto.
	* gcc.target/i386/avx10_2-compare-1.c: Ditto.
	* gcc.target/i386/avx10_2-compare-1b.c: Ditto.
	* gcc.target/i386/avx10_2-convert-1.c: Ditto.
	* gcc.target/i386/avx10_2-media-1.c: Ditto.
	* gcc.target/i386/avx10_2-minmax-1.c: Ditto.
	* gcc.target/i386/avx10_2-movrs-1.c: Ditto.
	* gcc.target/i386/avx10_2-partial-bf16-vector-fast-math-1.c: Ditto.
	* gcc.target/i386/avx10_2-partial-bf16-vector-fma-1.c: Ditto.
	* gcc.target/i386/avx10_2-partial-bf16-vector-operations-1.c: Ditto.
	* gcc.target/i386/avx10_2-partial-bf16-vector-smaxmin-1.c: Ditto.
	* gcc.target/i386/avx10_2-satcvt-1.c: Ditto.
	* gcc.target/i386/avx10_2-vaddbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcmpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcomisbf16-1.c: Ditto.
	* gcc.target/i386/avx10_2-vcomisbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ps2phx-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbf162ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbf162iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvthf82ph-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtps2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtps2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttbf162ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttbf162iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttpd2dqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttpd2qqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttpd2udqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttpd2uqqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttph2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttph2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2dqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2qqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2udqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2uqqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttsd2sis-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttsd2usis-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttss2sis-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttss2usis-2.c: Ditto.
	* gcc.target/i386/avx10_2-vdivbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vdpphps-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfmaddXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfmsubXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfpclassbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vgetexpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vgetmantbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vmaxbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxpd-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxph-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxps-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxsd-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxsh-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxss-2.c: Ditto.
	* gcc.target/i386/avx10_2-vmovd-1.c: Ditto.
	* gcc.target/i386/avx10_2-vmovd-2.c: Ditto.
	* gcc.target/i386/avx10_2-vmovw-1.c: Ditto.
	* gcc.target/i386/avx10_2-vmovw-2.c: Ditto.
	* gcc.target/i386/avx10_2-vmpsadbw-2.c: Ditto.
	* gcc.target/i386/avx10_2-vmulbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbssd-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbssds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbsud-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbsuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbuud-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbuuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwsud-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwsuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwusd-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwusds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwuud-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwuuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vrcpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vreducebf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vrndscalebf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vrsqrtbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vscalefbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vsqrtbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vsubbf16-2.c: Ditto.
	* gcc.target/i386/funcspec-56.inc: Ditto.
	* gcc.target/i386/part-vect-vec_cmpbf.c: Ditto.
	* gcc.target/i386/pr117495.c: Ditto.
	* gcc.target/i386/pr118815.c: Ditto.
	* gcc.target/i386/sm4-avx10_2-1.c: Ditto.
	* gcc.target/i386/sm4-avx10_2-512-1.c: Ditto.
	* gcc.target/i386/sm4key4-avx10_2-512-2.c: Ditto.
	* gcc.target/i386/sm4rnds4-avx10_2-512-2.c: Ditto.
	* gcc.target/i386/sse-12.c: Ditto.
	* gcc.target/i386/sse-13.c: Ditto.
	* gcc.target/i386/sse-14.c: Ditto.
	* gcc.target/i386/sse-22.c: Ditto.
	* gcc.target/i386/sse-23.c: Ditto.
	* gcc.target/i386/vnniint16-auto-vectorize-3.c: Ditto.
	* gcc.target/i386/vnniint16-auto-vectorize-4.c: Ditto.
	* gcc.target/i386/vnniint8-auto-vectorize-3.c: Ditto.
	* gcc.target/i386/vnniint8-auto-vectorize-4.c: Ditto.
	* gcc.target/i386/avx10-check.h: Remove avx10.2-512 and
	use avx10.2.
	* gcc.target/i386/sm4-check.h: Ditto.
	* lib/target-supports.exp: Ditto.

gcc/testsuite/g++.dg/other/i386-2.C

@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O -pedantic-errors -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt -msha -mxsavec -mxsaves -mclflushopt -mclwb -mmwaitx -mclzero -mpku -msgx -mrdpid -mgfni -mpconfig -mwbnoinvd -menqcmd -mavx512vp2intersect -mserialize -mtsxldtrk -mamx-tile -mamx-int8 -mamx-bf16 -mkl -mwidekl -mavxvnni -mavxifma -mavxvnniint8 -mavxneconvert -mcmpccxadd -mamx-fp16 -mprefetchi -mraoint -mamx-complex -mavxvnniint16 -msm3 -msha512 -msm4 -mavx10.2-512 -mamx-avx512 -mamx-tf32 -mamx-transpose -mamx-fp8 -mmovrs -mamx-movrs" } */
+/* { dg-options "-O -pedantic-errors -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt -msha -mxsavec -mxsaves -mclflushopt -mclwb -mmwaitx -mclzero -mpku -msgx -mrdpid -mgfni -mpconfig -mwbnoinvd -menqcmd -mavx512vp2intersect -mserialize -mtsxldtrk -mamx-tile -mamx-int8 -mamx-bf16 -mkl -mwidekl -mavxvnni -mavxifma -mavxvnniint8 -mavxneconvert -mcmpccxadd -mamx-fp16 -mprefetchi -mraoint -mamx-complex -mavxvnniint16 -msm3 -msha512 -msm4 -mavx10.2 -mamx-avx512 -mamx-tf32 -mamx-transpose -mamx-fp8 -mmovrs -mamx-movrs" } */
 /* { dg-skip-if "requires hosted libstdc++ for cstdlib malloc" { ! hostedlib } } */
 
 /* Test that {,x,e,p,t,s,w,a,b,i}mmintrin.h, mm3dnow.h, fma4intrin.h,

gcc/testsuite/g++.dg/other/i386-3.C

@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O -fkeep-inline-functions -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt -msha -mxsavec -mxsaves -mclflushopt -mclwb -mmwaitx -mclzero -mpku -msgx -mrdpid -mgfni -mpconfig -mwbnoinvd -menqcmd -mavx512vp2intersect -mserialize -mtsxldtrk -mamx-tile -mamx-int8 -mamx-bf16 -mkl -mwidekl -mavxvnni -mavxifma -mavxvnniint8 -mavxneconvert -mcmpccxadd -mamx-fp16 -mprefetchi -mraoint -mamx-complex -mavxvnniint16 -msm3 -msha512 -msm4 -mavx10.2-512 -mamx-avx512 -mamx-tf32 -mamx-transpose -mamx-fp8 -mmovrs -mamx-movrs" } */
+/* { dg-options "-O -fkeep-inline-functions -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt -msha -mxsavec -mxsaves -mclflushopt -mclwb -mmwaitx -mclzero -mpku -msgx -mrdpid -mgfni -mpconfig -mwbnoinvd -menqcmd -mavx512vp2intersect -mserialize -mtsxldtrk -mamx-tile -mamx-int8 -mamx-bf16 -mkl -mwidekl -mavxvnni -mavxifma -mavxvnniint8 -mavxneconvert -mcmpccxadd -mamx-fp16 -mprefetchi -mraoint -mamx-complex -mavxvnniint16 -msm3 -msha512 -msm4 -mavx10.2 -mamx-avx512 -mamx-tf32 -mamx-transpose -mamx-fp8 -mmovrs -mamx-movrs" } */
 /* { dg-skip-if "requires hosted libstdc++ for cstdlib malloc" { ! hostedlib } } */
 
 /* Test that {,x,e,p,t,s,w,a,b,i}mmintrin.h, mm3dnow.h, fma4intrin.h,

gcc/testsuite/gcc.target/i386/avx-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -Werror-implicit-function-declaration -march=k8 -m3dnow -mavx -mavx2 -maes -mpclmul -mgfni -mprefetchi -mavx10.2-512 -mmovrs" } */
+/* { dg-options "-O2 -Werror-implicit-function-declaration -march=k8 -m3dnow -mavx -mavx2 -maes -mpclmul -mgfni -mprefetchi -mavx10.2 -mmovrs" } */
 /* { dg-add-options bind_pic_locally } */
 
 #include <mm_malloc.h>

gcc/testsuite/gcc.target/i386/avx10-check.h

@@ -40,10 +40,7 @@ main ()
   /* Run AVX10 test only if host has ISA support.  */
   if (__builtin_cpu_supports ("avx10.1-256")
 #ifdef AVX10_2
-      && __builtin_cpu_supports ("avx10.2-256")
-#endif
-#ifdef AVX10_2_512
-      && __builtin_cpu_supports ("avx10.2-512")
+      && __builtin_cpu_supports ("avx10.2")
 #endif
       && avx10_os_support ())
     {

gcc/testsuite/gcc.target/i386/avx10_2-512-bf16-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-512 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vaddbf16\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vaddbf16\[ \\t\]+%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\{%k\[0-9\]\}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vaddbf16\[ \\t\]+%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */
@@ -71,7 +71,7 @@ volatile __m512bh res, x1, x2;
 volatile __mmask32 m32;
 
 void extern
-avx10_2_512_test (void)
+avx10_2_test (void)
 {
   res = _mm512_add_pbh (x1, x2);
   res = _mm512_mask_add_pbh (res, m32, x1, x2);

gcc/testsuite/gcc.target/i386/avx10_2-512-bf16-vector-cmp-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-512 -O2 -mprefer-vector-width=512" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2 -mprefer-vector-width=512" } */
 /* { dg-final { scan-assembler-times "vcmpbf16" 5 } } */
 
 typedef __bf16 v32bf __attribute__ ((__vector_size__ (64)));

gcc/testsuite/gcc.target/i386/avx10_2-512-bf16-vector-fma-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-512 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vfmadd132bf16\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vfmsub132bf16\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vfnmadd132bf16\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */

gcc/testsuite/gcc.target/i386/avx10_2-512-bf16-vector-operations-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-512 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vmulbf16\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 2 } } */
 /* { dg-final { scan-assembler-times "vaddbf16\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vdivbf16\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */

gcc/testsuite/gcc.target/i386/avx10_2-512-bf16-vector-smaxmin-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-512 -mprefer-vector-width=512 -Ofast" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -mprefer-vector-width=512 -Ofast" } */
 /* { dg-final { scan-assembler-times "vmaxbf16" 1 } } */
 /* { dg-final { scan-assembler-times "vminbf16" 1 } } */
 

gcc/testsuite/gcc.target/i386/avx10_2-512-convert-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-512 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vcvt2ps2phx\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvt2ps2phx\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\{%k\[0-9\]\}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvt2ps2phx\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */
@@ -64,7 +64,7 @@ __m512bh *c;
 __m512h *d;
 
 void extern
-avx10_2_512_test (void)
+avx10_2_test (void)
 { 
   y = _mm512_cvtx2ps_ph (a1, b1);
   y = _mm512_mask_cvtx2ps_ph (y, m32, a1, b1);
@@ -76,7 +76,7 @@ avx10_2_512_test (void)
 }
 
 void extern
-avx10_2_512_vcvtbiasph2bf8_test (void)
+avx10_2_vcvtbiasph2bf8_test (void)
 {
   x256i = _mm512_cvtbiasph_bf8 (x512i, x512h);
   x256i = _mm512_mask_cvtbiasph_bf8 (x256i, m32, x512i, x512h);
@@ -84,7 +84,7 @@ avx10_2_512_vcvtbiasph2bf8_test (void)
 }
 
 void extern
-avx10_2_512_vcvtbiasph2bf8s_test (void)
+avx10_2_vcvtbiasph2bf8s_test (void)
 {
   x256i = _mm512_cvtbiassph_bf8 (x512i, x512h);
   x256i = _mm512_mask_cvtbiassph_bf8 (x256i, m32, x512i, x512h);
@@ -92,7 +92,7 @@ avx10_2_512_vcvtbiasph2bf8s_test (void)
 }
 
 void extern
-avx10_2_512_vcvtbiasph2hf8_test (void)
+avx10_2_vcvtbiasph2hf8_test (void)
 {
   x256i = _mm512_cvtbiasph_hf8 (x512i, x512h);
   x256i = _mm512_mask_cvtbiasph_hf8 (x256i, m32, x512i, x512h);
@@ -100,7 +100,7 @@ avx10_2_512_vcvtbiasph2hf8_test (void)
 }
 
 void extern
-avx10_2_512_vcvtbiasph2hf8s_test (void)
+avx10_2_vcvtbiasph2hf8s_test (void)
 {
   x256i = _mm512_cvtbiassph_hf8 (x512i, x512h);
   x256i = _mm512_mask_cvtbiassph_hf8 (x256i, m32, x512i, x512h);
@@ -108,7 +108,7 @@ avx10_2_512_vcvtbiasph2hf8s_test (void)
 }
 
 void extern
-avx10_2_512_vcvt2ph2bf8_test (void)
+avx10_2_vcvt2ph2bf8_test (void)
 {
   x512i = _mm512_cvt2ph_bf8 (x512h, x512h);
   x512i = _mm512_mask_cvt2ph_bf8 (x512i, m64, x512h, x512h);
@@ -116,7 +116,7 @@ avx10_2_512_vcvt2ph2bf8_test (void)
 }
 
 void extern
-avx10_2_512_vcvt2ph2bf8s_test (void)
+avx10_2_vcvt2ph2bf8s_test (void)
 {
   x512i = _mm512_cvts2ph_bf8 (x512h, x512h);
   x512i = _mm512_mask_cvts2ph_bf8 (x512i, m64, x512h, x512h);
@@ -124,7 +124,7 @@ avx10_2_512_vcvt2ph2bf8s_test (void)
 }
 
 void extern
-avx10_2_512_vcvt2ph2hf8_test (void)
+avx10_2_vcvt2ph2hf8_test (void)
 {
   x512i = _mm512_cvt2ph_hf8 (x512h, x512h);
   x512i = _mm512_mask_cvt2ph_hf8 (x512i, m64, x512h, x512h);
@@ -132,7 +132,7 @@ avx10_2_512_vcvt2ph2hf8_test (void)
 }
 
 void extern
-avx10_2_512_vcvt2ph2hf8s_test (void)
+avx10_2_vcvt2ph2hf8s_test (void)
 {
   x512i = _mm512_cvts2ph_hf8 (x512h, x512h);
   x512i = _mm512_mask_cvts2ph_hf8 (x512i, m64, x512h, x512h);
@@ -140,7 +140,7 @@ avx10_2_512_vcvt2ph2hf8s_test (void)
 }
 
 void extern
-avx10_2_512_vcvthf82ph_test (void)
+avx10_2_vcvthf82ph_test (void)
 {
   x512h = _mm512_cvthf8_ph (x256i);
   x512h = _mm512_mask_cvthf8_ph (x512h, m32, x256i);
@@ -148,7 +148,7 @@ avx10_2_512_vcvthf82ph_test (void)
 }
 
 void extern
-avx10_2_512_vcvtph2bf8_test (void)
+avx10_2_vcvtph2bf8_test (void)
 {
   x256i = _mm512_cvtph_bf8 (x512h);
   x256i = _mm512_mask_cvtph_bf8 (x256i, m32, x512h);
@@ -156,7 +156,7 @@ avx10_2_512_vcvtph2bf8_test (void)
 }
 
 void extern
-avx10_2_512_vcvtph2bf8s_test (void)
+avx10_2_vcvtph2bf8s_test (void)
 {
   x256i = _mm512_cvtsph_bf8 (x512h);
   x256i = _mm512_mask_cvtsph_bf8 (x256i, m32, x512h);
@@ -164,7 +164,7 @@ avx10_2_512_vcvtph2bf8s_test (void)
 }
 
 void extern
-avx10_2_512_vcvtph2hf8_test (void)
+avx10_2_vcvtph2hf8_test (void)
 {
   x256i = _mm512_cvtph_hf8 (x512h);
   x256i = _mm512_mask_cvtph_hf8 (x256i, m32, x512h);
@@ -172,7 +172,7 @@ avx10_2_512_vcvtph2hf8_test (void)
 }
 
 void extern
-avx10_2_512_vcvtph2hf8s_test (void)
+avx10_2_vcvtph2hf8s_test (void)
 {
   x256i = _mm512_cvtsph_hf8 (x512h);
   x256i = _mm512_mask_cvtsph_hf8 (x256i, m32, x512h);
@@ -180,7 +180,7 @@ avx10_2_512_vcvtph2hf8s_test (void)
 }
 
 void extern
-avx10_2_512_cvtbf8_fp16_test (void)
+avx10_2_cvtbf8_fp16_test (void)
 {
   y = _mm512_cvtbf8_ph (z1);
   y = _mm512_mask_cvtbf8_ph (z, m32, z1);

gcc/testsuite/gcc.target/i386/avx10_2-512-media-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-512 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vpdpbssd\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vpdpbssd\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\\n\\r]*%zmm\[0-9\]+\[^\\n\\r\]*%zmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vpdpbssd\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\\n\\r]*%zmm\[0-9\]+\[^\\n\\r\]*%zmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 } } */
@@ -52,7 +52,7 @@ volatile __m512i x,y,z,z1;
 volatile __mmask16 m16;
 volatile __mmask32 m32;
 
-void avx10_2_512_test (void)
+void avx10_2_test (void)
 {
   x = _mm512_dpbssd_epi32 (x, y, z);
   x = _mm512_mask_dpbssd_epi32 (x, m16, y, z);

gcc/testsuite/gcc.target/i386/avx10_2-512-minmax-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
 /* { dg-final { scan-assembler-times "vminmaxbf16\[ \\t\]+\[^\{\n\]*\[^\}\]%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r\]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)"  1 } } */
 /* { dg-final { scan-assembler-times "vminmaxbf16\[ \\t\]+\[^\{\n\]*\[^\}\]%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r\]*%zmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)"  1 } } */
 /* { dg-final { scan-assembler-times "vminmaxbf16\[ \\t\]+\[^\{\n\]*\[^\}\]%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\[^\n\r\]*%zmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)"  1 } } */
@@ -25,7 +25,7 @@ volatile __mmask16 m16;
 volatile __mmask8 m8;
 
 void extern
-avx10_2_512_test (void)
+avx10_2_test (void)
 {
   x1 = _mm512_minmax_pbh (x1, x1, 100);
   x1 = _mm512_mask_minmax_pbh (x1, m32, x1, x1, 100);

gcc/testsuite/gcc.target/i386/avx10_2-512-movrs-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! ia32 } } } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-512 -mmovrs -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -mmovrs -O2" } */
 /* { dg-final { scan-assembler-times "vmovrsb\[ \\t\]\+\\(%(?:r|e).x\\), %zmm\[0-9\]+" 3 } } */
 /* { dg-final { scan-assembler-times "vmovrsb\[ \\t\]\+\\(%(?:r|e).x\\), %zmm\[0-9\]+{%k\[1-7\]}" 2 } } */
 /* { dg-final { scan-assembler-times "vmovrsb\[ \\t\]\+\\(%(?:r|e).x\\), %zmm\[0-9\]+{%k\[1-7\]}{z}" 1 } } */
@@ -23,7 +23,7 @@ volatile __mmask8 m3;
 volatile __mmask32 m4;
 
 void extern
-avx512movrs_test (void)
+avx10_movrs_test (void)
 {
   x = _mm512_loadrs_epi8(px);
   x = _mm512_mask_loadrs_epi8(x, m1, px);

gcc/testsuite/gcc.target/i386/avx10_2-512-satcvt-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
 /* { dg-final { scan-assembler-times "vcvtph2ibs\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 2  }  } */
 /* { dg-final { scan-assembler-times "vcvtph2ibs\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\{%k\[0-9\]\}\[^\{\n\r]*(?:\n|\[ \\t\]+#)" 1  }  } */
 /* { dg-final { scan-assembler-times "vcvtph2ibs\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\[^\n\r]*%zmm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1  }  } */

gcc/testsuite/gcc.target/i386/avx10_2-512-vaddbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcmpbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2bf8-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2bf8s-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2hf8-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2hf8s-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ps2phx-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbf162ibs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbf162iubs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2bf8-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2bf8s-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2hf8-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2hf8s-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvthf82ph-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2bf8-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2bf8s-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2hf8-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2hf8s-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2ibs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2iubs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtps2ibs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtps2iubs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttbf162ibs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttbf162iubs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2dqs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2qqs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2udqs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2uqqs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttph2ibs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttph2iubs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2dqs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2ibs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2iubs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2qqs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2udqs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2uqqs-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vdivbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vdpphps-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vfmaddXXXbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vfmsubXXXbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vfnmaddXXXbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vfnmsubXXXbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vfpclassbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vgetexpbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vgetmantbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vmaxbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vminbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxpd-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxph-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxps-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vmpsadbw-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vmulbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbssd-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbssds-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbsud-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbsuds-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbuud-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbuuds-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwsud-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwsuds-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwusd-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwusds-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwuud-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwuuds-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vrcpbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vreducebf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vrndscalebf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vrsqrtbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vscalefbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vsqrtbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-512-vsubbf16-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-512" } */
-/* { dg-require-effective-target avx10_2_512 } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #ifndef AVX10_2
 #define AVX10_2

gcc/testsuite/gcc.target/i386/avx10_2-bf16-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-256 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vaddbf16\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vaddbf16\[ \\t\]+%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vaddbf16\[ \\t\]+%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */

gcc/testsuite/gcc.target/i386/avx10_2-bf16-vector-cmp-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-256 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vcmpbf16" 10 } } */
 
 typedef __bf16 v16bf __attribute__ ((__vector_size__ (32)));

gcc/testsuite/gcc.target/i386/avx10_2-bf16-vector-fma-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-256 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vfmadd132bf16\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vfmsub132bf16\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vfnmadd132bf16\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */

gcc/testsuite/gcc.target/i386/avx10_2-bf16-vector-operations-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-256 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vmulbf16\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 2 } } */
 /* { dg-final { scan-assembler-times "vaddbf16\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vdivbf16\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */

gcc/testsuite/gcc.target/i386/avx10_2-bf16-vector-smaxmin-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-256 -Ofast" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -Ofast" } */
 /* { dg-final { scan-assembler-times "vmaxbf16" 2 } } */
 /* { dg-final { scan-assembler-times "vminbf16" 2 } } */
 

gcc/testsuite/gcc.target/i386/avx10_2-builtin-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O0 -march=x86-64-v3 -mavx10.2-256 -mno-avxvnniint8" } */
+/* { dg-options "-O0 -march=x86-64-v3 -mavx10.2 -mno-avxvnniint8" } */
 typedef int v8si __attribute__ ((vector_size (32)));
 v8si
 foo (v8si a, v8si b, v8si c)

gcc/testsuite/gcc.target/i386/avx10_2-builtin-2.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O0 -march=x86-64-v3 -mavx10.2-256 -mno-avxvnniint16" } */
+/* { dg-options "-O0 -march=x86-64-v3 -mavx10.2 -mno-avxvnniint16" } */
 typedef int v8si __attribute__ ((vector_size (32)));
 v8si
 foo (v8si a, v8si b, v8si c)

gcc/testsuite/gcc.target/i386/avx10_2-comibf-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-256 -O2 -fno-trapping-math" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2 -fno-trapping-math" } */
 /* { dg-final { scan-assembler-times "vcomisbf16\[ \\t\]+\[^{}\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 6 } } */
 /* { dg-final { scan-assembler-times {j[a-z]+\s} 6 } } */
 

gcc/testsuite/gcc.target/i386/avx10_2-comibf-2.c

@@ -1,6 +1,6 @@
 /* { dg-do run } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-256 -O2 -fno-trapping-math" } */
-/* { dg-require-effective-target avx10_2_256 } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2 -fno-trapping-math" } */
+/* { dg-require-effective-target avx10_2 } */
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -92,7 +92,7 @@ test_ge (__bf16 a, __bf16 b)
 int
 main (void)
 {
-  if (!__builtin_cpu_supports ("avx10.2-256"))
+  if (!__builtin_cpu_supports ("avx10.2"))
     return 0;
 
   float test_values[] = {

gcc/testsuite/gcc.target/i386/avx10_2-comibf-3.c

@@ -5,7 +5,7 @@
 /* { dg-final { scan-assembler-times "set\[aeglnb\]+" 6 } } */
 
 #define AVX10_ATTR \
-__attribute__((noinline, __target__("avx10.2-256"), optimize("no-trapping-math")))
+__attribute__((noinline, __target__("avx10.2"), optimize("no-trapping-math")))
 
 AVX10_ATTR
 int foo1_avx10 (__bf16 a, __bf16 b, __bf16 c, __bf16 d)

gcc/testsuite/gcc.target/i386/avx10_2-comibf-4.c

@@ -1,4 +1,4 @@
-/* { dg-do run { target { avx10_2_256 } } } */
+/* { dg-do run { target { avx10_2 } } } */
 /* { dg-options "-march=x86-64-v3 -O2" } */
 
 #include "avx10_2-comibf-3.c"
@@ -24,7 +24,7 @@ int foo3 (__bf16 a, __bf16 b, __bf16 c, __bf16 d)
 
 int main (void)
 {
-  if (!__builtin_cpu_supports ("avx10.2-256"))
+  if (!__builtin_cpu_supports ("avx10.2"))
     return 0;
 
   __bf16 a = 0.5bf16, b = -0.25bf16, c = 1.75bf16, d = -0.125bf16;

gcc/testsuite/gcc.target/i386/avx10_2-compare-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-256" } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
 /* { dg-final { scan-assembler-times "vcomxsd\[ \\t\]+\{sae\}\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  } } */
 /* { dg-final { scan-assembler-times "vcomxss\[ \\t\]+\{sae\}\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vucomxsd\[ \\t\]+\{sae\}\[^\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  } } */

gcc/testsuite/gcc.target/i386/avx10_2-compare-1b.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2-256 -mfpmath=sse" } */
+/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2 -mfpmath=sse" } */
 /* { dg-final { scan-assembler-times "comi" 6 } } */
 /* { dg-final { scan-assembler-times "comx" 12 } } */
 

gcc/testsuite/gcc.target/i386/avx10_2-convert-1.c

@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=x86-64-v3 -mavx10.2-256 -O2" } */
+/* { dg-options "-march=x86-64-v3 -mavx10.2 -O2" } */
 /* { dg-final { scan-assembler-times "vcvt2ps2phx\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvt2ps2phx\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\{%k\[0-9\]\}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvt2ps2phx\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */