i386: Refactor AVX10.2 runtime test

Since everything is under avx10.2, we could use a header
file plus a file actually run all the tests for runtime
test.

gcc/testsuite/ChangeLog:

	* gcc.target/i386/avx10-check.h: Remove AVX10_512BIT.
	* gcc.target/i386/avx10-minmax-helper.h: Ditto.
	* gcc.target/i386/avx10_2-vaddbf16-2.c: Add 512 test.
	* gcc.target/i386/avx10_2-vcmpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvt2ps2phx-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbf162ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbf162iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvthf82ph-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2bf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2bf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2hf8-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2hf8s-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtph2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtps2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvtps2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttbf162ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttbf162iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttpd2dqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttpd2qqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttpd2udqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttpd2uqqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttph2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttph2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2dqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2ibs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2iubs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2qqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2udqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vcvttps2uqqs-2.c: Ditto.
	* gcc.target/i386/avx10_2-vdivbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vdpphps-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfmaddXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfmsubXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vfpclassbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vgetexpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vgetmantbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vmaxbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxpd-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxph-2.c: Ditto.
	* gcc.target/i386/avx10_2-vminmaxps-2.c: Ditto.
	* gcc.target/i386/avx10_2-vmpsadbw-2.c: Ditto.
	* gcc.target/i386/avx10_2-vmulbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbssd-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbssds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbsud-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbsuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbuud-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpbuuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwsud-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwsuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwusd-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwusds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwuud-2.c: Ditto.
	* gcc.target/i386/avx10_2-vpdpwuuds-2.c: Ditto.
	* gcc.target/i386/avx10_2-vrcpbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vreducebf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vrndscalebf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vrsqrtbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vscalefbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vsqrtbf16-2.c: Ditto.
	* gcc.target/i386/avx10_2-vsubbf16-2.c: Ditto.
	* gcc.target/i386/avx512f-helper.h: Remove AVX10_512BIT.
	* gcc.target/i386/sm4-check.h: Use AVX10_2.
	* gcc.target/i386/avx10_2-512-vaddbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vaddbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcmpbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcmpbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvt2ph2bf8-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvt2ph2bf8-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvt2ph2bf8s-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvt2ph2hf8-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvt2ph2hf8-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvt2ph2hf8s-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvt2ps2phx-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvt2ps2phx-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtbf162ibs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtbf162ibs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtbf162iubs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtbf162iubs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtbiasph2bf8-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtbiasph2bf8s-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtbiasph2hf8-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtbiasph2hf8s-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvthf82ph-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvthf82ph-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtph2bf8-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtph2bf8-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtph2bf8s-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtph2bf8s-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtph2hf8-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtph2hf8-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtph2hf8s-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtph2hf8s-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtph2ibs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtph2ibs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtph2iubs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtph2iubs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtps2ibs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtps2ibs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvtps2iubs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvtps2iubs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttbf162ibs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttbf162ibs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttbf162iubs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttbf162iubs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttpd2dqs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttpd2dqs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttpd2qqs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttpd2qqs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttpd2udqs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttpd2udqs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttpd2uqqs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttpd2uqqs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttph2ibs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttph2ibs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttph2iubs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttph2iubs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttps2dqs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttps2dqs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttps2ibs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttps2ibs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttps2iubs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttps2iubs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttps2qqs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttps2qqs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttps2udqs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttps2udqs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vcvttps2uqqs-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vcvttps2uqqs-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vdivbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vdivbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vdpphps-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vdpphps-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vfmaddXXXbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vfmaddXXXbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vfmsubXXXbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vfmsubXXXbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vfnmaddXXXbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vfnmsubXXXbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vfpclassbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vfpclassbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vgetexpbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vgetexpbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vgetmantbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vgetmantbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vmaxbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vmaxbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vminbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vminbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vminmaxbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vminmaxbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vminmaxpd-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vminmaxpd-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vminmaxph-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vminmaxph-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vminmaxps-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vminmaxps-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vmpsadbw-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vmpsadbw-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vmulbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vmulbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpbssd-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpbssd-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpbssds-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpbssds-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpbsud-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpbsud-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpbsuds-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpbsuds-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpbuud-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpbuud-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpbuuds-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpbuuds-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpwsud-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpwsud-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpwsuds-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpwsuds-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpwusd-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpwusd-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpwusds-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpwusds-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpwuud-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpwuud-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vpdpwuuds-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vpdpwuuds-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vrcpbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vrcpbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vreducebf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vreducebf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vrndscalebf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vrndscalebf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vrsqrtbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vrsqrtbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vscalefbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vscalefbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vsqrtbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vsqrtbf16-2.h: ...here.
	* gcc.target/i386/avx10_2-512-vsubbf16-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/avx10_2-vsubbf16-2.h: ...here.
	* gcc.target/i386/sm4key4-avx10_2-512-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/sm4key4-avx10_2-2.c: ...here.
	* gcc.target/i386/sm4rnds4-avx10_2-512-2.c:
	Remove 512 test. Move to...
	* gcc.target/i386/sm4rnds4-avx10_2-2.c: ...here.
	* gcc.target/i386/vnniint16-auto-vectorize-4.c: Use AVX10_SCALAR
	for 512 bit test.
	* gcc.target/i386/vnniint8-auto-vectorize-4.c: Ditto.

