Replace -DAVX512* options with defines inside tests.

gcc/testsuite/

	* gcc.target/i386/avx512bw-vdbpsadbw-2.c: Move defines from options.
	* gcc.target/i386/avx512bw-vmovdqu16-2.c: Ditto.
	* gcc.target/i386/avx512bw-vmovdqu8-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpabsb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpabsw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpackssdw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpacksswb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpackusdw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpackuswb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpaddb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpaddsb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpaddsw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpaddusb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpaddusw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpaddw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpalignr-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpavgb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpavgw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpblendmb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpblendmw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpbroadcastb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpbroadcastw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpeqb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpequb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpequw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpeqw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpgeb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpgeub-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpgeuw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpgew-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpgtb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpgtub-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpgtuw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpgtw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpleb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpleub-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpleuw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmplew-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpltb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpltub-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpltuw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpltw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpneqb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpnequb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpnequw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpneqw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpub-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpuw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpcmpw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpermi2w-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpermt2w-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpermw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmaddubsw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmaddwd-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmaxsb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmaxsw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmaxub-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmaxuw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpminsb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpminsw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpminub-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpminuw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovb2m-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovm2b-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovm2w-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovswb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovsxbw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovuswb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovw2m-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovwb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmovzxbw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmulhrsw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmulhuw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmulhw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpmullw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpshufb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpshufhw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpshuflw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsllvw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsllw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsllwi-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsravw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsraw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsrawi-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsrlvw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsrlw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsrlwi-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsubb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsubsb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsubsw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsubusb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsubusw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpsubw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vptestmb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vptestmw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vptestnmb-2.c: Ditto.
	* gcc.target/i386/avx512bw-vptestnmw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpunpckhbw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpunpckhwd-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpunpcklbw-2.c: Ditto.
	* gcc.target/i386/avx512bw-vpunpcklwd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vandnpd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vandnps-2.c: Ditto.
	* gcc.target/i386/avx512dq-vandpd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vandps-2.c: Ditto.
	* gcc.target/i386/avx512dq-vbroadcastf32x2-2.c: Ditto.
	* gcc.target/i386/avx512dq-vbroadcastf32x8-2.c: Ditto.
	* gcc.target/i386/avx512dq-vbroadcastf64x2-2.c: Ditto.
	* gcc.target/i386/avx512dq-vbroadcasti32x2-2.c: Ditto.
	* gcc.target/i386/avx512dq-vbroadcasti32x8-2.c: Ditto.
	* gcc.target/i386/avx512dq-vbroadcasti64x2-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvtpd2qq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvtpd2uqq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvtps2qq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvtps2uqq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvtqq2pd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvtqq2ps-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvttpd2qq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvttpd2uqq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvttps2qq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvttps2uqq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvtuqq2pd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vcvtuqq2ps-2.c: Ditto.
	* gcc.target/i386/avx512dq-vextractf64x2-2.c: Ditto.
	* gcc.target/i386/avx512dq-vextracti64x2-2.c: Ditto.
	* gcc.target/i386/avx512dq-vfpclasspd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vfpclassps-2.c: Ditto.
	* gcc.target/i386/avx512dq-vinsertf64x2-2.c: Ditto.
	* gcc.target/i386/avx512dq-vinserti64x2-2.c: Ditto.
	* gcc.target/i386/avx512dq-vorpd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vorps-2.c: Ditto.
	* gcc.target/i386/avx512dq-vpmovd2m-2.c: Ditto.
	* gcc.target/i386/avx512dq-vpmovm2d-2.c: Ditto.
	* gcc.target/i386/avx512dq-vpmovm2q-2.c: Ditto.
	* gcc.target/i386/avx512dq-vpmovq2m-2.c: Ditto.
	* gcc.target/i386/avx512dq-vpmullq-2.c: Ditto.
	* gcc.target/i386/avx512dq-vrangepd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vrangeps-2.c: Ditto.
	* gcc.target/i386/avx512dq-vreducepd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vreduceps-2.c: Ditto.
	* gcc.target/i386/avx512dq-vxorpd-2.c: Ditto.
	* gcc.target/i386/avx512dq-vxorps-2.c: Ditto.
	* gcc.target/i386/avx512f-helper.h: Ditto.
	* gcc.target/i386/avx512ifma-vpmaddhuq-2.c: Ditto.
	* gcc.target/i386/avx512ifma-vpmaddluq-2.c: Ditto.
	* gcc.target/i386/avx512vbmi-vpermb-2.c: Ditto.
	* gcc.target/i386/avx512vbmi-vpermi2b-2.c: Ditto.
	* gcc.target/i386/avx512vbmi-vpermt2b-2.c: Ditto.
	* gcc.target/i386/avx512vbmi-vpmultishiftqb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vaddpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vaddps-2.c: Ditto.
	* gcc.target/i386/avx512vl-valignd-2.c: Ditto.
	* gcc.target/i386/avx512vl-valignq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vandnpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vandnps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vandpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vandps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vblendmpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vblendmps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vbroadcastf32x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vbroadcastf32x4-2.c: Ditto.
	* gcc.target/i386/avx512vl-vbroadcastf64x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vbroadcasti32x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vbroadcasti32x4-2.c: Ditto.
	* gcc.target/i386/avx512vl-vbroadcasti64x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vbroadcastsd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vbroadcastss-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcmppd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcmpps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcompresspd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcompressps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtdq2pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtdq2ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtpd2dq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtpd2ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtpd2qq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtpd2udq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtpd2uqq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtph2ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtps2dq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtps2pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtps2ph-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtps2qq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtps2udq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtps2uqq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtqq2pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtqq2ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvttpd2dq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvttpd2qq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvttpd2udq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvttpd2uqq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvttps2dq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvttps2qq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvttps2udq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvttps2uqq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtudq2pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtudq2ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtuqq2pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vcvtuqq2ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vdbpsadbw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vdivpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vdivps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vexpandpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vexpandps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vextractf32x4-2.c: Ditto.
	* gcc.target/i386/avx512vl-vextractf64x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vextracti32x4-2.c: Ditto.
	* gcc.target/i386/avx512vl-vextracti64x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfixupimmpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfixupimmps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfmaddXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfmaddXXXps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfmaddsubXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfmaddsubXXXps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfmsubXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfmsubXXXps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfmsubaddXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfmsubaddXXXps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfnmaddXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfnmaddXXXps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfnmsubXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfnmsubXXXps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfpclasspd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vfpclassps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vgetexppd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vgetexpps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vgetmantpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vgetmantps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vinsertf32x4-2.c: Ditto.
	* gcc.target/i386/avx512vl-vinsertf64x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vinserti32x4-2.c: Ditto.
	* gcc.target/i386/avx512vl-vinserti64x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmaxpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmaxps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vminpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vminps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovapd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovaps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovddup-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovdqa32-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovdqa64-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovdqu16-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovdqu32-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovdqu64-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovdqu8-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovshdup-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovsldup-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovupd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmovups-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmulpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vmulps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vorpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vorps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpabsb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpabsd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpabsq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpabsw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpackssdw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpacksswb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpackusdw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpackuswb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpaddb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpaddd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpaddq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpaddsb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpaddsw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpaddusb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpaddusw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpaddw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpalignr-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpandd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpandnd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpandnq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpandq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpavgb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpavgw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpblendmb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpblendmd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpblendmq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpblendmw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpbroadcastb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpbroadcastd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpbroadcastq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpbroadcastw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpeqb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpeqd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpeqq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpequb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpequd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpequq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpequw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpeqw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpged-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgeq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgeud-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgeuq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgtb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgtd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgtq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgtub-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgtud-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgtuq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgtuw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpgtw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpled-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpleq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpleud-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpleuq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpltd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpltq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpltud-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpltuq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpneqd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpneqq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpnequd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpnequq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpub-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpud-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpuq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpuw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcmpw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcompressd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpcompressq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermi2b-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermi2d-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermi2pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermi2ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermi2q-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermi2w-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermilpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermilpdi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermilps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermilpsi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermpdi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermq-imm-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermq-var-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermt2b-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermt2d-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermt2pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermt2ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermt2q-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermt2w-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpermw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpexpandd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpexpandq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaddhuq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaddluq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaddubsw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaddwd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaxsb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaxsd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaxsq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaxsw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaxub-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaxud-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaxuq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmaxuw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpminsb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpminsd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpminsq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpminsw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpminub-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpminud-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpminuq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpminuw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovb2m-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovd2m-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovdb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovdw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovm2b-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovm2d-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovm2q-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovm2w-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovq2m-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovqb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovqd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovqw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsdb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsdw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsqb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsqd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsqw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovswb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsxbd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsxbq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsxbw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsxdq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsxwd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovsxwq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovusdb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovusdw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovusqb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovusqd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovusqw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovuswb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovw2m-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovwb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovzxbd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovzxbq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovzxbw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovzxdq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovzxwd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmovzxwq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmuldq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmulhrsw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmulhuw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmulhw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmulld-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmullq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmullw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmultishiftqb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpmuludq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpord-2.c: Ditto.
	* gcc.target/i386/avx512vl-vporq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vprold-2.c: Ditto.
	* gcc.target/i386/avx512vl-vprolq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vprolvd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vprolvq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vprord-2.c: Ditto.
	* gcc.target/i386/avx512vl-vprorq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vprorvd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vprorvq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpshufb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpshufd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpshufhw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpshuflw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpslld-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpslldi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsllq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsllqi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsllvd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsllvq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsllvw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsllw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsllwi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrad-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsradi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsraq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsraqi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsravd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsravq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsravw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsraw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrawi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrld-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrldi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrlq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrlqi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrlvd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrlvq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrlvw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrlw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsrlwi-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsubb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsubd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsubq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsubsb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsubsw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsubusb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsubusw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpsubw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpternlogd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpternlogq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vptestmb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vptestmd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vptestmq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vptestmw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vptestnmb-2.c: Ditto.
	* gcc.target/i386/avx512vl-vptestnmd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vptestnmq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vptestnmw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpunpckhbw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpunpckhdq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpunpckhqdq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpunpckhwd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpunpcklbw-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpunpckldq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpunpcklqdq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpunpcklwd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpxord-2.c: Ditto.
	* gcc.target/i386/avx512vl-vpxorq-2.c: Ditto.
	* gcc.target/i386/avx512vl-vrangepd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vrangeps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vrcp14pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vrcp14ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vreducepd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vreduceps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vrndscalepd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vrndscaleps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vrsqrt14pd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vrsqrt14ps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vscalefpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vscalefps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vshuff32x4-2.c: Ditto.
	* gcc.target/i386/avx512vl-vshuff64x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vshufi32x4-2.c: Ditto.
	* gcc.target/i386/avx512vl-vshufi64x2-2.c: Ditto.
	* gcc.target/i386/avx512vl-vshufpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vshufps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vsqrtpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vsqrtps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vsubpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vsubps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vunpckhpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vunpckhps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vunpcklpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vunpcklps-2.c: Ditto.
	* gcc.target/i386/avx512vl-vxorpd-2.c: Ditto.
	* gcc.target/i386/avx512vl-vxorps-2.c: Ditto.

