https://gcc.gnu.org/g:34caeae39f67d8a2423e8b2086c433b44d504afb
commit r16-724-g34caeae39f67d8a2423e8b2086c433b44d504afb
Author: Haochen Jiang <haochen.ji...@intel.com>
Date: Mon Mar 24 17:02:44 2025 +0800
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.
Diff:
---
gcc/testsuite/gcc.target/i386/avx10-check.h | 6 ++----
.../gcc.target/i386/avx10-minmax-helper.h | 2 --
gcc/testsuite/gcc.target/i386/avx10_2-vaddbf16-2.c | 9 +++++++--
...x10_2-512-vaddbf16-2.c => avx10_2-vaddbf16-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx10_2-vcmpbf16-2.c | 9 +++++++--
...x10_2-512-vcmpbf16-2.c => avx10_2-vcmpbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvt2ph2bf8-2.c | 9 +++++++--
...512-vcvt2ph2bf8-2.c => avx10_2-vcvt2ph2bf8-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.c | 9 +++++++--
...2-vcvt2ph2bf8s-2.c => avx10_2-vcvt2ph2bf8s-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvt2ph2hf8-2.c | 9 +++++++--
...512-vcvt2ph2hf8-2.c => avx10_2-vcvt2ph2hf8-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.c | 9 +++++++--
...2-vcvt2ph2hf8s-2.c => avx10_2-vcvt2ph2hf8s-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvt2ps2phx-2.c | 9 +++++++--
...512-vcvt2ps2phx-2.c => avx10_2-vcvt2ps2phx-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvtbf162ibs-2.c | 9 +++++++--
...2-vcvtbf162ibs-2.c => avx10_2-vcvtbf162ibs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvtbf162iubs-2.c | 9 +++++++--
...vcvtbf162iubs-2.c => avx10_2-vcvtbf162iubs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.c | 9 +++++++--
...vtbiasph2bf8-2.c => avx10_2-vcvtbiasph2bf8-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.c | 9 +++++++--
...biasph2bf8s-2.c => avx10_2-vcvtbiasph2bf8s-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.c | 9 +++++++--
...vtbiasph2hf8-2.c => avx10_2-vcvtbiasph2hf8-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.c | 9 +++++++--
...biasph2hf8s-2.c => avx10_2-vcvtbiasph2hf8s-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvthf82ph-2.c | 11 ++++++++---
...2-512-vcvthf82ph-2.c => avx10_2-vcvthf82ph-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvtph2bf8-2.c | 9 +++++++--
...2-512-vcvtph2bf8-2.c => avx10_2-vcvtph2bf8-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvtph2bf8s-2.c | 9 +++++++--
...512-vcvtph2bf8s-2.c => avx10_2-vcvtph2bf8s-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvtph2hf8-2.c | 9 +++++++--
...2-512-vcvtph2hf8-2.c => avx10_2-vcvtph2hf8-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvtph2hf8s-2.c | 9 +++++++--
...512-vcvtph2hf8s-2.c => avx10_2-vcvtph2hf8s-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vcvtph2ibs-2.c | 9 +++++++--
...2-512-vcvtph2ibs-2.c => avx10_2-vcvtph2ibs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvtph2iubs-2.c | 9 +++++++--
...512-vcvtph2iubs-2.c => avx10_2-vcvtph2iubs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvtps2ibs-2.c | 9 +++++++--
...2-512-vcvtps2ibs-2.c => avx10_2-vcvtps2ibs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvtps2iubs-2.c | 9 +++++++--
...512-vcvtps2iubs-2.c => avx10_2-vcvtps2iubs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttbf162ibs-2.c | 9 +++++++--
...vcvttbf162ibs-2.c => avx10_2-vcvttbf162ibs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttbf162iubs-2.c | 9 +++++++--
...vttbf162iubs-2.c => avx10_2-vcvttbf162iubs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttpd2dqs-2.c | 9 +++++++--
...512-vcvttpd2dqs-2.c => avx10_2-vcvttpd2dqs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttpd2qqs-2.c | 9 +++++++--
...512-vcvttpd2qqs-2.c => avx10_2-vcvttpd2qqs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttpd2udqs-2.c | 9 +++++++--
...2-vcvttpd2udqs-2.c => avx10_2-vcvttpd2udqs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttpd2uqqs-2.c | 9 +++++++--
...2-vcvttpd2uqqs-2.c => avx10_2-vcvttpd2uqqs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttph2ibs-2.c | 9 +++++++--
...512-vcvttph2ibs-2.c => avx10_2-vcvttph2ibs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttph2iubs-2.c | 9 +++++++--
...2-vcvttph2iubs-2.c => avx10_2-vcvttph2iubs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttps2dqs-2.c | 9 +++++++--
...512-vcvttps2dqs-2.c => avx10_2-vcvttps2dqs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttps2ibs-2.c | 9 +++++++--
...512-vcvttps2ibs-2.c => avx10_2-vcvttps2ibs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttps2iubs-2.c | 9 +++++++--
...2-vcvttps2iubs-2.c => avx10_2-vcvttps2iubs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttps2qqs-2.c | 9 +++++++--
...512-vcvttps2qqs-2.c => avx10_2-vcvttps2qqs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttps2udqs-2.c | 9 +++++++--
...2-vcvttps2udqs-2.c => avx10_2-vcvttps2udqs-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vcvttps2uqqs-2.c | 9 +++++++--
...2-vcvttps2uqqs-2.c => avx10_2-vcvttps2uqqs-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx10_2-vdivbf16-2.c | 9 +++++++--
...x10_2-512-vdivbf16-2.c => avx10_2-vdivbf16-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx10_2-vdpphps-2.c | 23 +++++++++++++---------
...avx10_2-512-vdpphps-2.c => avx10_2-vdpphps-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vfmaddXXXbf16-2.c | 9 +++++++--
...vfmaddXXXbf16-2.c => avx10_2-vfmaddXXXbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vfmsubXXXbf16-2.c | 9 +++++++--
...vfmsubXXXbf16-2.c => avx10_2-vfmsubXXXbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.c | 9 +++++++--
...nmaddXXXbf16-2.c => avx10_2-vfnmaddXXXbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.c | 9 +++++++--
...nmsubXXXbf16-2.c => avx10_2-vfnmsubXXXbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vfpclassbf16-2.c | 9 +++++++--
...2-vfpclassbf16-2.c => avx10_2-vfpclassbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vgetexpbf16-2.c | 9 +++++++--
...512-vgetexpbf16-2.c => avx10_2-vgetexpbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vgetmantbf16-2.c | 9 +++++++--
...2-vgetmantbf16-2.c => avx10_2-vgetmantbf16-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx10_2-vmaxbf16-2.c | 9 +++++++--
...x10_2-512-vmaxbf16-2.c => avx10_2-vmaxbf16-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx10_2-vminbf16-2.c | 9 +++++++--
...x10_2-512-vminbf16-2.c => avx10_2-vminbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vminmaxbf16-2.c | 8 ++++++--
...512-vminmaxbf16-2.c => avx10_2-vminmaxbf16-2.h} | 8 --------
.../gcc.target/i386/avx10_2-vminmaxpd-2.c | 8 ++++++--
...0_2-512-vminmaxpd-2.c => avx10_2-vminmaxpd-2.h} | 8 --------
.../gcc.target/i386/avx10_2-vminmaxph-2.c | 10 ++++++----
...0_2-512-vminmaxph-2.c => avx10_2-vminmaxph-2.h} | 8 --------
.../gcc.target/i386/avx10_2-vminmaxps-2.c | 8 ++++++--
...0_2-512-vminmaxps-2.c => avx10_2-vminmaxps-2.h} | 8 --------
gcc/testsuite/gcc.target/i386/avx10_2-vmpsadbw-2.c | 9 +++++++--
...x10_2-512-vmpsadbw-2.c => avx10_2-vmpsadbw-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx10_2-vmulbf16-2.c | 9 +++++++--
...x10_2-512-vmulbf16-2.c => avx10_2-vmulbf16-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssd-2.c | 9 +++++++--
...x10_2-512-vpdpbssd-2.c => avx10_2-vpdpbssd-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vpdpbssds-2.c | 9 +++++++--
...0_2-512-vpdpbssds-2.c => avx10_2-vpdpbssds-2.h} | 10 ----------
gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsud-2.c | 9 +++++++--
...x10_2-512-vpdpbsud-2.c => avx10_2-vpdpbsud-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vpdpbsuds-2.c | 9 +++++++--
...0_2-512-vpdpbsuds-2.c => avx10_2-vpdpbsuds-2.h} | 10 ----------
gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuud-2.c | 9 +++++++--
...x10_2-512-vpdpbuud-2.c => avx10_2-vpdpbuud-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vpdpbuuds-2.c | 9 +++++++--
...0_2-512-vpdpbuuds-2.c => avx10_2-vpdpbuuds-2.h} | 10 ----------
gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsud-2.c | 9 +++++++--
...x10_2-512-vpdpwsud-2.c => avx10_2-vpdpwsud-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vpdpwsuds-2.c | 9 +++++++--
...0_2-512-vpdpwsuds-2.c => avx10_2-vpdpwsuds-2.h} | 10 ----------
gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusd-2.c | 9 +++++++--
...x10_2-512-vpdpwusd-2.c => avx10_2-vpdpwusd-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vpdpwusds-2.c | 9 +++++++--
...0_2-512-vpdpwusds-2.c => avx10_2-vpdpwusds-2.h} | 10 ----------
gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuud-2.c | 9 +++++++--
...x10_2-512-vpdpwuud-2.c => avx10_2-vpdpwuud-2.h} | 10 ----------
.../gcc.target/i386/avx10_2-vpdpwuuds-2.c | 9 +++++++--
...0_2-512-vpdpwuuds-2.c => avx10_2-vpdpwuuds-2.h} | 10 ----------
gcc/testsuite/gcc.target/i386/avx10_2-vrcpbf16-2.c | 9 +++++++--
...x10_2-512-vrcpbf16-2.c => avx10_2-vrcpbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vreducebf16-2.c | 9 +++++++--
...512-vreducebf16-2.c => avx10_2-vreducebf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vrndscalebf16-2.c | 9 +++++++--
...vrndscalebf16-2.c => avx10_2-vrndscalebf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vrsqrtbf16-2.c | 9 +++++++--
...2-512-vrsqrtbf16-2.c => avx10_2-vrsqrtbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vscalefbf16-2.c | 9 +++++++--
...512-vscalefbf16-2.c => avx10_2-vscalefbf16-2.h} | 9 ---------
.../gcc.target/i386/avx10_2-vsqrtbf16-2.c | 9 +++++++--
...0_2-512-vsqrtbf16-2.c => avx10_2-vsqrtbf16-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx10_2-vsubbf16-2.c | 9 +++++++--
...x10_2-512-vsubbf16-2.c => avx10_2-vsubbf16-2.h} | 9 ---------
gcc/testsuite/gcc.target/i386/avx512f-helper.h | 2 +-
gcc/testsuite/gcc.target/i386/sm4-check.h | 10 +++++-----
...sm4key4-avx10_2-512-2.c => sm4key4-avx10_2-2.c} | 6 ++----
...4rnds4-avx10_2-512-2.c => sm4rnds4-avx10_2-2.c} | 6 ++----
.../gcc.target/i386/vnniint16-auto-vectorize-4.c | 3 +--
.../gcc.target/i386/vnniint8-auto-vectorize-4.c | 3 +--
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 7d4326d8da97..6a1a151f9091 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 e799975fe671..6c9bffca0d11 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 d88045425628..36f5bd7a09f2 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vaddbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vaddbf16-2.h
index 4aca46d03873..a65c6473732b 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 cb6506ae65d8..643fb26b81f9 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
similarity index 75%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcmpbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcmpbf16-2.h
index 885cec76060d..2c0fde0f7b98 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 9dd940ce7664..dae2f44d185e 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2bf8-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8-2.h
index 5bd2b7f03ade..b46540bb93ef 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 2a9caca57d03..badd86542262 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2bf8s-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2bf8s-2.h
index 33d9c0c3ce43..398c67be8995 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 80dc2480867b..4555b3d153ff 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2hf8-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8-2.h
index b9fdbd485d93..89a2c7eabbd6 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 30f6a6075cfd..ba62e54756e9 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ph2hf8s-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ph2hf8s-2.h
index b9fdfac42964..2556c3f007e3 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 125713c8dccf..27735c0eed43 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvt2ps2phx-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvt2ps2phx-2.h
index f9f799a0fabd..f7d43658db1d 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 824ec68a2dad..a420901d482f 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbf162ibs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162ibs-2.h
index 49768924b460..9f984d18d8b7 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 b8f992585214..7fdae8f4e1f1 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbf162iubs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtbf162iubs-2.h
index 03bd36a21721..b5eb59fb8a18 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 e3f2a8127d1f..7c56893fd606 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2bf8-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8-2.h
index 4d90dcf83c9b..42a81d8d22f8 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 2b9f81de2982..3d2851bd7eec 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2bf8s-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2bf8s-2.h
index 93de7ea358f6..24779607fb15 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 27e5f2100c4d..ac832d2432f5 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2hf8-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8-2.h
index 14a22516025a..629c8a728bde 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 b93a1f978159..bff52821f002 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtbiasph2hf8s-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtbiasph2hf8s-2.h
index 0333f08f930a..fdda3764cd41 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 d647fde9cd94..d6f504065807 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvthf82ph-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvthf82ph-2.h
index 9301ee34f4c3..7e9e894f8625 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 826b5ff1b1cd..aa10ebe6e2d8 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
similarity index 87%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2bf8-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8-2.h
index f42f85665b88..2ea371012839 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 c5b9576216ad..471e702ef047 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
similarity index 87%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2bf8s-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2bf8s-2.h
index c22e1aaa7d31..242975dee5ec 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 00f2928ea8af..e260dcaca50b 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
similarity index 87%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2hf8-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8-2.h
index e328e9d5c5f7..84aba750bd94 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 a2fa0c8851b6..06882b82baff 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
similarity index 87%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2hf8s-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2hf8s-2.h
index e6872e84535c..28604c6806e4 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 2265f81d9def..627829c20c33 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2ibs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2ibs-2.h
index 2bddbb16316f..62fd1c56feb7 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 c4b2b5751b90..009fcaf02aae 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtph2iubs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtph2iubs-2.h
index df73fcdfcdc9..aa6ed98c236b 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 fdf825bc7919..f5bd1dc54c02 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtps2ibs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2ibs-2.h
index 2ab24b9c0541..7b8f3aa81396 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 a27d5c7e5834..f84dfb8d2045 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvtps2iubs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvtps2iubs-2.h
index 2b02ee328d93..0ffb3f9f82d6 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 0585048ffa5c..38359cba73f3 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttbf162ibs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162ibs-2.h
index 38154c8d4f3e..a102091278e1 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 3082ca047122..88ad987d7d46 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttbf162iubs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttbf162iubs-2.h
index 9ca09125335b..6cfa5cb4616b 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 d23024d38bdb..7ea6a63155de 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2dqs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2dqs-2.h
index f56e568d918a..002112f4255d 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 d7aa1e5de114..b4c610226e02 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2qqs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2qqs-2.h
index 4400c7c18170..0652ddd2d5e9 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 88caedffe7d4..b7463ed71ae4 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2udqs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2udqs-2.h
index f687d0ea088b..abcf56e77341 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 3304eebb6557..fbd674aa4b54 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttpd2uqqs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttpd2uqqs-2.h
index 7b44cdd59900..664e59a7859f 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 dfa110cdc8b3..312de253846f 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttph2ibs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2ibs-2.h
index 13eb9f02aed7..43446edf51eb 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 500e323ede15..19f67fb7f80d 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttph2iubs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttph2iubs-2.h
index 1db5a891c216..f77a8a6bf642 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 d2ef60b8a66b..bf34da90e731 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2dqs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2dqs-2.h
index 0e9ee27dfc36..12099228e13a 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 7002945e92e6..1bf53e986a52 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2ibs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2ibs-2.h
index c2dc7fe8bd55..bac56b8779d8 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 4c05d3c20568..3cc711cfd3c6 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2iubs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2iubs-2.h
index 5f5ee8a91a17..38f94bc51d90 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 a7882adb9429..d5fcbe40f2fe 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2qqs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2qqs-2.h
index 473fffa62e40..7c247a0735d8 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 66b654ee3576..01ab0cd6804f 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2udqs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2udqs-2.h
index 5d7ee3ca1cad..5e7bddbb1931 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 3f320604e1b0..8776a6c4a0a6 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vcvttps2uqqs-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vcvttps2uqqs-2.h
index 99ab0ce0da99..dd05903cfa6d 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 69d5019e4a04..cf6a22b1a0da 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vdivbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vdivbf16-2.h
index ff6847032b55..db648144f900 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 e2f422dd379f..01c30dc75728 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vdpphps-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vdpphps-2.h
index 8f815ce95f9c..3aad99a88824 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 85041d449457..6e27b19b198d 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vfmaddXXXbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vfmaddXXXbf16-2.h
index 6a50ede02728..fea85721acff 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 761d5d190f9b..bcb2362982a2 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vfmsubXXXbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vfmsubXXXbf16-2.h
index 5869c5cec5fa..df49e804b573 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 9b260aa07d8e..c41a263df795 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vfnmaddXXXbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vfnmaddXXXbf16-2.h
index 2173cd3dc045..fb55f39eaab3 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 86539f7d52f3..6a984c7650c0 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vfnmsubXXXbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vfnmsubXXXbf16-2.h
index dc323fa3e9ce..2d51ea45a330 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 40baeca39958..996782b5bd11 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
similarity index 80%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vfpclassbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vfpclassbf16-2.h
index 1e8609d12091..f843f36c44b9 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 e6a707c40f04..4c05cccf8b5d 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
similarity index 84%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vgetexpbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vgetexpbf16-2.h
index a920db5302f8..92408573bbee 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 9cdec144a2c0..bb455d696430 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vgetmantbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vgetmantbf16-2.h
index 82e366390563..be7eb4e9be6d 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 950870f8e479..9b840c63ecb4 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vmaxbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vmaxbf16-2.h
index 75236c6ce60f..d556ece8bd74 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 9786127a5da9..c7a3d33ef2f6 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vminbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vminbf16-2.h
index 3ca03cfdfd66..a5a1835490c8 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 0c181d964057..b396d2cd441f 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
similarity index 76%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vminmaxbf16-2.h
index b1a7bed3db49..42b71104e3ee 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 106083d3db18..5be5053699df 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
similarity index 74%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxpd-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vminmaxpd-2.h
index 7bb531ff7c20..d595b6d3c28d 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 d465e7aabcb5..b4f3737f6f47 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
similarity index 75%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxph-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vminmaxph-2.h
index 7647f8e41cf2..a215d965e99b 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 88aaf5b1d433..41962c0cf3dd 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
similarity index 74%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vminmaxps-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vminmaxps-2.h
index 1eaa0b2cbe82..9ed09a6a1c39 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 fdf68e63dc76..a9251413497d 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
similarity index 90%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vmpsadbw-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vmpsadbw-2.h
index a0a90f7f053b..062594b6c363 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 568c0a9eb121..d0f93d05e78f 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vmulbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vmulbf16-2.h
index fe65d95ec3ea..1b89350c2a2b 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 256d10e09a38..20ebdd5d039c 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbssd-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssd-2.h
index 493cd2bdbd20..046af0e35c77 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 88ab6133fb41..4983cb92b1e7 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbssds-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpbssds-2.h
index 479b89322f4c..e120ce1d52db 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 cdbd57c5418e..967a96c446c2 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbsud-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsud-2.h
index d0c090d14c54..d3f91b7907cb 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 5e9937a69c60..e03b228c920a 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbsuds-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpbsuds-2.h
index 8d89c33c46fb..dd038fbca2b7 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 73e3f71270d5..c6a079313ac5 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbuud-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuud-2.h
index 37a4a543fc1b..cc3927a60a40 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 09c1c817c859..455943b78e2f 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpbuuds-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpbuuds-2.h
index 8b18d6f72288..7721f0a24506 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 f68d3eda5562..eced9296622f 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwsud-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsud-2.h
index 824f81403a34..99d3e140b40c 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 3b3f5df2042f..d551309deac8 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwsuds-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpwsuds-2.h
index 7e5134938ff3..dd7d98c1de1f 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 209e62de6801..194f263d7965 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwusd-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusd-2.h
index 4727d9138e51..e8a6e6af2134 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 6e9692b64019..d87f0af7c3f6 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwusds-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpwusds-2.h
index 9f965df40bab..5c294e057596 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 8feb5d7b8558..4b32bfd31da4 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
similarity index 88%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwuud-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuud-2.h
index bf0a5641eeaa..3e8b69478b98 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 930839e79986..091d0beed1af 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
similarity index 89%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vpdpwuuds-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vpdpwuuds-2.h
index c075e0e5d5e8..f4ff08a66fd0 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 367b2cff70ac..ea4cd6cb2744 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
similarity index 83%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vrcpbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vrcpbf16-2.h
index 28c7ada05095..bd0c3d2974a2 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 318e430d7927..21ed844fc580 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vreducebf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vreducebf16-2.h
index d50638922195..e920e10a68c2 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 57204388e41f..66b091143e12 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
similarity index 84%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vrndscalebf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vrndscalebf16-2.h
index 1b29fc67f1b2..6a973c61733b 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 6083c86b8889..9cebca91794a 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
similarity index 83%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vrsqrtbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vrsqrtbf16-2.h
index 444b3321ee00..14811bc913d7 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 81b24f3c6a93..28f85bcdf37d 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
similarity index 86%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vscalefbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vscalefbf16-2.h
index b1c5f4bd7d6e..08565f2b0fb0 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 5188e050a492..288c22bc3b49 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
similarity index 83%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vsqrtbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vsqrtbf16-2.h
index 12f87b35aca5..30e1bd2f7880 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 16f444afbf8a..09f05a09cb6e 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
similarity index 85%
rename from gcc/testsuite/gcc.target/i386/avx10_2-512-vsubbf16-2.c
rename to gcc/testsuite/gcc.target/i386/avx10_2-vsubbf16-2.h
index 16a5aced1a04..379d840b91ed 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 41f09e36c83c..f0089812563e 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 76c16db8c11c..c9d95ef2e10b 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
similarity index 72%
rename from gcc/testsuite/gcc.target/i386/sm4key4-avx10_2-512-2.c
rename to gcc/testsuite/gcc.target/i386/sm4key4-avx10_2-2.c
index 1c8b2c3359a7..2cb638ecaf03 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
similarity index 72%
rename from gcc/testsuite/gcc.target/i386/sm4rnds4-avx10_2-512-2.c
rename to gcc/testsuite/gcc.target/i386/sm4rnds4-avx10_2-2.c
index 5418a5373a1b..b544c074167e 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 06a85a8bbe19..204348f153a7 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 76cca22958b9..798e7fc2e882 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