152 files changed, 522 insertions, 848 deletions

diff --git a/gcc/testsuite/gcc.target/i386/avx10-check.h b/gcc/testsuite/gcc.target/i386/avx10-check.h
index 7d4326d..6a1a151 100644
--- a/gcc/testsuite/gcc.target/i386/avx10-check.h
+++ b/gcc/testsuite/gcc.target/i386/avx10-check.h
@@ -5,9 +5,8 @@
 
 #ifndef DO_TEST
 #define DO_TEST do_test
-#if defined(AVX10_512BIT) || defined(AVX10_SCALAR)
 static void test_512 (void);
-#else
+#ifndef AVX10_SCALAR
 static void test_256 (void);
 static void test_128 (void);
 #endif
@@ -16,9 +15,8 @@ __attribute__ ((noinline))
 static void
 do_test (void)
 {
-#if defined(AVX10_512BIT) || defined(AVX10_SCALAR)
   test_512 ();
-#else
+#ifndef AVX10_SCALAR
   test_256 ();
   test_128 ();
 #endif
diff --git a/gcc/testsuite/gcc.target/i386/avx10-minmax-helper.h b/gcc/testsuite/gcc.target/i386/avx10-minmax-helper.h
index e799975..6c9bffc 100644
--- a/gcc/testsuite/gcc.target/i386/avx10-minmax-helper.h
+++ b/gcc/testsuite/gcc.target/i386/avx10-minmax-helper.h
@@ -66,12 +66,10 @@ check_minmax_##UNION_TYPE (UNION_TYPE u, const VALUE_TYPE *v) \
   return err; \
 }
 
-#if defined (AVX10_512BIT)
 CHECK_EXP_MINMAX (union512, float, int)
 CHECK_EXP_MINMAX (union512d, double, long int)
 CHECK_EXP_MINMAX (union512bf16_bf, __bf16, short int)
 CHECK_EXP_MINMAX (union512h, _Float16, short int)
-#endif
 CHECK_EXP_MINMAX (union256, float, int)
 CHECK_EXP_MINMAX (union256d, double, long int)
 CHECK_EXP_MINMAX (union128, float, int)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vaddbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vaddbf16-2.c
index d880454..36f5bd7 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vaddbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vaddbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vaddbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vaddbf16-2.c"
+#include "avx10_2-vaddbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vaddbf16-2.c" 
+#include "avx10_2-vaddbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vaddbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vaddbf16-2.h
index 4aca46d..a65c647 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vaddbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vaddbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcmpbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcmpbf16-2.c
index cb6506a..643fb26 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcmpbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcmpbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcmpbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcmpbf16-2.c"
+#include "avx10_2-vcmpbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcmpbf16-2.c" 
+#include "avx10_2-vcmpbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcmpbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcmpbf16-2.h
index 885cec7..2c0fde0 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcmpbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcmpbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8-2.c
index 9dd940c..dae2f44 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvt2ph2bf8-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ph2bf8-2.c"
+#include "avx10_2-vcvt2ph2bf8-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ph2bf8-2.c"
+#include "avx10_2-vcvt2ph2bf8-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2bf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8-2.h
index 5bd2b7f..b46540b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2bf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.c
index 2a9caca..badd865 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvt2ph2bf8s-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ph2bf8s-2.c"
+#include "avx10_2-vcvt2ph2bf8s-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ph2bf8s-2.c"
+#include "avx10_2-vcvt2ph2bf8s-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2bf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.h
index 33d9c0c..398c67b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2bf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8-2.c
index 80dc248..4555b3d 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvt2ph2hf8-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ph2hf8-2.c"
+#include "avx10_2-vcvt2ph2hf8-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ph2hf8-2.c"
+#include "avx10_2-vcvt2ph2hf8-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2hf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8-2.h
index b9fdbd4..89a2c7e 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2hf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.c
index 30f6a60..ba62e547 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvt2ph2hf8s-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ph2hf8s-2.c"
+#include "avx10_2-vcvt2ph2hf8s-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ph2hf8s-2.c"
+#include "avx10_2-vcvt2ph2hf8s-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2hf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.h
index b9fdfac..2556c3f 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2hf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ps2phx-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ps2phx-2.c
index 125713c..27735c0 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ps2phx-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ps2phx-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvt2ps2phx-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ps2phx-2.c"
+#include "avx10_2-vcvt2ps2phx-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvt2ps2phx-2.c"
+#include "avx10_2-vcvt2ps2phx-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ps2phx-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ps2phx-2.h
index f9f799a..f7d4365 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ps2phx-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ps2phx-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <stdint.h>
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162ibs-2.c
index 824ec68..a420901 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162ibs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtbf162ibs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbf162ibs-2.c"
+#include "avx10_2-vcvtbf162ibs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbf162ibs-2.c" 
+#include "avx10_2-vcvtbf162ibs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbf162ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162ibs-2.h
index 4976892..9f984d1 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbf162ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162ibs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <math.h>
 #include <limits.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162iubs-2.c