From-SVN: r218203

518 files changed, 1563 insertions, 533 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 70e8f89..52ac186 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,523 @@
+2014-12-01  Ilya Tocar  <ilya.tocar@intel.com>
+
+	* gcc.target/i386/avx512bw-vdbpsadbw-2.c: Move defines from options.
+	* gcc.target/i386/avx512bw-vmovdqu16-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vmovdqu8-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpabsb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpabsw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpackssdw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpacksswb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpackusdw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpackuswb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpaddb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpaddsb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpaddsw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpaddusb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpaddusw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpaddw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpalignr-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpavgb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpavgw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpblendmb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpblendmw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpbroadcastb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpbroadcastw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpeqb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpequb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpequw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpeqw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpgeb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpgeub-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpgeuw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpgew-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpgtb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpgtub-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpgtuw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpgtw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpleb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpleub-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpleuw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmplew-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpltb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpltub-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpltuw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpltw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpneqb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpnequb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpnequw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpneqw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpub-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpuw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpcmpw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpermi2w-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpermt2w-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpermw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmaddubsw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmaddwd-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmaxsb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmaxsw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmaxub-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmaxuw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpminsb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpminsw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpminub-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpminuw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovb2m-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovm2b-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovm2w-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovswb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovsxbw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovuswb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovw2m-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovwb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmovzxbw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmulhrsw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmulhuw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmulhw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpmullw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpshufb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpshufhw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpshuflw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsllvw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsllw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsllwi-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsravw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsraw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsrawi-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsrlvw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsrlw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsrlwi-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsubb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsubsb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsubsw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsubusb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsubusw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpsubw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vptestmb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vptestmw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vptestnmb-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vptestnmw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpunpckhbw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpunpckhwd-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpunpcklbw-2.c: Ditto.
+	* gcc.target/i386/avx512bw-vpunpcklwd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vandnpd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vandnps-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vandpd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vandps-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vbroadcastf32x2-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vbroadcastf32x8-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vbroadcastf64x2-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vbroadcasti32x2-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vbroadcasti32x8-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vbroadcasti64x2-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvtpd2qq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvtpd2uqq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvtps2qq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvtps2uqq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvtqq2pd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvtqq2ps-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvttpd2qq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvttpd2uqq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvttps2qq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvttps2uqq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvtuqq2pd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vcvtuqq2ps-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vextractf64x2-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vextracti64x2-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vfpclasspd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vfpclassps-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vinsertf64x2-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vinserti64x2-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vorpd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vorps-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vpmovd2m-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vpmovm2d-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vpmovm2q-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vpmovq2m-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vpmullq-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vrangepd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vrangeps-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vreducepd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vreduceps-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vxorpd-2.c: Ditto.
+	* gcc.target/i386/avx512dq-vxorps-2.c: Ditto.
+	* gcc.target/i386/avx512f-helper.h: Ditto.
+	* gcc.target/i386/avx512ifma-vpmaddhuq-2.c: Ditto.
+	* gcc.target/i386/avx512ifma-vpmaddluq-2.c: Ditto.
+	* gcc.target/i386/avx512vbmi-vpermb-2.c: Ditto.
+	* gcc.target/i386/avx512vbmi-vpermi2b-2.c: Ditto.
+	* gcc.target/i386/avx512vbmi-vpermt2b-2.c: Ditto.
+	* gcc.target/i386/avx512vbmi-vpmultishiftqb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vaddpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vaddps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-valignd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-valignq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vandnpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vandnps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vandpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vandps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vblendmpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vblendmps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vbroadcastf32x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vbroadcastf32x4-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vbroadcastf64x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vbroadcasti32x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vbroadcasti32x4-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vbroadcasti64x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vbroadcastsd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vbroadcastss-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcmppd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcmpps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcompresspd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcompressps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtdq2pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtdq2ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtpd2dq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtpd2ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtpd2qq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtpd2udq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtpd2uqq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtph2ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtps2dq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtps2pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtps2ph-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtps2qq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtps2udq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtps2uqq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtqq2pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtqq2ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvttpd2dq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvttpd2qq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvttpd2udq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvttpd2uqq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvttps2dq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvttps2qq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvttps2udq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvttps2uqq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtudq2pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtudq2ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtuqq2pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vcvtuqq2ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vdbpsadbw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vdivpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vdivps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vexpandpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vexpandps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vextractf32x4-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vextractf64x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vextracti32x4-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vextracti64x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfixupimmpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfixupimmps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfmaddXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfmaddXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfmaddsubXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfmaddsubXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfmsubXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfmsubXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfmsubaddXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfmsubaddXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfnmaddXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfnmaddXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfnmsubXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfnmsubXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfpclasspd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vfpclassps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vgetexppd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vgetexpps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vgetmantpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vgetmantps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vinsertf32x4-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vinsertf64x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vinserti32x4-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vinserti64x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmaxpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmaxps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vminpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vminps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovapd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovaps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovddup-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovdqa32-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovdqa64-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovdqu16-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovdqu32-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovdqu64-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovdqu8-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovshdup-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovsldup-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovupd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmovups-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmulpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vmulps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vorpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vorps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpabsb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpabsd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpabsq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpabsw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpackssdw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpacksswb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpackusdw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpackuswb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpaddb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpaddd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpaddq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpaddsb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpaddsw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpaddusb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpaddusw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpaddw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpalignr-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpandd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpandnd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpandnq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpandq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpavgb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpavgw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpblendmb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpblendmd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpblendmq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpblendmw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpbroadcastb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpbroadcastd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpbroadcastq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpbroadcastw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpeqb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpeqd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpeqq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpequb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpequd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpequq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpequw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpeqw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpged-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgeq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgeud-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgeuq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgtb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgtd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgtq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgtub-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgtud-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgtuq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgtuw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpgtw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpled-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpleq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpleud-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpleuq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpltd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpltq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpltud-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpltuq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpneqd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpneqq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpnequd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpnequq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpub-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpud-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpuq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpuw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcmpw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcompressd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpcompressq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermi2b-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermi2d-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermi2pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermi2ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermi2q-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermi2w-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermilpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermilpdi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermilps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermilpsi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermpdi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermq-imm-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermq-var-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermt2b-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermt2d-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermt2pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermt2ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermt2q-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermt2w-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpermw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpexpandd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpexpandq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaddhuq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaddluq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaddubsw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaddwd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaxsb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaxsd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaxsq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaxsw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaxub-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaxud-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaxuq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmaxuw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpminsb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpminsd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpminsq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpminsw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpminub-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpminud-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpminuq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpminuw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovb2m-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovd2m-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovdb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovdw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovm2b-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovm2d-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovm2q-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovm2w-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovq2m-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovqb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovqd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovqw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsdb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsdw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsqb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsqd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsqw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovswb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsxbd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsxbq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsxbw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsxdq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsxwd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovsxwq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovusdb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovusdw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovusqb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovusqd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovusqw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovuswb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovw2m-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovwb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovzxbd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovzxbq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovzxbw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovzxdq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovzxwd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmovzxwq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmuldq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmulhrsw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmulhuw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmulhw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmulld-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmullq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmullw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmultishiftqb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpmuludq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpord-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vporq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vprold-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vprolq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vprolvd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vprolvq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vprord-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vprorq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vprorvd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vprorvq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpshufb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpshufd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpshufhw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpshuflw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpslld-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpslldi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsllq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsllqi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsllvd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsllvq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsllvw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsllw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsllwi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrad-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsradi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsraq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsraqi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsravd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsravq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsravw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsraw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrawi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrld-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrldi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrlq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrlqi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrlvd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrlvq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrlvw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrlw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsrlwi-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsubb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsubd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsubq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsubsb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsubsw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsubusb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsubusw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpsubw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpternlogd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpternlogq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vptestmb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vptestmd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vptestmq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vptestmw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vptestnmb-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vptestnmd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vptestnmq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vptestnmw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpunpckhbw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpunpckhdq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpunpckhqdq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpunpckhwd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpunpcklbw-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpunpckldq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpunpcklqdq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpunpcklwd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpxord-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vpxorq-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vrangepd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vrangeps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vrcp14pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vrcp14ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vreducepd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vreduceps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vrndscalepd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vrndscaleps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vrsqrt14pd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vrsqrt14ps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vscalefpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vscalefps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vshuff32x4-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vshuff64x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vshufi32x4-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vshufi64x2-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vshufpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vshufps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vsqrtpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vsqrtps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vsubpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vsubps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vunpckhpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vunpckhps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vunpcklpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vunpcklps-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vxorpd-2.c: Ditto.
+	* gcc.target/i386/avx512vl-vxorps-2.c: Ditto.
+
 2014-12-01  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/63738
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vdbpsadbw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vdbpsadbw-2.c
index cbd50d3..fd81dba 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vdbpsadbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vdbpsadbw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vmovdqu16-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vmovdqu16-2.c
index 48a59b8..a61609c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vmovdqu16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vmovdqu16-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE ((AVX512F_LEN) / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vmovdqu8-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vmovdqu8-2.c
index 4c65cf5..a56e61f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vmovdqu8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vmovdqu8-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE ((AVX512F_LEN) / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpabsb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpabsb-2.c
index 9cd6ce1..8776ad4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpabsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpabsb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpabsw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpabsw-2.c
index 07e9bfe..2933809 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpabsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpabsw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpackssdw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpackssdw-2.c
index 3a9f5c0..af14464 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpackssdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpackssdw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define DST_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpacksswb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpacksswb-2.c
index 734f3ff..dc390bb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpacksswb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpacksswb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define DST_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpackusdw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpackusdw-2.c
index 2083b59..8431086 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpackusdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpackusdw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define DST_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpackuswb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpackuswb-2.c
index 5a8d796..ca31d8e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpackuswb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpackuswb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define DST_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddb-2.c
index 92ab041..e74a5a3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddsb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddsb-2.c
index 28759bb..fd9a9ea 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddsb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddsw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddsw-2.c
index 2f6b118..0749c72 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddsw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddusb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddusb-2.c
index e67232f..33bb2a5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddusb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddusb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddusw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddusw-2.c
index 138ee40..cdc7d00 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddusw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddusw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddw-2.c
index 3b38370..290d8f5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpaddw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpaddw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpalignr-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpalignr-2.c
index 4de6e05..dc92889 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpalignr-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpalignr-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpavgb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpavgb-2.c
index 2dabd71..7a1f441 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpavgb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpavgb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpavgw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpavgw-2.c
index 5149686..1f7b319 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpavgw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpavgw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpblendmb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpblendmb-2.c
index 107559b..d9ef481 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpblendmb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpblendmb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpblendmw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpblendmw-2.c
index d4fb51c..1b60bf0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpblendmw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpblendmw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpbroadcastb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpbroadcastb-2.c
index 821b5dd..7bf0b41 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpbroadcastb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpbroadcastb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpbroadcastw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpbroadcastw-2.c
index 6e68aa1..db4c2fe 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpbroadcastw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpbroadcastw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpb-2.c
index 8b0c541..b6f5677 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpeqb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpeqb-2.c
index 4e81f2b..6713d61 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpeqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpeqb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpequb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpequb-2.c
index 06f1c99..6a5bcea 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpequb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpequb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpequw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpequw-2.c
index 3fc0e7d..adc7f2d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpequw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpequw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpeqw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpeqw-2.c
index 2ff608a..f7e75f4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpeqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpeqw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeb-2.c
index fe28ffb..56bde4d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeub-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeub-2.c
index 29a88c9..efcd4e4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeub-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeuw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeuw-2.c
index b0105aa..89a0865 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgeuw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgew-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgew-2.c
index 6b94030..164258c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgew-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgew-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtb-2.c
index f99c238..b3d8a2e2a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtub-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtub-2.c
index a0f1508..db84a55 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtub-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtuw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtuw-2.c
index e11be51..6397d1b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtuw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtw-2.c
index b56fca8..6612eb7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpgtw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleb-2.c
index 45caba4..1b4eba4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleub-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleub-2.c
index 1145dd5..bec00e7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleub-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleuw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleuw-2.c
index 6402836..8810005 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpleuw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmplew-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmplew-2.c
index 5ee845a..cefc3f8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmplew-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmplew-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltb-2.c
index a53dd2d..134df0e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltub-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltub-2.c
index 3d83967..ebd9996c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltub-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltuw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltuw-2.c
index 82b997c..a426a8c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltuw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltw-2.c
index 387d7bb..91fd7d5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpltw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpneqb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpneqb-2.c
index db43880..6d52f07 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpneqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpneqb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpnequb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpnequb-2.c
index da13d7c..bbad53c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpnequb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpnequb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpnequw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpnequw-2.c
index e8b8c61..53a722d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpnequw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpnequw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpneqw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpneqw-2.c
index 0b5005f..5e81906 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpneqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpneqw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpub-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpub-2.c
index be288c9..8fdc9f2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpub-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpuw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpuw-2.c
index 5870305..2c9f5a8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpuw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpw-2.c
index 54c3588..08a3b4c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpcmpw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpermi2w-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpermi2w-2.c
index 52d7ac2..0fd83da 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpermi2w-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpermi2w-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpermt2w-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpermt2w-2.c
index 58d75f4..50446be 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpermt2w-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpermt2w-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpermw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpermw-2.c
index 1746534..2eab0c0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpermw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpermw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddubsw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddubsw-2.c
index e3bd83f..d66be4f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddubsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddubsw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddwd-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddwd-2.c
index fb6ef8e..3d08543 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddwd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxsb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxsb-2.c
index 9d81e41..343f4f7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxsb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxsw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxsw-2.c
index 608fbf4..ef3663c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxsw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxub-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxub-2.c
index bcfa472..1d00bfd 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxub-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxuw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxuw-2.c
index e9f80f8..ff98e08 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaxuw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpminsb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpminsb-2.c
index 7f5532e..7e41263 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpminsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpminsb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpminsw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpminsw-2.c
index d7e6896..a6221ad 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpminsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpminsw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpminub-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpminub-2.c
index 57e1ed5..fa70bb5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpminub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpminub-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpminuw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpminuw-2.c
index a3834b3..7dfdd4b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpminuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpminuw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovb2m-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovb2m-2.c
index 0e6db4d..fecaf6a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovb2m-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovb2m-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovm2b-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovm2b-2.c
index 17a6dc6..7fa532f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovm2b-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovm2b-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovm2w-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovm2w-2.c
index 073bdc9..6a1a071 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovm2w-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovm2w-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovswb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovswb-2.c
index 46cf03c..69e25a2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovswb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovswb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovsxbw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovsxbw-2.c
index 4cc4405..75229b2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovsxbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovsxbw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN_HALF / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovuswb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovuswb-2.c
index cc82398..094d432 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovuswb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovuswb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovw2m-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovw2m-2.c
index 916d481..450afac 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovw2m-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovw2m-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovwb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovwb-2.c
index 16dff18..32857da 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovwb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovwb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovzxbw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovzxbw-2.c
index 7048147..34e6423 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmovzxbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmovzxbw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN_HALF / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhrsw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhrsw-2.c
index 4ae2f36..eeb8261 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhrsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhrsw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhuw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhuw-2.c
index 512940a..ab14f71 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhuw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhw-2.c
index d87932d..956d7ab 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmulhw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmullw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmullw-2.c
index 6038823..cfa2569 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmullw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmullw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpshufb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpshufb-2.c
index 6b43dcf..77516ca 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpshufb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpshufb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpshufhw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpshufhw-2.c
index 4043217..4c1ae83 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpshufhw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpshufhw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpshuflw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpshuflw-2.c
index 72dda61..d4f2947 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpshuflw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpshuflw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsllvw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsllvw-2.c
index e8a5f20..09f2337 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsllvw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsllvw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE    (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsllw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsllw-2.c
index 3eb629b..231aa47 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsllw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsllw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsllwi-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsllwi-2.c
index 87d55f7..de86829 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsllwi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsllwi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsravw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsravw-2.c
index 225d732..f40c229 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsravw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsravw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE    (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsraw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsraw-2.c
index f1649c2..15c5ebb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsraw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsraw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsrawi-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsrawi-2.c
index b72b806..79ccc65 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsrawi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsrawi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlvw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlvw-2.c
index eb98685..cf38c7a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlvw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlvw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE    (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlw-2.c
index 611a8a8..7a8fed3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlwi-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlwi-2.c
index 1dfe644..52189b7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlwi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsrlwi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubb-2.c
index 1a4cc80..f4b8e7f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubsb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubsb-2.c
index b602b38..2fe2fe9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubsb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubsw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubsw-2.c
index a4e519b..bfe3651 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubsw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubusb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubusb-2.c
index d8b5e55..be28eb2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubusb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubusb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubusw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubusw-2.c
index deb30cd..91ac594 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubusw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubusw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubw-2.c
index 9febeaa..4d45e57 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpsubw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpsubw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vptestmb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vptestmb-2.c
index 106a8da..ca93732 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vptestmb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vptestmb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vptestmw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vptestmw-2.c
index 82a5dd9..4378f2a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vptestmw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vptestmw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vptestnmb-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vptestnmb-2.c
index d9ca442..c298019 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vptestnmb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vptestnmb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vptestnmw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vptestnmw-2.c
index 0e2b4ad..8296157 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vptestnmw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vptestnmw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpunpckhbw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpunpckhbw-2.c
index 21fcee8..586699e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpunpckhbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpunpckhbw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpunpckhwd-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpunpckhwd-2.c
index 13ea5b9..960a9d8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpunpckhwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpunpckhwd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpunpcklbw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpunpcklbw-2.c
index ce155a8..dc2ab07 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpunpcklbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpunpcklbw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpunpcklwd-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpunpcklwd-2.c
index a29e4d4..7c877a5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpunpcklwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpunpcklwd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -DAVX512BW" } */
+/* { dg-options "-O2 -mavx512bw" } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512BW
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vandnpd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vandnpd-2.c
index 88e52e0..0be2b7c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vandnpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vandnpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vandnps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vandnps-2.c
index 14df2fb..39a45c1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vandnps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vandnps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vandpd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vandpd-2.c
index e5a7365..208336b6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vandpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vandpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vandps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vandps-2.c
index 013e1ec..50268b9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vandps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vandps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf32x2-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf32x2-2.c
index 142ac93..0b58804 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf32x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf32x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf32x8-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf32x8-2.c
index 26d2251..6d531d0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf32x8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf32x8-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf64x2-2.c
index ebb1114..7bbf06c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcastf64x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti32x2-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti32x2-2.c
index ccca285..32b2ada 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti32x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti32x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti32x8-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti32x8-2.c
index 3be8746..252755e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti32x8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti32x8-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti64x2-2.c
index ac761c8..97f9c9b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vbroadcasti64x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtpd2qq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtpd2qq-2.c
index 0e30bfe..012cf08 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtpd2qq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtpd2qq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtpd2uqq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtpd2uqq-2.c
index de14628..35795ec 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtpd2uqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtpd2uqq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq  -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtps2qq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtps2qq-2.c
index 60659d1..5f99e79 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtps2qq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtps2qq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtps2uqq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtps2uqq-2.c
index bab1717..57f6f8a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtps2uqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtps2uqq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtqq2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtqq2pd-2.c
index 7143415..c1bfee8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtqq2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtqq2pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtqq2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtqq2ps-2.c
index 751c086..4af95ce 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtqq2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtqq2ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvttpd2qq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvttpd2qq-2.c
index 6b33822..a02e4d0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvttpd2qq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvttpd2qq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvttpd2uqq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvttpd2uqq-2.c
index 39f450c..ef7f10f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvttpd2uqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvttpd2uqq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvttps2qq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvttps2qq-2.c
index 2b3b38b..928659e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvttps2qq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvttps2qq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvttps2uqq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvttps2uqq-2.c
index 1221ebe..fe3f861 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvttps2uqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvttps2uqq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtuqq2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtuqq2pd-2.c
index 907e1d9..80833b7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtuqq2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtuqq2pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtuqq2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtuqq2ps-2.c
index 794024f..7bd3b9d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vcvtuqq2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vcvtuqq2ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vextractf64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vextractf64x2-2.c
index 02a2543..5beace8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vextractf64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vextractf64x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vextracti64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vextracti64x2-2.c
index 95fb0cf..dfedec5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vextracti64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vextracti64x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vfpclasspd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vfpclasspd-2.c
index 000e091..0d648f5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vfpclasspd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vfpclasspd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vfpclassps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vfpclassps-2.c
index e02e382..a6b9a29 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vfpclassps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vfpclassps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vinsertf64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vinsertf64x2-2.c
index 00c1c80..961beed 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vinsertf64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vinsertf64x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 #include "string.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vinserti64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vinserti64x2-2.c
index 63ed54e..db93db2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vinserti64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vinserti64x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 #include "string.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vorpd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vorpd-2.c
index c5ef030..97fe84e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vorpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vorpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE    (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vorps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vorps-2.c
index 87d8e02..95a7c5f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vorps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vorps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE    (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vpmovd2m-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vpmovd2m-2.c
index 24fdf4a..02b9513 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vpmovd2m-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vpmovd2m-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vpmovm2d-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vpmovm2d-2.c
index 67b78de..2861130 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vpmovm2d-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vpmovm2d-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vpmovm2q-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vpmovm2q-2.c
index c7a6c55..6527ebe 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vpmovm2q-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vpmovm2q-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vpmovq2m-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vpmovq2m-2.c
index b7816cb..805357b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vpmovq2m-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vpmovq2m-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vpmullq-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vpmullq-2.c
index 2184834..c114cc8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vpmullq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vpmullq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vrangepd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vrangepd-2.c
index fc032fb..45532a9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vrangepd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vrangepd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vrangeps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vrangeps-2.c
index 373260a..3be8c09 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vrangeps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vrangeps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vreducepd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vreducepd-2.c
index 3e231ab..00a190e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vreducepd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vreducepd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vreduceps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vreduceps-2.c
index 97afd2a..9d20dcb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vreduceps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vreduceps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vxorpd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vxorpd-2.c
index 060861a..4f4a07e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vxorpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vxorpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE    (AVX512F_LEN / 64)
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vxorps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vxorps-2.c
index 5360c04..144283e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vxorps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vxorps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -DAVX512DQ" } */
+/* { dg-options "-O2 -mavx512dq" } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512DQ
 #include "avx512f-helper.h"
 
 #define SIZE    (AVX512F_LEN / 32)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-helper.h b/gcc/testsuite/gcc.target/i386/avx512f-helper.h
index e270cd2..5923085 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-helper.h
+++ b/gcc/testsuite/gcc.target/i386/avx512f-helper.h
@@ -10,20 +10,20 @@
 
 #if defined (AVX512F) && !defined (AVX512VL)
 #include "avx512f-check.h"
-#elif defined (AVX512ER)
+#elif defined (AVX512ER) && !defined (AVX512VL)
 #include "avx512er-check.h"
-#elif defined (AVX512CD)
+#elif defined (AVX512CD) && !defined (AVX512VL)
 #include "avx512cd-check.h"
-#elif defined (AVX512DQ)
+#elif defined (AVX512DQ) && !defined (AVX512VL)
 #include "avx512dq-check.h"
-#elif defined (AVX512BW)
+#elif defined (AVX512BW) && !defined (AVX512VL)
 #include "avx512bw-check.h"
-#elif defined (AVX512VL)
-#include "avx512vl-check.h"
-#elif defined (AVX512IFMA)
+#elif defined (AVX512IFMA) && !defined (AVX512VL)
 #include "avx512ifma-check.h"
-#elif defined (AVX512VBMI)
+#elif defined (AVX512VBMI) && !defined (AVX512VL)
 #include "avx512vbmi-check.h"
+#elif defined (AVX512VL)
+#include "avx512vl-check.h"
 #endif
 
 /* Macros expansion.  */
@@ -114,27 +114,27 @@ void test_128 ();
 #if defined (AVX512F) && !defined (AVX512VL)
 void
 avx512f_test (void) { test_512 (); }
-#elif defined (AVX512CD)
+#elif defined (AVX512CD) && !defined (AVX512VL)
 void
 avx512cd_test (void) { test_512 (); }
-#elif defined (AVX512ER)
+#elif defined (AVX512ER) && !defined (AVX512VL)
 void
 avx512er_test (void) { test_512 (); }
-#elif defined (AVX512DQ)
+#elif defined (AVX512DQ) && !defined (AVX512VL)
 void
 avx512dq_test (void) { test_512 (); }
-#elif defined (AVX512BW)
+#elif defined (AVX512BW) && !defined (AVX512VL)
 void
 avx512bw_test (void) { test_512 (); }
-#elif defined (AVX512VL)
-void
-avx512vl_test (void) { test_256 (); test_128 (); }
-#elif defined (AVX512IFMA)
+#elif defined (AVX512IFMA) && !defined (AVX512VL)
 void
 avx512ifma_test (void) { test_512 (); }
-#elif defined (AVX512VBMI)
+#elif defined (AVX512VBMI) && !defined (AVX512VL)
 void
 avx512vbmi_test (void) { test_512 (); }
+#elif defined (AVX512VL)
+void
+avx512vl_test (void) { test_256 (); test_128 (); }
 #endif
 
 #endif /* AVX512F_HELPER_INCLUDED */
diff --git a/gcc/testsuite/gcc.target/i386/avx512ifma-vpmaddhuq-2.c b/gcc/testsuite/gcc.target/i386/avx512ifma-vpmaddhuq-2.c
index edb28cb..79f3da9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512ifma-vpmaddhuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512ifma-vpmaddhuq-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512ifma -DAVX512IFMA" } */
+/* { dg-options "-O2 -mavx512ifma" } */
 /* { dg-require-effective-target avx512ifma } */
 
 #include "avx512f-helper.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx512ifma-vpmaddluq-2.c b/gcc/testsuite/gcc.target/i386/avx512ifma-vpmaddluq-2.c
index 6937d13..f6e4db1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512ifma-vpmaddluq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512ifma-vpmaddluq-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512ifma -DAVX512IFMA" } */
+/* { dg-options "-O2 -mavx512ifma" } */
 /* { dg-require-effective-target avx512ifma } */
 
 #include "avx512f-helper.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermb-2.c b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermb-2.c
index fa22fd9..3027cf6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermb-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vbmi -DAVX512VBMI" } */
+/* { dg-options "-O2 -mavx512vbmi" } */
 /* { dg-require-effective-target avx512vbmi } */
 
 #include "avx512f-helper.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermi2b-2.c b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermi2b-2.c
index 694b23b..cb69fc5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermi2b-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermi2b-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vbmi -DAVX512VBMI" } */
+/* { dg-options "-O2 -mavx512vbmi" } */
 /* { dg-require-effective-target avx512vbmi } */
 
 #include "avx512f-helper.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermt2b-2.c b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermt2b-2.c
index c9f46596..f6cb5b7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermt2b-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermt2b-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vbmi -DAVX512VBMI" } */
+/* { dg-options "-O2 -mavx512vbmi" } */
 /* { dg-require-effective-target avx512vbmi } */
 
 #include "avx512f-helper.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpmultishiftqb-2.c b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpmultishiftqb-2.c
index 936d938..861dce2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpmultishiftqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpmultishiftqb-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vbmi -DAVX512VBMI" } */
+/* { dg-options "-O2 -mavx512vbmi" } */
 /* { dg-require-effective-target avx512vbmi } */
 
 #include "avx512f-helper.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vaddpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vaddpd-2.c
index e9fd14b..50654f7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vaddpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vaddpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vaddpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vaddps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vaddps-2.c
index 0c2b7f1..4759591 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vaddps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vaddps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vaddps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-valignd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-valignd-2.c
index ef7c678..6906841 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-valignd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-valignd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-valignd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-valignq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-valignq-2.c
index b59cbf0..3443fb3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-valignq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-valignq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-valignq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vandnpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vandnpd-2.c
index 295c606..21c74e8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vandnpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vandnpd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vandnpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vandnps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vandnps-2.c
index 650aede..1df4b57 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vandnps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vandnps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vandnps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vandpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vandpd-2.c
index 6486ed4..5911f71 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vandpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vandpd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vandpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vandps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vandps-2.c
index b17e037..ea626bc 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vandps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vandps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vandps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vblendmpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vblendmpd-2.c
index 56b80b1..e437eb3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vblendmpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vblendmpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vblendmpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vblendmps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vblendmps-2.c
index 16a40f8..174378d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vblendmps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vblendmps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vblendmps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf32x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf32x2-2.c
index 5ea6b4d..ef005a83 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf32x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf32x2-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vbroadcastf32x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf32x4-2.c
index d6faf77..ac00889 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf32x4-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -mavx512dq -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl -mavx512dq" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vbroadcastf32x4-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf64x2-2.c
index 3e7fcec..e1189aa 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastf64x2-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vbroadcastf64x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti32x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti32x2-2.c
index f683ca5..04a8e47 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti32x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti32x2-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vbroadcasti32x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti32x4-2.c
index 6c70ea8..c700d8e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti32x4-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -mavx512dq -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl -mavx512dq" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vbroadcasti32x4-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti64x2-2.c
index 8e80606..ac34ceb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcasti64x2-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vbroadcasti64x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastsd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastsd-2.c
index 1655482..b6216b5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastsd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vbroadcastsd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastss-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastss-2.c
index e6dae6f..ebc7458 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vbroadcastss-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vbroadcastss-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcmppd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcmppd-2.c
index 2c4937f..f01f5f5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcmppd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcmppd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcmppd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcmpps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcmpps-2.c
index 6a726df..b3e2c31 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcmpps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcmpps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcmpps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcompresspd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcompresspd-2.c
index eee9bfb..6e0a3b8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcompresspd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcompresspd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcompresspd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcompressps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcompressps-2.c
index 67c7790..22f21a3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcompressps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcompressps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcompressps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtdq2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtdq2pd-2.c
index 8d45492..35cc411 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtdq2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtdq2pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtdq2pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtdq2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtdq2ps-2.c
index d675154..5d02daf 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtdq2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtdq2ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtdq2ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2dq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2dq-2.c
index c16d528..5dd618f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2dq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2dq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtpd2dq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2ps-2.c
index 854a334..f51c74e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtpd2ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2qq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2qq-2.c
index 7f441ad..96926bd 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2qq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2qq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvtpd2qq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2udq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2udq-2.c
index d949d43..bec4c0c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2udq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2udq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtpd2udq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2uqq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2uqq-2.c
index 892ff80..464f7d6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2uqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtpd2uqq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvtpd2uqq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtph2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtph2ps-2.c
index 5d2c110..8be4393 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtph2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtph2ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mf16c -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mf16c -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtph2ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2dq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2dq-2.c
index ba660ba..835a94a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2dq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2dq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtps2dq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2pd-2.c
index 641d861..715a4b6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtps2pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2ph-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2ph-2.c
index 3d9e4fb..ea77c206 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2ph-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2ph-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mf16c -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mf16c -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtps2ph-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2qq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2qq-2.c
index a4c8233..0fa8365 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2qq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2qq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvtps2qq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2udq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2udq-2.c
index 6bb3272..2d582a2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2udq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2udq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtps2udq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2uqq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2uqq-2.c
index eaf5cb9..f0d7245 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2uqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtps2uqq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvtps2uqq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtqq2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtqq2pd-2.c
index ce33011..2714ace 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtqq2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtqq2pd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvtqq2pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtqq2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtqq2ps-2.c
index b3d1539..7cedf45 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtqq2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtqq2ps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvtqq2ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2dq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2dq-2.c
index 24fd9ad..413fba6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2dq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2dq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvttpd2dq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2qq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2qq-2.c
index c616a98..8e2090b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2qq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2qq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvttpd2qq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2udq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2udq-2.c
index 53f0420..9967ad3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2udq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2udq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvttpd2udq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2uqq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2uqq-2.c
index d7f1fc5..38da995 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2uqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttpd2uqq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvttpd2uqq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2dq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2dq-2.c
index 173db3c..8b63d8b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2dq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2dq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvttps2dq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2qq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2qq-2.c
index dcf6dcb..129f501 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2qq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2qq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvttps2qq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2udq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2udq-2.c
index e8779ea..fd468aa 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2udq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2udq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvttps2udq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2uqq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2uqq-2.c
index cd9b2dd..d61963e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2uqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvttps2uqq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvttps2uqq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtudq2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtudq2pd-2.c
index 6984485..0f980ac 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtudq2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtudq2pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtudq2pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtudq2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtudq2ps-2.c
index 98731c6..ec84338 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtudq2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtudq2ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vcvtudq2ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtuqq2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtuqq2pd-2.c
index e813a26..929e5fa 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtuqq2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtuqq2pd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvtuqq2pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtuqq2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtuqq2ps-2.c
index dd2fecd..ba390ba 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vcvtuqq2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vcvtuqq2ps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vcvtuqq2ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vdbpsadbw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vdbpsadbw-2.c
index ade4ddc..ecc687a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vdbpsadbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vdbpsadbw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vdbpsadbw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vdivpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vdivpd-2.c
index bf9c415..22e6d6c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vdivpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vdivpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vdivpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vdivps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vdivps-2.c
index 629bd1d..fa42c8f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vdivps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vdivps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vdivps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vexpandpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vexpandpd-2.c
index 4cb6a22..69745a3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vexpandpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vexpandpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vexpandpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vexpandps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vexpandps-2.c
index d9ccd4e..015f37c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vexpandps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vexpandps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vexpandps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vextractf32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vextractf32x4-2.c
index c93d518..681554e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vextractf32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vextractf32x4-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vextractf32x4-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vextractf64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vextractf64x2-2.c
index 23ee6f0..814138a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vextractf64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vextractf64x2-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vextractf64x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-2.c
index d9c4090..6ec3a34 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vextracti32x4-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vextracti32x4-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vextracti64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vextracti64x2-2.c
index af17319..a64f74a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vextracti64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vextracti64x2-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vextracti64x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfixupimmpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfixupimmpd-2.c
index 3675009..13153e3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfixupimmpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfixupimmpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfixupimmpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfixupimmps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfixupimmps-2.c
index a37ad59..596b51d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfixupimmps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfixupimmps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfixupimmps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddXXXpd-2.c
index 3fdb818..4b26846 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddXXXpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfmaddXXXpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddXXXps-2.c
index 8d5dd76..ee97c08 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddXXXps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfmaddXXXps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddsubXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddsubXXXpd-2.c
index 178d43c..4f1be52 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddsubXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddsubXXXpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfmaddsubXXXpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddsubXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddsubXXXps-2.c
index b148aef..1d668c4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddsubXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfmaddsubXXXps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfmaddsubXXXps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubXXXpd-2.c
index 6a973dc..610c912 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubXXXpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfmsubXXXpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubXXXps-2.c
index e9059e2..ca1aa0b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubXXXps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfmsubXXXps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubaddXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubaddXXXpd-2.c
index 733416c..c76ec5d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubaddXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubaddXXXpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfmsubaddXXXpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubaddXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubaddXXXps-2.c
index eade1ca..3644601 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubaddXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfmsubaddXXXps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfmsubaddXXXps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfnmaddXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfnmaddXXXpd-2.c
index 4f37d83..768ecda 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfnmaddXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfnmaddXXXpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfnmaddXXXpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfnmaddXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfnmaddXXXps-2.c
index 72b722d..325b382 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfnmaddXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfnmaddXXXps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfnmaddXXXps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfnmsubXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfnmsubXXXpd-2.c
index f236967..8bdb065 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfnmsubXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfnmsubXXXpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfnmsubXXXpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfnmsubXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfnmsubXXXps-2.c
index 1913e44..f0c5f1a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfnmsubXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfnmsubXXXps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vfnmsubXXXps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfpclasspd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfpclasspd-2.c
index 6a2a8d9..8db7477 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfpclasspd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfpclasspd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vfpclasspd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vfpclassps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vfpclassps-2.c
index a090abf..de72b5f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vfpclassps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vfpclassps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vfpclassps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vgetexppd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vgetexppd-2.c
index b8ebaf5..faf4be8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vgetexppd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vgetexppd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vgetexppd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vgetexpps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vgetexpps-2.c
index 643ccae..b881af3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vgetexpps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vgetexpps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vgetexpps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vgetmantpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vgetmantpd-2.c
index 7007074..ad86543 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vgetmantpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vgetmantpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vgetmantpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vgetmantps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vgetmantps-2.c
index b76ca95..6e3927f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vgetmantps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vgetmantps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vgetmantps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vinsertf32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vinsertf32x4-2.c
index f6f9802..c4b3b75 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vinsertf32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vinsertf32x4-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vinsertf32x4-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vinsertf64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vinsertf64x2-2.c
index d62212f..93235dd 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vinsertf64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vinsertf64x2-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vinsertf64x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vinserti32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vinserti32x4-2.c
index 03c29ae..780d9fc 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vinserti32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vinserti32x4-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vinserti32x4-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vinserti64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vinserti64x2-2.c
index c2a9985..97e22e6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vinserti64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vinserti64x2-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vinserti64x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmaxpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmaxpd-2.c
index 40c878d..df3c54a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmaxpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmaxpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmaxpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmaxps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmaxps-2.c
index d86addd..38176fc 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmaxps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmaxps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmaxps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vminpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vminpd-2.c
index deea053..ed4b659 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vminpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vminpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vminpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vminps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vminps-2.c
index b896a34..c5175bc 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vminps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vminps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vminps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovapd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovapd-2.c
index 11d7af1..67abadb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovapd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovapd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovapd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovaps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovaps-2.c
index 6d876e9..fb8ef9d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovaps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovaps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovaps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovddup-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovddup-2.c
index a5eaaaf..f989aeb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovddup-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovddup-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovddup-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqa32-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqa32-2.c
index 0a0c905..805a0c4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqa32-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqa32-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovdqa32-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqa64-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqa64-2.c
index c404ea7..f673add 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqa64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqa64-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovdqa64-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu16-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu16-2.c
index 6d0c53f..45ae83d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu16-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vmovdqu16-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu32-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu32-2.c
index ffff00d..4b928d0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu32-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu32-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovdqu32-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu64-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu64-2.c
index 451edcc..1863ed3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu64-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovdqu64-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu8-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu8-2.c
index 5fc8b95..0ac8c45 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovdqu8-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vmovdqu8-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovshdup-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovshdup-2.c
index d7b883d..664761d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovshdup-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovshdup-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovshdup-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovsldup-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovsldup-2.c
index 877f190..010ecb7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovsldup-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovsldup-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovsldup-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovupd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovupd-2.c
index f9ccc6a..5938113 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovupd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovupd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovupd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmovups-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmovups-2.c
index fe49a6c..db4a42c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmovups-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmovups-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmovups-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmulpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmulpd-2.c
index ffd0862..ec52677 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmulpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmulpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmulpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vmulps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vmulps-2.c
index b0cf529..f404cb7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vmulps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vmulps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vmulps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vorpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vorpd-2.c
index e44bb9d..f7c5826 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vorpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vorpd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vorpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vorps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vorps-2.c
index d3d2425..4743e4d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vorps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vorps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vorps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpabsb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpabsb-2.c
index 07d6624..3d103f3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpabsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpabsb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpabsb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpabsd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpabsd-2.c
index 4106fe3..ee4a489 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpabsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpabsd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpabsd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpabsq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpabsq-2.c
index 4e9a54a..5132b57 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpabsq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpabsq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpabsq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpabsw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpabsw-2.c
index 9201b27..43f35e5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpabsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpabsw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpabsw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpackssdw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpackssdw-2.c
index b5003fc..f1a7c9a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpackssdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpackssdw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpackssdw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpacksswb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpacksswb-2.c
index cf5330f..3e134d3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpacksswb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpacksswb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpacksswb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpackusdw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpackusdw-2.c
index aafb93d..4013001 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpackusdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpackusdw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpackusdw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpackuswb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpackuswb-2.c
index bc9f888..263061a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpackuswb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpackuswb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpackuswb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddb-2.c
index 357f43f..8de15a7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpaddb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddd-2.c
index 3dc72ef..2486d7a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpaddd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddq-2.c
index 7fb63b7..c201cc6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpaddq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddsb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddsb-2.c
index b4e35a3..251f5b8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddsb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpaddsb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddsw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddsw-2.c
index eee80d5..d457222 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddsw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpaddsw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddusb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddusb-2.c
index 51ede22..5fa70ef 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddusb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddusb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpaddusb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddusw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddusw-2.c
index 42c7d27..8b339f4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddusw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddusw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpaddusw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddw-2.c
index f311198..0318f65 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpaddw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpaddw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpaddw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpalignr-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpalignr-2.c
index 2f52d84..4c44bf7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpalignr-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpalignr-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpalignr-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpandd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpandd-2.c
index 85a806b..b5d254b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpandd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpandd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpandd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpandnd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpandnd-2.c
index 8805d30..fb8785e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpandnd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpandnd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpandnd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpandnq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpandnq-2.c
index da4169b..ea0e6a3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpandnq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpandnq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpandnq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpandq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpandq-2.c
index 3579cf4..e763fd2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpandq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpandq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpandq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpavgb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpavgb-2.c
index 001e6b6..80a423b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpavgb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpavgb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpavgb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpavgw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpavgw-2.c
index 146832a..db670db 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpavgw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpavgw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpavgw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmb-2.c
index a666793..0274b69 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpblendmb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmd-2.c
index b05227c..d46f7e6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpblendmd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmq-2.c
index 2b15de6..9821e73 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpblendmq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmw-2.c
index cb59427..a2fb910 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpblendmw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpblendmw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastb-2.c
index 6d0ad64..67a1faf 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpbroadcastb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-2.c
index bfa207f..af387c2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpbroadcastd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-2.c
index f488028..46608d48 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpbroadcastq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastw-2.c
index 7f51fbb..a6f3f43 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpbroadcastw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpb-2.c
index 954672f..6b041db 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpd-2.c
index 957cb03..8273ec1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqb-2.c
index c5c6d2b..b366766 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpeqb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqd-2.c
index fd6982e..102de3c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpeqd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqq-2.c
index b99ac1b..a5385ef 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpeqq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequb-2.c
index b97bc31..d05aa89 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpequb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequd-2.c
index 364c45e..a5ebb08 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpequd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequq-2.c
index 32a9b1f..e9892fd 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpequq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequw-2.c
index 40491ef..163a06b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpequw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpequw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqw-2.c
index 7cf17aa..8f1a5e1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpeqw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpeqw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpged-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpged-2.c
index 4af12f2..d0910af 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpged-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpged-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpged-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeq-2.c
index ca5a3cb..ad24100 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpgeq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeud-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeud-2.c
index f9ad3d4..89c54d2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeud-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpgeud-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeuq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeuq-2.c
index 2ed2506..843c063 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgeuq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpgeuq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtb-2.c
index 30235f6..9088b2d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpgtb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtd-2.c
index 99daeb4..c0af97b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpgtd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtq-2.c
index 85f47be..2880f22 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpgtq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtub-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtub-2.c
index c5f0683..8b528e4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtub-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpgtub-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtud-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtud-2.c
index 7a9117f..ba0beee 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtud-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpgtud-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtuq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtuq-2.c
index c0bf472..59bbe37 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtuq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpgtuq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtuw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtuw-2.c
index 9acc331..38a72a9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtuw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpgtuw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtw-2.c
index f9a3c8e..b5d8cde 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpgtw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpgtw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpled-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpled-2.c
index 756b836..180e295 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpled-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpled-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpled-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleq-2.c
index 5a34271..88009d3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpleq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleud-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleud-2.c
index dc26cd2..1fa4f70 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleud-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpleud-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleuq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleuq-2.c
index 41ebcb9..907dc8c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpleuq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpleuq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltd-2.c
index 2e0e5d5..48a1d3a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpltd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltq-2.c
index 5e3d16c..bf5b6c8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpltq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltud-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltud-2.c
index 59d45ce..da4c41c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltud-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpltud-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltuq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltuq-2.c
index 4380c69..41186af 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpltuq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpltuq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpneqd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpneqd-2.c
index 2fe87e9..1815fe5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpneqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpneqd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpneqd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpneqq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpneqq-2.c
index c0fb029..98a287c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpneqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpneqq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpneqq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpnequd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpnequd-2.c
index ac93267..7d67c02 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpnequd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpnequd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpnequd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpnequq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpnequq-2.c
index 649179f..a20214e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpnequq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpnequq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpnequq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpq-2.c
index 7de8414..a1cc386 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpub-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpub-2.c
index ee44b46..a9439f9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpub-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpub-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpud-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpud-2.c
index 0df8f86..999eba6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpud-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpud-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpuq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpuq-2.c
index 1889627..3e245f3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpuq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcmpuq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpuw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpuw-2.c
index c098707..319f4ac 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpuw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpuw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpw-2.c
index 76a8b76..2173161 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcmpw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpcmpw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcompressd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcompressd-2.c
index f6f1b08..ab3b3d9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcompressd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcompressd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcompressd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpcompressq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpcompressq-2.c
index f9544eb..4e7bc40 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpcompressq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpcompressq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpcompressq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermb-2.c
index e29f955..a060c76 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vbmi -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vbmi -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512vbmi } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512vbmi-vpermb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermd-2.c
index 1d10e6e..7784992 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2b-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2b-2.c
index 9742e57..4a6a8b2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2b-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2b-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vbmi -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vbmi -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512vbmi } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512vbmi-vpermi2b-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2d-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2d-2.c
index 090cb40..458d7c3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2d-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2d-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermi2d-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2pd-2.c
index a4ce132..ad6a80e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermi2pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2ps-2.c
index 377ee1b..9017042 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermi2ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2q-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2q-2.c
index 22418b3..acf6cac 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2q-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2q-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermi2q-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2w-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2w-2.c
index 4b8881e..674a4d1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2w-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermi2w-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpermi2w-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpd-2.c
index bf23830..a7f4b94 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermilpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpdi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpdi-2.c
index 5a2b404..0ee7781 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpdi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpdi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermilpdi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermilps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermilps-2.c
index df724c7..1eb5f94 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermilps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermilps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermilps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpsi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpsi-2.c
index c5e7cbf..ff47914 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpsi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermilpsi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermilpsi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermpd-2.c
index 84ae966..d808532 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermpdi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermpdi-2.c
index c48043b..33fb0c1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermpdi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermpdi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermpdi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermps-2.c
index e53b177..b88c994 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermq-imm-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermq-imm-2.c
index ac7c671..72111f2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermq-imm-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermq-imm-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermq-imm-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermq-var-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermq-var-2.c
index af096f5..ce9ca28 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermq-var-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermq-var-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermq-var-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2b-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2b-2.c
index 3fea19a..06c8d4b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2b-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2b-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vbmi -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vbmi -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512vbmi } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512vbmi-vpermt2b-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2d-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2d-2.c
index 82e045c..5c314c6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2d-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2d-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermt2d-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2pd-2.c
index 66681eb..5ccdb73 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermt2pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2ps-2.c
index cf6e0a8..71d0e62 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermt2ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2q-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2q-2.c
index 998b175..c4ffb1f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2q-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2q-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpermt2q-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2w-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2w-2.c
index a164962..b9ba2a8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2w-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermt2w-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpermt2w-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpermw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpermw-2.c
index 01ef5fa..ddf99ba 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpermw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpermw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpermw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpexpandd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpexpandd-2.c
index c353d5a..9423de2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpexpandd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpexpandd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpexpandd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpexpandq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpexpandq-2.c
index 2b571b7..3842e6e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpexpandq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpexpandq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpexpandq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddhuq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddhuq-2.c
index f39b625..b332590 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddhuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddhuq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512ifma -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512ifma -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512ifma } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512ifma-vpmaddhuq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddluq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddluq-2.c
index a77c853..b92f493 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddluq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddluq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512ifma -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512ifma -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512ifma } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512ifma-vpmaddluq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddubsw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddubsw-2.c
index 55fc2af..050b1a2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddubsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddubsw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmaddubsw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddwd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddwd-2.c
index 29050a3..c9aef28 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaddwd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmaddwd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsb-2.c
index 8c78eed..44ed427 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmaxsb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsd-2.c
index ff1017a..dc85e2c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmaxsd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsq-2.c
index 958e8d3..1124538 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmaxsq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsw-2.c
index 83b428f..ef895fc 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxsw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmaxsw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxub-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxub-2.c
index 8b3d5a0..3bce70a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxub-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmaxub-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxud-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxud-2.c
index f61e911..3db9887 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxud-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmaxud-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxuq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxuq-2.c
index bb98556..4316b9e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxuq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmaxuq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxuw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxuw-2.c
index 057596c..a68d74f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmaxuw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmaxuw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpminsb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpminsb-2.c
index 3fc972b..5ec17d7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpminsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpminsb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpminsb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpminsd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpminsd-2.c
index cc465e8..f119a03 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpminsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpminsd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpminsd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpminsq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpminsq-2.c
index b0f68a0..a600486 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpminsq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpminsq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpminsq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpminsw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpminsw-2.c
index a75a741..d7fa900 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpminsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpminsw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpminsw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpminub-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpminub-2.c
index ae17a48..12ab4c1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpminub-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpminub-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpminub-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpminud-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpminud-2.c
index 34a17f8..4afbb85 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpminud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpminud-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpminud-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpminuq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpminuq-2.c
index 67f1e4a..2ff5e91 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpminuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpminuq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpminuq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpminuw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpminuw-2.c
index 80ab7ee..f51b1ff 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpminuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpminuw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpminuw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovb2m-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovb2m-2.c
index 7a0c962..c84ff16 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovb2m-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovb2m-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovb2m-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovd2m-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovd2m-2.c
index 4435ca5..14a9f83 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovd2m-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovd2m-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vpmovd2m-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovdb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovdb-2.c
index 1d2f3ad..bfaf1e3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovdb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovdb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovdb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovdw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovdw-2.c
index 7ec7637..7ebe1ee 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovdw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovdw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2b-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2b-2.c
index 5137303..133b69e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2b-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2b-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovm2b-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2d-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2d-2.c
index 4463334..4a1a871 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2d-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2d-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vpmovm2d-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2q-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2q-2.c
index 9402f68..5d7c8a0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2q-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2q-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vpmovm2q-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2w-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2w-2.c
index 4e7465a..ff3d6f6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2w-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovm2w-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovm2w-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovq2m-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovq2m-2.c
index ce758f2..06e47d1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovq2m-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovq2m-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vpmovq2m-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqb-2.c
index 893d30b..a953264 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovqb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqd-2.c
index 2570919..2d48d8f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovqd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqw-2.c
index 0983ac5..1ece8f2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovqw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovqw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsdb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsdb-2.c
index 2a73d23..5785cf3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsdb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsdb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsdb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsdw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsdw-2.c
index e1bd82ab..9467ac3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsdw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsdw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqb-2.c
index 0ffc86c..abac1a3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsqb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqd-2.c
index 7e9ed10..e89a7f5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsqd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqw-2.c
index d0dacb4..88f709e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsqw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsqw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovswb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovswb-2.c
index 39e662d..1feab98 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovswb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovswb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovswb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbd-2.c
index 1b36fd4..eeb8ba8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsxbd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbq-2.c
index 289ebd4..f4bca1d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsxbq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbw-2.c
index 510b7dd..6ed81ce 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxbw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovsxbw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxdq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxdq-2.c
index 8c564c1..f256ec2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxdq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsxdq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxwd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxwd-2.c
index e8d466c..4417c77 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxwd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsxwd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxwq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxwq-2.c
index cb4cf24..e878d17 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxwq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovsxwq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovsxwq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusdb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusdb-2.c
index 4230463..e1ec299 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusdb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusdb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovusdb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusdw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusdw-2.c
index db4fff6..5f8ddd6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusdw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovusdw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqb-2.c
index 644f178..52906f6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqb-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovusqb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqd-2.c
index 6ea1dac..23eb3ee 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovusqd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqw-2.c
index a7a34af..00550bf 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovusqw-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovusqw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovuswb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovuswb-2.c
index ba5c228..0f7260c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovuswb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovuswb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovuswb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovw2m-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovw2m-2.c
index ea66420..ae26d9e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovw2m-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovw2m-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovw2m-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovwb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovwb-2.c
index eb017e2..4483b53 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovwb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovwb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovwb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbd-2.c
index db10b72..07674f9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovzxbd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbq-2.c
index bd19332..7fad51c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovzxbq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbw-2.c
index 56cb8f7..f3b02d2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxbw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmovzxbw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxdq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxdq-2.c
index c351c22..11e1207 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxdq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovzxdq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxwd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxwd-2.c
index a8eef3e..48d79cf 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxwd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovzxwd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxwq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxwq-2.c
index 1be6cb5..82e9864 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxwq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmovzxwq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmovzxwq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmuldq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmuldq-2.c
index 7d2eea5..dfdf4b2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmuldq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmuldq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmuldq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhrsw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhrsw-2.c
index 86c2e42..de9ac90 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhrsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhrsw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmulhrsw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhuw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhuw-2.c
index 7e498b1..c477831 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhuw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhuw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmulhuw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhw-2.c
index c43d4cb..2eee93c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmulhw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmulhw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmulld-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmulld-2.c
index 1ea4456..b0bc1f7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmulld-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmulld-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmulld-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmullq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmullq-2.c
index aef44b6..6eae64b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmullq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmullq-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vpmullq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmullw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmullw-2.c
index 91b7769..1e91087 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmullw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmullw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpmullw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmultishiftqb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmultishiftqb-2.c
index c5b3acd..c17a8fb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmultishiftqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmultishiftqb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vbmi -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vbmi -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512vbmi } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512vbmi-vpmultishiftqb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpmuludq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpmuludq-2.c
index cd2b3e6d..f51f5fa 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpmuludq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpmuludq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpmuludq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpord-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpord-2.c
index c81e1f7..0f2f2e1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpord-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpord-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpord-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vporq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vporq-2.c
index 776181f..0b63a29 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vporq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vporq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vporq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vprold-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vprold-2.c
index 4c7b4ab..af99f13 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vprold-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vprold-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vprold-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vprolq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vprolq-2.c
index cf1f98f..a9102c41 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vprolq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vprolq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vprolq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vprolvd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vprolvd-2.c
index 0f31644..511c882 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vprolvd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vprolvd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vprolvd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vprolvq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vprolvq-2.c
index b203c9f..8ac0f03 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vprolvq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vprolvq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vprolvq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vprord-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vprord-2.c
index 6ae0e3b..ed4b2b2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vprord-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vprord-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vprord-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vprorq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vprorq-2.c
index 83aacd1..c2be259 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vprorq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vprorq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vprorq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vprorvd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vprorvd-2.c
index 373beeb..7e638f2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vprorvd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vprorvd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vprorvd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vprorvq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vprorvq-2.c
index 781b62b..d747909 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vprorvq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vprorvq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vprorvq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpshufb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpshufb-2.c
index 9949553..1719a08 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpshufb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpshufb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpshufb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpshufd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpshufd-2.c
index 54223fd..dfab269 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpshufd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpshufd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpshufd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpshufhw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpshufhw-2.c
index 296e563..2dfc1e5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpshufhw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpshufhw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpshufhw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpshuflw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpshuflw-2.c
index 0e59841..3fa5d49 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpshuflw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpshuflw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpshuflw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpslld-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpslld-2.c
index 681feb0..dc40089 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpslld-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpslld-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpslld-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpslldi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpslldi-2.c
index 31baa68..619a9d8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpslldi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpslldi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpslldi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllq-2.c
index 135292f..61de652 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsllq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllqi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllqi-2.c
index 764df71..b23ae1f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllqi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllqi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsllqi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvd-2.c
index f1281d3..f3933ff 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsllvd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvq-2.c
index 19b087b..5fb4890 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsllvq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvw-2.c
index 65db920..370cc11 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllvw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsllvw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllw-2.c
index d0ca765..6479c8d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsllw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllwi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllwi-2.c
index 7126b7e..baa38c9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsllwi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsllwi-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsllwi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrad-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrad-2.c
index 86abe6c..37d889a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrad-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrad-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsrad-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsradi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsradi-2.c
index b778745..c967adb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsradi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsradi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsradi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsraq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsraq-2.c
index 3331f6b..a13c8e0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsraq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsraq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsraq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsraqi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsraqi-2.c
index 25b6c44..c69d87b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsraqi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsraqi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsraqi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsravd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsravd-2.c
index da8c2af..586cc3d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsravd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsravd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsravd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsravq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsravq-2.c
index ae95fa3..99d3770 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsravq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsravq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsravq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsravw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsravw-2.c
index 6767690..c89ee12 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsravw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsravw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsravw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsraw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsraw-2.c
index ad6643c..039c74b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsraw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsraw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsraw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrawi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrawi-2.c
index 1d5aab7..331541f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrawi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrawi-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsrawi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrld-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrld-2.c
index 1c420f1..8808f81 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrld-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrld-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsrld-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrldi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrldi-2.c
index 86ff3ab..e76074e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrldi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrldi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsrldi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlq-2.c
index db6a3d1..9590629 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsrlq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlqi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlqi-2.c
index 25a1f24..4ca5e31 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlqi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlqi-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsrlqi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvd-2.c
index dfbf364..5f3ae27 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsrlvd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvq-2.c
index e9640a7..3a0bcc0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsrlvq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvw-2.c
index 7208e64..ae348f5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlvw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsrlvw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlw-2.c
index 4927183..3bdc755 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsrlw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlwi-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlwi-2.c
index 674db9f..8ad39d0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlwi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsrlwi-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsrlwi-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubb-2.c
index 7dcd9a4..15209a0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsubb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubd-2.c
index f16988f..ed75957 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsubd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubq-2.c
index 37e4d82..0941995 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpsubq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubsb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubsb-2.c
index 1aed17a..158a011 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubsb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubsb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsubsb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubsw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubsw-2.c
index 1633766..2ac2463 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubsw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsubsw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubusb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubusb-2.c
index 167b937..2e787d4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubusb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubusb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsubusb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubusw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubusw-2.c
index a4c94b3..707a9b2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubusw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubusw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsubusw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubw-2.c
index 0b69b89..90b7f1c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpsubw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpsubw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpsubw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpternlogd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpternlogd-2.c
index 0336a15..9a38aa7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpternlogd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpternlogd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpternlogd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpternlogq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpternlogq-2.c
index 9187e0a..7ba8691 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpternlogq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpternlogq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpternlogq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vptestmb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vptestmb-2.c
index 6d74789..562422d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vptestmb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vptestmb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vptestmb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vptestmd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vptestmd-2.c
index d0fed97..96fdb11 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vptestmd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vptestmd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vptestmd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vptestmq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vptestmq-2.c
index 0cc4124..e9cf332 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vptestmq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vptestmq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vptestmq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vptestmw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vptestmw-2.c
index b4bcdbd..ea112e3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vptestmw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vptestmw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vptestmw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmb-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmb-2.c
index 8406692..04d480a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmb-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vptestnmb-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmd-2.c
index 307e618..94b5889 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vptestnmd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmq-2.c
index 89aa0ff..2ff8dca 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vptestnmq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmw-2.c
index b759078..7d13557 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vptestnmw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vptestnmw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhbw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhbw-2.c
index 16821a4..1891aea 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhbw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpunpckhbw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhdq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhdq-2.c
index 6d4743c..0f873d3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhdq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpunpckhdq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhqdq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhqdq-2.c
index f61e456..3258aab 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhqdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhqdq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpunpckhqdq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhwd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhwd-2.c
index 9af0062..16e6997 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckhwd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpunpckhwd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklbw-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklbw-2.c
index 35f4a99..07ea644 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklbw-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpunpcklbw-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckldq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckldq-2.c
index 6d3099e..dd2b9fb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckldq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpckldq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpunpckldq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklqdq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklqdq-2.c
index 37ec820..006497f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklqdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklqdq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpunpcklqdq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklwd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklwd-2.c
index 491e542..d7fbe5e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpunpcklwd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512bw -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512bw -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512bw } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512bw-vpunpcklwd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpxord-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpxord-2.c
index f67fdf9..135ccf6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpxord-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpxord-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpxord-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpxorq-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpxorq-2.c
index f28e671..aaa16a4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpxorq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpxorq-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vpxorq-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vrangepd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vrangepd-2.c
index 8e0fb3a..494f51c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vrangepd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vrangepd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vrangepd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vrangeps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vrangeps-2.c
index 5051f25..992f0bb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vrangeps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vrangeps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vrangeps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vrcp14pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vrcp14pd-2.c
index 737c81d..799205a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vrcp14pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vrcp14pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vrcp14pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vrcp14ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vrcp14ps-2.c
index 8241aa2..9afa0c9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vrcp14ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vrcp14ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vrcp14ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vreducepd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vreducepd-2.c
index bede79a..baac062 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vreducepd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vreducepd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vreducepd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vreduceps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vreduceps-2.c
index 6920924..f16df83 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vreduceps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vreduceps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vreduceps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vrndscalepd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vrndscalepd-2.c
index 77d5631..8a14946 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vrndscalepd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vrndscalepd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vrndscalepd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vrndscaleps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vrndscaleps-2.c
index 7f7566b..ea80cd0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vrndscaleps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vrndscaleps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vrndscaleps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vrsqrt14pd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vrsqrt14pd-2.c
index 750e591..21ab50f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vrsqrt14pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vrsqrt14pd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vrsqrt14pd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vrsqrt14ps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vrsqrt14ps-2.c
index 6eed598..35810f9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vrsqrt14ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vrsqrt14ps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vrsqrt14ps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vscalefpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vscalefpd-2.c
index 0d8e4c4..92efc1c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vscalefpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vscalefpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vscalefpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vscalefps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vscalefps-2.c
index d655a1b..0b152f4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vscalefps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vscalefps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vscalefps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vshuff32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vshuff32x4-2.c
index 7fbbff3..17af751 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vshuff32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vshuff32x4-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vshuff32x4-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vshuff64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vshuff64x2-2.c
index e751077..a5475b5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vshuff64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vshuff64x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vshuff64x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vshufi32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vshufi32x4-2.c
index 8debef4..dad5596 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vshufi32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vshufi32x4-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vshufi32x4-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vshufi64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vshufi64x2-2.c
index 726234c..af8be05d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vshufi64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vshufi64x2-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vshufi64x2-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vshufpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vshufpd-2.c
index 8b4ef98..088f7b3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vshufpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vshufpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vshufpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vshufps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vshufps-2.c
index 260922f..3928eba 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vshufps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vshufps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vshufps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vsqrtpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vsqrtpd-2.c
index 15698e2..d0a7d2a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vsqrtpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vsqrtpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vsqrtpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vsqrtps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vsqrtps-2.c
index 1bd5bb1..1d88da1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vsqrtps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vsqrtps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vsqrtps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vsubpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vsubpd-2.c
index b3a9c8f..8c880a0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vsubpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vsubpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512f -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512f -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vsubpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vsubps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vsubps-2.c
index d22740a..66027c9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vsubps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vsubps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vsubps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vunpckhpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vunpckhpd-2.c
index a3323db..115196d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vunpckhpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vunpckhpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vunpckhpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vunpckhps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vunpckhps-2.c
index 211cbd9..407cf25 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vunpckhps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vunpckhps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vunpckhps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vunpcklpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vunpcklpd-2.c
index 03df654..7034816 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vunpcklpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vunpcklpd-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vunpcklpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vunpcklps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vunpcklps-2.c
index 2fa9306..d15d69d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vunpcklps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vunpcklps-2.c
@@ -1,7 +1,8 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512f-vunpcklps-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vxorpd-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vxorpd-2.c
index 8a8eb39..95bc8c9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vxorpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vxorpd-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vxorpd-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vxorps-2.c b/gcc/testsuite/gcc.target/i386/avx512vl-vxorps-2.c
index 1f255cd..9d48437 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vxorps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vxorps-2.c
@@ -1,8 +1,9 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mavx512dq -mavx512vl -DAVX512VL" } */
+/* { dg-options "-O2 -mavx512dq -mavx512vl" } */
 /* { dg-require-effective-target avx512vl } */
 /* { dg-require-effective-target avx512dq } */
 
+#define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
 #include "avx512dq-vxorps-2.c"