index b8f9925..7fdae8f 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162iubs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtbf162iubs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbf162iubs-2.c"
+#include "avx10_2-vcvtbf162iubs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbf162iubs-2.c" 
+#include "avx10_2-vcvtbf162iubs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbf162iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162iubs-2.h
index 03bd36a..b5eb59f 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbf162iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162iubs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <math.h>
 #include <limits.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.c
index e3f2a81..7c56893 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtbiasph2bf8-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbiasph2bf8-2.c"
+#include "avx10_2-vcvtbiasph2bf8-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbiasph2bf8-2.c"
+#include "avx10_2-vcvtbiasph2bf8-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2bf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.h
index 4d90dcf8..42a81d8 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2bf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.c
index 2b9f81d..3d2851b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtbiasph2bf8s-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbiasph2bf8s-2.c"
+#include "avx10_2-vcvtbiasph2bf8s-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbiasph2bf8s-2.c"
+#include "avx10_2-vcvtbiasph2bf8s-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2bf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.h
index 93de7ea..2477960 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2bf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.c
index 27e5f210..ac832d2 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtbiasph2hf8-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbiasph2hf8-2.c"
+#include "avx10_2-vcvtbiasph2hf8-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbiasph2hf8-2.c"
+#include "avx10_2-vcvtbiasph2hf8-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2hf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.h
index 14a2251..629c8a7 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2hf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.c
index b93a1f978..bff5282 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtbiasph2hf8s-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbiasph2hf8s-2.c"
+#include "avx10_2-vcvtbiasph2hf8s-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtbiasph2hf8s-2.c"
+#include "avx10_2-vcvtbiasph2hf8s-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2hf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.h
index 0333f08..fdda376 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2hf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvthf82ph-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvthf82ph-2.c
index d647fde..d6f5040 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvthf82ph-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvthf82ph-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvthf82ph-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
-#define AVX512F_LEN 256 
+#define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvthf82ph-2.c"
+#include "avx10_2-vcvthf82ph-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvthf82ph-2.c"
+#include "avx10_2-vcvthf82ph-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvthf82ph-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvthf82ph-2.h
index 9301ee3..7e9e894 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvthf82ph-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvthf82ph-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8-2.c
index 826b5ff..aa10ebe 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtph2bf8-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2bf8-2.c"
+#include "avx10_2-vcvtph2bf8-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2bf8-2.c"
+#include "avx10_2-vcvtph2bf8-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2bf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8-2.h
index f42f856..2ea3710 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2bf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8s-2.c
index c5b9576..471e702 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8s-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtph2bf8s-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2bf8s-2.c"
+#include "avx10_2-vcvtph2bf8s-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2bf8s-2.c"
+#include "avx10_2-vcvtph2bf8s-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2bf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8s-2.h
index c22e1aa..242975d 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2bf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8s-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8-2.c
index 00f2928..e260dca 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtph2hf8-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2hf8-2.c"
+#include "avx10_2-vcvtph2hf8-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2hf8-2.c"
+#include "avx10_2-vcvtph2hf8-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2hf8-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8-2.h
index e328e9d..84aba75 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2hf8-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8s-2.c
index a2fa0c8..06882b8 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8s-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtph2hf8s-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2hf8s-2.c"
+#include "avx10_2-vcvtph2hf8s-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2hf8s-2.c"
+#include "avx10_2-vcvtph2hf8s-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2hf8s-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8s-2.h
index e6872e8..28604c6 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2hf8s-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8s-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 #include "fp8-helper.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2ibs-2.c
index 2265f81..627829c 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2ibs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtph2ibs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2ibs-2.c"
+#include "avx10_2-vcvtph2ibs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2ibs-2.c" 
+#include "avx10_2-vcvtph2ibs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2ibs-2.h
index 2bddbb1..62fd1c5 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2ibs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2iubs-2.c
index c4b2b575..009fcaf 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2iubs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtph2iubs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2iubs-2.c"
+#include "avx10_2-vcvtph2iubs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtph2iubs-2.c" 
+#include "avx10_2-vcvtph2iubs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2iubs-2.h
index df73fcd..aa6ed98 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2iubs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2ibs-2.c
index fdf825b..f5bd1dc 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2ibs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtps2ibs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtps2ibs-2.c"
+#include "avx10_2-vcvtps2ibs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtps2ibs-2.c" 
+#include "avx10_2-vcvtps2ibs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtps2ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2ibs-2.h
index 2ab24b9..7b8f3aa 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtps2ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2ibs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2iubs-2.c
index a27d5c7..f84dfb8 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2iubs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvtps2iubs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtps2iubs-2.c"
+#include "avx10_2-vcvtps2iubs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvtps2iubs-2.c" 
+#include "avx10_2-vcvtps2iubs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtps2iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2iubs-2.h
index 2b02ee3..0ffb3f9 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtps2iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2iubs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162ibs-2.c
index 0585048..38359cb 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162ibs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttbf162ibs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttbf162ibs-2.c"
+#include "avx10_2-vcvttbf162ibs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttbf162ibs-2.c" 
+#include "avx10_2-vcvttbf162ibs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttbf162ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162ibs-2.h
index 38154c8..a102091 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttbf162ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162ibs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <math.h>
 #include <limits.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162iubs-2.c
index 3082ca0..88ad987 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162iubs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttbf162iubs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttbf162iubs-2.c"
+#include "avx10_2-vcvttbf162iubs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttbf162iubs-2.c" 
+#include "avx10_2-vcvttbf162iubs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttbf162iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162iubs-2.h
index 9ca0912..6cfa5cb 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttbf162iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162iubs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <math.h>
 #include <limits.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2dqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2dqs-2.c
index d23024d..7ea6a63 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2dqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2dqs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttpd2dqs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttpd2dqs-2.c"
+#include "avx10_2-vcvttpd2dqs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttpd2dqs-2.c" 
+#include "avx10_2-vcvttpd2dqs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2dqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2dqs-2.h
index f56e568..002112f 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2dqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2dqs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2qqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2qqs-2.c
index d7aa1e5..b4c6102 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2qqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2qqs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttpd2qqs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttpd2qqs-2.c"
+#include "avx10_2-vcvttpd2qqs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttpd2qqs-2.c" 
+#include "avx10_2-vcvttpd2qqs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2qqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2qqs-2.h
index 4400c7c..0652ddd 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2qqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2qqs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2udqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2udqs-2.c
index 88caedf..b7463ed 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2udqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2udqs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttpd2udqs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttpd2udqs-2.c"
+#include "avx10_2-vcvttpd2udqs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttpd2udqs-2.c" 
+#include "avx10_2-vcvttpd2udqs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2udqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2udqs-2.h
index f687d0e..abcf56e 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2udqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2udqs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2uqqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2uqqs-2.c
index 3304eeb..fbd674a 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2uqqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2uqqs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttpd2uqqs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttpd2uqqs-2.c"
+#include "avx10_2-vcvttpd2uqqs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttpd2uqqs-2.c" 
+#include "avx10_2-vcvttpd2uqqs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2uqqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2uqqs-2.h
index 7b44cdd..664e59a 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2uqqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2uqqs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2ibs-2.c
index dfa110c..312de25 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2ibs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttph2ibs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttph2ibs-2.c"
+#include "avx10_2-vcvttph2ibs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttph2ibs-2.c" 
+#include "avx10_2-vcvttph2ibs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttph2ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2ibs-2.h
index 13eb9f0..43446ed 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttph2ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2ibs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2iubs-2.c
index 500e323..19f67fb 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2iubs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttph2iubs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttph2iubs-2.c"
+#include "avx10_2-vcvttph2iubs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttph2iubs-2.c" 
+#include "avx10_2-vcvttph2iubs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttph2iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2iubs-2.h
index 1db5a89..f77a8a6 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttph2iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2iubs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2dqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2dqs-2.c
index d2ef60b..bf34da9 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2dqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2dqs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttps2dqs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2dqs-2.c"
+#include "avx10_2-vcvttps2dqs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2dqs-2.c" 
+#include "avx10_2-vcvttps2dqs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2dqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2dqs-2.h
index 0e9ee27..1209922 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2dqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2dqs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2ibs-2.c
index 7002945..1bf53e9 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2ibs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttps2ibs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2ibs-2.c"
+#include "avx10_2-vcvttps2ibs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2ibs-2.c" 
+#include "avx10_2-vcvttps2ibs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2ibs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2ibs-2.h
index c2dc7fe..bac56b8 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2ibs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2ibs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2iubs-2.c
index 4c05d3c..3cc711c 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2iubs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttps2iubs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2iubs-2.c"
+#include "avx10_2-vcvttps2iubs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2iubs-2.c" 
+#include "avx10_2-vcvttps2iubs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2iubs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2iubs-2.h
index 5f5ee8a..38f94bc 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2iubs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2iubs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <math.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2qqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2qqs-2.c
index a7882ad..d5fcbe4 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2qqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2qqs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttps2qqs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2qqs-2.c"
+#include "avx10_2-vcvttps2qqs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2qqs-2.c" 
+#include "avx10_2-vcvttps2qqs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2qqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2qqs-2.h
index 473fffa..7c247a0 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2qqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2qqs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2udqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2udqs-2.c
index 66b654e..01ab0cd 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2udqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2udqs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttps2udqs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2udqs-2.c"
+#include "avx10_2-vcvttps2udqs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2udqs-2.c" 
+#include "avx10_2-vcvttps2udqs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2udqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2udqs-2.h
index 5d7ee3c..5e7bddb 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2udqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2udqs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2uqqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2uqqs-2.c
index 3f32060..8776a6c 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2uqqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2uqqs-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vcvttps2uqqs-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2uqqs-2.c"
+#include "avx10_2-vcvttps2uqqs-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vcvttps2uqqs-2.c" 
+#include "avx10_2-vcvttps2uqqs-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2uqqs-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2uqqs-2.h
index 99ab0ce..dd05903 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2uqqs-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2uqqs-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <limits.h>
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vdivbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vdivbf16-2.c
index 69d5019..cf6a22b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vdivbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vdivbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vdivbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vdivbf16-2.c"
+#include "avx10_2-vdivbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vdivbf16-2.c" 
+#include "avx10_2-vdivbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vdivbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vdivbf16-2.h
index ff68470..db64814 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vdivbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vdivbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vdpphps-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vdpphps-2.c
index e2f422d..01c30dc 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vdpphps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vdpphps-2.c
@@ -1,16 +1,21 @@
-/* { dg-do run } */                                      
+/* { dg-do run } */
 /* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */           
+/* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vdpphps-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
-#define AVX512F_LEN 256     
+#define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vdpphps-2.c"
+#include "avx10_2-vdpphps-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
 
-#undef AVX512F_LEN          
-#undef AVX512F_LEN_HALF     
-                            
-#define AVX512F_LEN 128     
+#define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vdpphps-2.c"
+#include "avx10_2-vdpphps-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vdpphps-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vdpphps-2.h
index 8f815ce..3aad99a 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vdpphps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vdpphps-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vfmaddXXXbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfmaddXXXbf16-2.c
index 85041d4..6e27b19 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vfmaddXXXbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfmaddXXXbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vfmaddXXXbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfmaddXXXbf16-2.c"
+#include "avx10_2-vfmaddXXXbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfmaddXXXbf16-2.c" 
+#include "avx10_2-vfmaddXXXbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfmaddXXXbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfmaddXXXbf16-2.h
index 6a50ede..fea8572 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfmaddXXXbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfmaddXXXbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vfmsubXXXbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfmsubXXXbf16-2.c
index 761d5d1..bcb2362 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vfmsubXXXbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfmsubXXXbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vfmsubXXXbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfmsubXXXbf16-2.c"
+#include "avx10_2-vfmsubXXXbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfmsubXXXbf16-2.c" 
+#include "avx10_2-vfmsubXXXbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfmsubXXXbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfmsubXXXbf16-2.h
index 5869c5c..df49e80 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfmsubXXXbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfmsubXXXbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.c
index 9b260aa..c41a263 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vfnmaddXXXbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfnmaddXXXbf16-2.c"
+#include "avx10_2-vfnmaddXXXbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfnmaddXXXbf16-2.c" 
+#include "avx10_2-vfnmaddXXXbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfnmaddXXXbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.h
index 2173cd3..fb55f39 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfnmaddXXXbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.c
index 86539f7..6a984c7 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vfnmsubXXXbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfnmsubXXXbf16-2.c"
+#include "avx10_2-vfnmsubXXXbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfnmsubXXXbf16-2.c" 
+#include "avx10_2-vfnmsubXXXbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfnmsubXXXbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.h
index dc323fa..2d51ea4 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfnmsubXXXbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vfpclassbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfpclassbf16-2.c
index 40baeca..996782b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vfpclassbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfpclassbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vfpclassbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfpclassbf16-2.c"
+#include "avx10_2-vfpclassbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vfpclassbf16-2.c" 
+#include "avx10_2-vfpclassbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfpclassbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vfpclassbf16-2.h
index 1e8609d..f843f36 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vfpclassbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vfpclassbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vgetexpbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vgetexpbf16-2.c
index e6a707c..4c05ccc 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vgetexpbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vgetexpbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vgetexpbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vgetexpbf16-2.c"
+#include "avx10_2-vgetexpbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vgetexpbf16-2.c" 
+#include "avx10_2-vgetexpbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vgetexpbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vgetexpbf16-2.h
index a920db5..9240857 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vgetexpbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vgetexpbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vgetmantbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vgetmantbf16-2.c
index 9cdec14..bb455d6 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vgetmantbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vgetmantbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vgetmantbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vgetmantbf16-2.c"
+#include "avx10_2-vgetmantbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vgetmantbf16-2.c" 
+#include "avx10_2-vgetmantbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vgetmantbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vgetmantbf16-2.h
index 82e3663..be7eb4e 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vgetmantbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vgetmantbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vmaxbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vmaxbf16-2.c
index 950870f..9b840c6 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vmaxbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vmaxbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vmaxbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vmaxbf16-2.c"
+#include "avx10_2-vmaxbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vmaxbf16-2.c" 
+#include "avx10_2-vmaxbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vmaxbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vmaxbf16-2.h
index 75236c6..d556ece 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vmaxbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vmaxbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vminbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminbf16-2.c
index 9786127..c7a3d33 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vminbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vminbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vminbf16-2.c"
+#include "avx10_2-vminbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vminbf16-2.c" 
+#include "avx10_2-vminbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminbf16-2.h
index 3ca03cf..a5a1835 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxbf16-2.c
index 0c181d9..b396d2c 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxbf16-2.c
@@ -3,11 +3,15 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vminmaxbf16-2.h"
+
+#undef AVX512F_LEN
+
 #define AVX512VL
 #define AVX512F_LEN 256
-#include "avx10_2-512-vminmaxbf16-2.c"
+#include "avx10_2-vminmaxbf16-2.h"
 
 #undef AVX512F_LEN
 
 #define AVX512F_LEN 128
-#include "avx10_2-512-vminmaxbf16-2.c"
+#include "avx10_2-vminmaxbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxbf16-2.h
index b1a7bed..42b7110 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxbf16-2.h
@@ -1,11 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxpd-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxpd-2.c
index 106083d..5be5053 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxpd-2.c
@@ -3,11 +3,15 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vminmaxpd-2.h"
+
+#undef AVX512F_LEN
+
 #define AVX512VL
 #define AVX512F_LEN 256
-#include "avx10_2-512-vminmaxpd-2.c"
+#include "avx10_2-vminmaxpd-2.h"
 
 #undef AVX512F_LEN
 
 #define AVX512F_LEN 128
-#include "avx10_2-512-vminmaxpd-2.c"
+#include "avx10_2-vminmaxpd-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxpd-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxpd-2.h
index 7bb531f..d595b6d 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxpd-2.h
@@ -1,11 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 64)
 #include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxph-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxph-2.c
index d465e7a..b4f3737 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxph-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxph-2.c
@@ -3,13 +3,15 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vminmaxph-2.h"
+
+#undef AVX512F_LEN
+
 #define AVX512VL
 #define AVX512F_LEN 256
-typedef _Float16 __m256h __attribute__ ((__vector_size__ (32), __may_alias__));
-#include "avx10_2-512-vminmaxph-2.c"
+#include "avx10_2-vminmaxph-2.h"
 
 #undef AVX512F_LEN
 
 #define AVX512F_LEN 128
-typedef _Float16 __m128h __attribute__ ((__vector_size__ (16), __may_alias__));
-#include "avx10_2-512-vminmaxph-2.c"
+#include "avx10_2-vminmaxph-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxph-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxph-2.h
index 7647f8e..a215d96 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxph-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxph-2.h
@@ -1,11 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxps-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxps-2.c
index 88aaf5b..41962c0 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxps-2.c
@@ -3,11 +3,15 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vminmaxps-2.h"
+
+#undef AVX512F_LEN
+
 #define AVX512VL
 #define AVX512F_LEN 256
-#include "avx10_2-512-vminmaxps-2.c"
+#include "avx10_2-vminmaxps-2.h"
 
 #undef AVX512F_LEN
 
 #define AVX512F_LEN 128
-#include "avx10_2-512-vminmaxps-2.c"
+#include "avx10_2-vminmaxps-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxps-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxps-2.h
index 1eaa0b2..9ed09a6 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vminmaxps-2.h
@@ -1,11 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-fsignaling-nans -mfpmath=sse -O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 32)
 #include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vmpsadbw-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vmpsadbw-2.c
index fdf68e6..a925141 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vmpsadbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vmpsadbw-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vmpsadbw-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vmpsadbw-2.c"
+#include "avx10_2-vmpsadbw-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vmpsadbw-2.c"
+#include "avx10_2-vmpsadbw-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vmpsadbw-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vmpsadbw-2.h
index a0a90f7..062594b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vmpsadbw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vmpsadbw-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vmulbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vmulbf16-2.c
index 568c0a9..d0f93d0 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vmulbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vmulbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vmulbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vmulbf16-2.c"
+#include "avx10_2-vmulbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vmulbf16-2.c" 
+#include "avx10_2-vmulbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vmulbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vmulbf16-2.h
index fe65d95..1b89350c 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vmulbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vmulbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssd-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssd-2.c
index 256d10e..20ebdd5 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssd-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpbssd-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbssd-2.c"
+#include "avx10_2-vpdpbssd-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbssd-2.c"
+#include "avx10_2-vpdpbssd-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbssd-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssd-2.h
index 493cd2b..046af0e 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbssd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssd-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssds-2.c
index 88ab613..4983cb9 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssds-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpbssds-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbssds-2.c"
+#include "avx10_2-vpdpbssds-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbssds-2.c"
+#include "avx10_2-vpdpbssds-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbssds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssds-2.h
index 479b893..e120ce1 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbssds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssds-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsud-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsud-2.c
index cdbd57c..967a96c 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsud-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpbsud-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbsud-2.c"
+#include "avx10_2-vpdpbsud-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbsud-2.c"
+#include "avx10_2-vpdpbsud-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbsud-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsud-2.h
index d0c090d..d3f91b7 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbsud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsud-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsuds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsuds-2.c
index 5e9937a..e03b228 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsuds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsuds-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpbsuds-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbsuds-2.c"
+#include "avx10_2-vpdpbsuds-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbsuds-2.c"
+#include "avx10_2-vpdpbsuds-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbsuds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsuds-2.h
index 8d89c33..dd038fb 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbsuds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsuds-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuud-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuud-2.c
index 73e3f71..c6a0793 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuud-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpbuud-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbuud-2.c"
+#include "avx10_2-vpdpbuud-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbuud-2.c"
+#include "avx10_2-vpdpbuud-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbuud-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuud-2.h
index 37a4a54..cc3927a 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbuud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuud-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuuds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuuds-2.c
index 09c1c81..455943b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuuds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuuds-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpbuuds-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbuuds-2.c"
+#include "avx10_2-vpdpbuuds-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpbuuds-2.c"
+#include "avx10_2-vpdpbuuds-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbuuds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuuds-2.h
index 8b18d6f..7721f0a 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbuuds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuuds-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 8)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsud-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsud-2.c
index f68d3ed..eced929 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsud-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpwsud-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwsud-2.c"
+#include "avx10_2-vpdpwsud-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwsud-2.c"
+#include "avx10_2-vpdpwsud-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwsud-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsud-2.h
index 824f814..99d3e14 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwsud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsud-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsuds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsuds-2.c
index 3b3f5df..d551309 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsuds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsuds-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpwsuds-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwsuds-2.c"
+#include "avx10_2-vpdpwsuds-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwsuds-2.c"
+#include "avx10_2-vpdpwsuds-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwsuds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsuds-2.h
index 7e51349..dd7d98c 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwsuds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsuds-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusd-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusd-2.c
index 209e62d..194f263d 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusd-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpwusd-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwusd-2.c"
+#include "avx10_2-vpdpwusd-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwusd-2.c"
+#include "avx10_2-vpdpwusd-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwusd-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusd-2.h
index 4727d91..e8a6e6a 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwusd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusd-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusds-2.c
index 6e9692b..d87f0af 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusds-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpwusds-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwusds-2.c"
+#include "avx10_2-vpdpwusds-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwusds-2.c"
+#include "avx10_2-vpdpwusds-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwusds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusds-2.h
index 9f965df..5c294e0 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwusds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusds-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuud-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuud-2.c
index 8feb5d7..4b32bfd 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuud-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpwuud-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwuud-2.c"
+#include "avx10_2-vpdpwuud-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwuud-2.c"
+#include "avx10_2-vpdpwuud-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwuud-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuud-2.h
index bf0a564..3e8b694 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwuud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuud-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuuds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuuds-2.c
index 930839e..091d0be 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuuds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuuds-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vpdpwuuds-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwuuds-2.c"
+#include "avx10_2-vpdpwuuds-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vpdpwuuds-2.c"
+#include "avx10_2-vpdpwuuds-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwuuds-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuuds-2.h
index c075e0e..f4ff08a 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwuuds-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuuds-2.h
@@ -1,13 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
-
 #include "avx10-helper.h"
 
 #define SRC_SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vrcpbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vrcpbf16-2.c
index 367b2cf..ea4cd6c 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vrcpbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vrcpbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vrcpbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vrcpbf16-2.c"
+#include "avx10_2-vrcpbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vrcpbf16-2.c" 
+#include "avx10_2-vrcpbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vrcpbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vrcpbf16-2.h
index 28c7ada..bd0c3d2 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vrcpbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vrcpbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vreducebf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vreducebf16-2.c
index 318e430..21ed844 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vreducebf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vreducebf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vreducebf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vreducebf16-2.c"
+#include "avx10_2-vreducebf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vreducebf16-2.c" 
+#include "avx10_2-vreducebf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vreducebf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vreducebf16-2.h
index d506389..e920e10 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vreducebf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vreducebf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vrndscalebf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vrndscalebf16-2.c
index 5720438..66b0911 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vrndscalebf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vrndscalebf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vrndscalebf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vrndscalebf16-2.c"
+#include "avx10_2-vrndscalebf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vrndscalebf16-2.c" 
+#include "avx10_2-vrndscalebf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vrndscalebf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vrndscalebf16-2.h
index 1b29fc6..6a973c6 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vrndscalebf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vrndscalebf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vrsqrtbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vrsqrtbf16-2.c
index 6083c86..9cebca9 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vrsqrtbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vrsqrtbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vrsqrtbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vrsqrtbf16-2.c"
+#include "avx10_2-vrsqrtbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vrsqrtbf16-2.c" 
+#include "avx10_2-vrsqrtbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vrsqrtbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vrsqrtbf16-2.h
index 444b332..14811bc 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vrsqrtbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vrsqrtbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <math.h>
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vscalefbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vscalefbf16-2.c
index 81b24f3..28f85bc 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vscalefbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vscalefbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vscalefbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vscalefbf16-2.c"
+#include "avx10_2-vscalefbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vscalefbf16-2.c" 
+#include "avx10_2-vscalefbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vscalefbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vscalefbf16-2.h
index b1c5f4b..08565f2 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vscalefbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vscalefbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vsqrtbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vsqrtbf16-2.c
index 5188e05..288c22b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vsqrtbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vsqrtbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vsqrtbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vsqrtbf16-2.c"
+#include "avx10_2-vsqrtbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vsqrtbf16-2.c" 
+#include "avx10_2-vsqrtbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vsqrtbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vsqrtbf16-2.h
index 12f87b3..30e1bd2 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vsqrtbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vsqrtbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #include <math.h>
 #define SIZE (AVX512F_LEN / 16)
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-vsubbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vsubbf16-2.c
index 16f444a..09f05a0 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-vsubbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vsubbf16-2.c
@@ -3,14 +3,19 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
+#include "avx10_2-vsubbf16-2.h"
+
+#undef AVX512F_LEN
+#undef AVX512F_LEN_HALF
+
 #define AVX512VL
 #define AVX512F_LEN 256
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vsubbf16-2.c"
+#include "avx10_2-vsubbf16-2.h"
 
 #undef AVX512F_LEN
 #undef AVX512F_LEN_HALF
 
 #define AVX512F_LEN 128
 #define AVX512F_LEN_HALF 128
-#include "avx10_2-512-vsubbf16-2.c" 
+#include "avx10_2-vsubbf16-2.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-512-vsubbf16-2.c b/gcc/testsuite/gcc.target/i386/avx10_2-vsubbf16-2.h
index 16a5ace..379d840 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-512-vsubbf16-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-vsubbf16-2.h
@@ -1,12 +1,3 @@
-/* { dg-do run } */
-/* { dg-options "-O2 -march=x86-64-v3 -mavx10.2" } */
-/* { dg-require-effective-target avx10_2 } */
-
-#ifndef AVX10_2
-#define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
-#endif
 #include "avx10-helper.h"
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-helper.h b/gcc/testsuite/gcc.target/i386/avx512f-helper.h
index 41f09e3..f008981 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-helper.h
+++ b/gcc/testsuite/gcc.target/i386/avx512f-helper.h
@@ -97,7 +97,7 @@ MAKE_MASK_ZERO(bf16_bf, __bf16)
 /* Function which calculates result.  */
 #define CALC EVAL(calc_, AVX512F_LEN,)
 
-#if !defined(AVX512VL) || defined(AVX10_512BIT)
+#if !defined(AVX512VL)
 #define AVX512F_LEN 512
 #define AVX512F_LEN_HALF 256
 #endif
diff --git a/gcc/testsuite/gcc.target/i386/sm4-check.h b/gcc/testsuite/gcc.target/i386/sm4-check.h
index 76c16db..c9d95ef 100644
--- a/gcc/testsuite/gcc.target/i386/sm4-check.h
+++ b/gcc/testsuite/gcc.target/i386/sm4-check.h
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include "m512-check.h"
 
-#ifdef AVX10_2_512
-static void sm4_avx512f_test (void);
+#ifdef AVX10_2
+static void sm4_avx10_test (void);
 #else
 static void sm4_test (void);
 #endif
@@ -160,7 +160,7 @@ compute_sm4##name##4 (int *dst, int *src1, int *src2, int vl) \
   if (check_union256i_d (res2, dst2))			      \
     abort ();
 
-#define SM4_AVX512F_SIMULATE(name)			      \
+#define SM4_AVX10_SIMULATE(name)			      \
   union512i_d src5, src6, res3;				      \
   int dst3[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};    \
 							      \
@@ -181,8 +181,8 @@ static void
 __attribute__ ((noinline))
 do_test (void)
 {
-#ifdef AVX10_512BIT
-  sm4_avx512f_test ();
+#ifdef AVX10_2
+  sm4_avx10_test ();
 #else
   sm4_test ();
 #endif
diff --git a/gcc/testsuite/gcc.target/i386/sm4key4-avx10_2-512-2.c b/gcc/testsuite/gcc.target/i386/sm4key4-avx10_2-2.c
index 1c8b2c3..2cb638e 100644
--- a/gcc/testsuite/gcc.target/i386/sm4key4-avx10_2-512-2.c
+++ b/gcc/testsuite/gcc.target/i386/sm4key4-avx10_2-2.c
@@ -4,15 +4,13 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
 #include "sm4-check.h"
 
 char key;
 SM4_FUNC (key);
 
 static void
-sm4_avx512f_test (void)
+sm4_avx10_test (void)
 {
-  SM4_AVX512F_SIMULATE (key);
+  SM4_AVX10_SIMULATE (key);
 }
diff --git a/gcc/testsuite/gcc.target/i386/sm4rnds4-avx10_2-512-2.c b/gcc/testsuite/gcc.target/i386/sm4rnds4-avx10_2-2.c
index 5418a53..b544c07 100644
--- a/gcc/testsuite/gcc.target/i386/sm4rnds4-avx10_2-512-2.c
+++ b/gcc/testsuite/gcc.target/i386/sm4rnds4-avx10_2-2.c
@@ -4,15 +4,13 @@
 /* { dg-require-effective-target avx10_2 } */
 
 #define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
 #include "sm4-check.h"
 
 char rnds;
 SM4_FUNC (rnds);
 
 static void
-sm4_avx512f_test (void)
+sm4_avx10_test (void)
 {
-  SM4_AVX512F_SIMULATE (rnds);
+  SM4_AVX10_SIMULATE (rnds);
 }
diff --git a/gcc/testsuite/gcc.target/i386/vnniint16-auto-vectorize-4.c b/gcc/testsuite/gcc.target/i386/vnniint16-auto-vectorize-4.c
index 06a85a8..204348f1 100644
--- a/gcc/testsuite/gcc.target/i386/vnniint16-auto-vectorize-4.c
+++ b/gcc/testsuite/gcc.target/i386/vnniint16-auto-vectorize-4.c
@@ -5,8 +5,7 @@
 #define N 512
 
 #define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
+#define AVX10_SCALAR
 #define AVX512F_LEN 512
 
 #define TEST test_512
diff --git a/gcc/testsuite/gcc.target/i386/vnniint8-auto-vectorize-4.c b/gcc/testsuite/gcc.target/i386/vnniint8-auto-vectorize-4.c
index 76cca22..798e7fc 100644
--- a/gcc/testsuite/gcc.target/i386/vnniint8-auto-vectorize-4.c
+++ b/gcc/testsuite/gcc.target/i386/vnniint8-auto-vectorize-4.c
@@ -5,8 +5,7 @@
 #define N 512
 
 #define AVX10_2
-#define AVX10_2_512
-#define AVX10_512BIT
+#define AVX10_SCALAR
 #define AVX512F_LEN 512
 
 #define TEST test_512