From 451c4fba283e31e1272573a04672056390e49e02 Mon Sep 17 00:00:00 2001
From: Petr Murzin <petr.murzin@intel.com>
Date: Mon, 9 Jun 2014 11:32:03 +0000
Subject: [PATCH] avx512f-vaddpd-2.c: Add static void for CALC, void for TEST
 instead of static void.

gcc/testsuite/
	* gcc.target/i386/avx512f-vaddpd-2.c:  Add static void for CALC,
	void for TEST instead of static void.
	* gcc.target/i386/avx512f-vaddps-2.c: Ditto.
	* gcc.target/i386/avx512f-vblendmpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vblendmps-2.c: Ditto.
	* gcc.target/i386/avx512f-vbroadcastf32x4-2.c:Ditto.
	* gcc.target/i386/avx512f-vbroadcastf64x4-2.c:Ditto.
	* gcc.target/i386/avx512f-vbroadcasti32x4-2.c: Ditto.
	* gcc.target/i386/avx512f-vbroadcasti64x4-2.c: Ditto.
	* gcc.target/i386/avx512f-vbroadcastsd-2.c: Ditto.
	* gcc.target/i386/avx512f-vbroadcastss-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtps2dq-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvttps2dq-2.c: Ditto.
	* gcc.target/i386/avx512f-vdivpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vdivps-2.c: Ditto.
	* gcc.target/i386/avx512f-vextractf32x4-2.c: Ditto.
	* gcc.target/i386/avx512f-vextracti32x4-2.c: Ditto.
	* gcc.target/i386/avx512f-vmaxpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vmaxps-2.c: Ditto.
	* gcc.target/i386/avx512f-vminpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vminps-2.c: Ditto.
	* gcc.target/i386/avx512f-vmulpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vmulps-2.c: Ditto.
	* gcc.target/i386/avx512f-vpaddd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpaddq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpblendmd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpblendmq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpbroadcastd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpbroadcastq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpeqd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpeqq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpgtd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpgtq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovdb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovdw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovqb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovqw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsdb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsdw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsqb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsqd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsqw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpslld-2.c: Ditto.
	* gcc.target/i386/avx512f-vpslldi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsllq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsllqi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsrad-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsradi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsraq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsraqi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsravd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsravq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsubd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsubq-2.c: Ditto.
	* gcc.target/i386/avx512f-vptestmd-2.c: Ditto.
	* gcc.target/i386/avx512f-vptestmq-2.c: Ditto.
	* gcc.target/i386/avx512f-vptestnmd-2.c: Ditto.
	* gcc.target/i386/avx512f-vptestnmq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpunpckhdq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpunpckhqdq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpunpckldq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpunpcklqdq-2.c: Ditto.
	* gcc.target/i386/avx512f-vscalefpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vscalefps-2.c: Ditto.
	* gcc.target/i386/avx512f-vshuff32x4-2.c: Ditto.
	* gcc.target/i386/avx512f-vshuff64x2-2.c: Ditto.
	* gcc.target/i386/avx512f-vshufi32x4-2.c: Ditto.
	* gcc.target/i386/avx512f-vshufi64x2-2.c: Ditto.
	* gcc.target/i386/avx512f-vsubpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vsubps-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovdb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovdw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovqb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovqw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsdb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsdw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsqb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsqd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsqw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsllvd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsllvq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsrld-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsrldi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsrlq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsrlqi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsrlvd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpsrlvq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpshufd-2.c: Delete variables, void for TEST
	instead of static void.
	* gcc.target/i386/avx512f-vpcmpged-2.c: Add static void for CALC,
	delete unused variables.
	* gcc.target/i386/avx512f-vpcmpgeq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpgeud-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpgeuq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpled-2.c: Add static void for CALC,
	delete unused variables, void for TEST instead of static void.
	* gcc.target/i386/avx512f-vpcmpleq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpleud-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpleuq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpltd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpltq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpltud-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpltuq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpneqd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpneqq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpnequd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpnequq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovqd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmaxsd-2.c: Add static void for CALC,
	initialize variables.
	* gcc.target/i386/avx512f-vpmaxsq-2.c:Ditto.
	* gcc.target/i386/avx512f-vpminsd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpminsq-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvttsd2si-1.c: Add missed type.
	* gcc.target/i386/avx512f-vcvttss2si-1.c: Ditto.
	* gcc.target/i386/avx512f-vcmpsd-2.c: Delete unused variables.
	* gcc.target/i386/avx512f-vcmpss-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmuldq-2.c: Ditto.
	* gcc.target/i386/avx512f-vrndscalepd-2.c: Ditto.
	* gcc.target/i386/i386.exp: Ditto.
	* gcc.target/i386/avx512cd-vpbroadcastmb2q-2.c: Add static void for CALC,
	void for TEST instead of static void, initialize variables.
	* gcc.target/i386/avx512cd-vpbroadcastmw2d-2.c: Ditto.
	* gcc.target/i386/avx512cd-vpconflictd-2.c: Void for TEST instead of
	static void.
	* gcc.target/i386/avx512cd-vpconflictq-2.c: Ditto.
	* gcc.target/i386/avx512cd-vplzcntd-2.c: Ditto.
	* gcc.target/i386/avx512cd-vplzcntq-2.c: Ditto.
	* gcc.target/i386/avx512f-valignd-2.c: Ditto.
	* gcc.target/i386/avx512f-valignq-2.c: Ditto.
	* gcc.target/i386/avx512f-vcmppd-2.c: Ditto.
	* gcc.target/i386/avx512f-vcmpps-2.c: Ditto.
	* gcc.target/i386/avx512f-vcompresspd-2.c: Ditto.
	* gcc.target/i386/avx512f-vcompressps-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtdq2pd-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtdq2ps-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtpd2ps-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtph2ps-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtps2pd-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtps2ph-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvttpd2dq-2.c: Ditto.
	* gcc.target/i386/avx512f-vexpandpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vexpandps-2.c: Ditto.
	* gcc.target/i386/avx512f-vfixupimmss-2.c: Ditto.
	* gcc.target/i386/avx512f-vfmaddXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vfmaddXXXps-2.c: Ditto.
	* gcc.target/i386/avx512f-vfmaddsubXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vfmaddsubXXXps-2.c: Ditto.
	* gcc.target/i386/avx512f-vfmsubXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vfmsubXXXps-2.c: Ditto.
	* gcc.target/i386/avx512f-vfmsubaddXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vfmsubaddXXXps-2.c: Ditto.
	* gcc.target/i386/avx512f-vfnmaddXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vfnmaddXXXps-2.c: Ditto.
	* gcc.target/i386/avx512f-vfnmsubXXXpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vfnmsubXXXps-2.c: Ditto.
	* gcc.target/i386/avx512f-vgetmantpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vgetmantps-2.c: Ditto.
	* gcc.target/i386/avx512f-vinsertf32x4-2.c: Ditto.
	* gcc.target/i386/avx512f-vinserti32x4-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovapd-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovaps-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovddup-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovdqa32-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovdqa64-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovdqu32-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovdqu64-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovshdup-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovsldup-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovupd-2.c: Ditto.
	* gcc.target/i386/avx512f-vmovups-2.c: Ditto.
	* gcc.target/i386/avx512f-vpabsd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpabsq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpandd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpandnd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpandnq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpandq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpud-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcmpuq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcompressd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpcompressq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermi2d-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermi2pd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermi2ps-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermi2q-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermilpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermilpdi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermilps-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermilpsi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermpdi-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermps-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermq-imm-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermq-var-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermt2d-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermt2pd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermt2ps-2.c: Ditto.
	* gcc.target/i386/avx512f-vpermt2q-2.c: Ditto.
	* gcc.target/i386/avx512f-vpexpandd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpexpandq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsxbd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsxbq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsxdq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsxwd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovsxwq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovzxbd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovzxbq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovzxdq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovzxwd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovzxwq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmulld-2.c: Ditto.
	* gcc.target/i386/avx512f-vpord-2.c: Ditto.
	* gcc.target/i386/avx512f-vporq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpslld-2.c: Ditto.
	* gcc.target/i386/avx512f-vpternlogd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpternlogq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpxord-2.c: Ditto.
	* gcc.target/i386/avx512f-vpxorq-2.c: Ditto.
	* gcc.target/i386/avx512f-vrcp14pd-2.c: Ditto.
	* gcc.target/i386/avx512f-vrcp14ps-2.c: Ditto.
	* gcc.target/i386/avx512f-vrndscaleps-2.c: Ditto.
	* gcc.target/i386/avx512f-vrsqrt14pd-2.c: Ditto.
	* gcc.target/i386/avx512f-vrsqrt14ps-2.c: Ditto.
	* gcc.target/i386/avx512f-vshufpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vshufps-2.c: Ditto.
	* gcc.target/i386/avx512f-vsqrtpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vsqrtps-2.c: Ditto.
	* gcc.target/i386/avx512f-vunpckhpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vunpckhps-2.c: Ditto.
	* gcc.target/i386/avx512f-vunpcklpd-2.c: Ditto.
	* gcc.target/i386/avx512f-vunpcklps-2.c: Ditto.
	* gcc.target/i386/avx512f-vprold-2.c: Put parentheses, void for TEST
	instead of static void.
	* gcc.target/i386/avx512f-vprolq-2.c: Ditto.
	* gcc.target/i386/avx512f-vprolvd-2.c: Ditto.
	* gcc.target/i386/avx512f-vprolvq-2.c: Ditto.
	* gcc.target/i386/avx512f-vprord-2.c: Ditto.
	* gcc.target/i386/avx512f-vprorq-2.c: Ditto.
	* gcc.target/i386/avx512f-vprorvd-2.c: Ditto.
	* gcc.target/i386/avx512f-vprorvq-2.c: Ditto.
	* gcc.target/i386/avx512f-vfixupimmpd-2.c: Void for TEST instead of
	static void, delete unused variables.
	* gcc.target/i386/avx512f-vfixupimmps-2.c: Ditto.
	* gcc.target/i386/avx512f-vfixupimmsd-2.c: Ditto.
	* gcc.target/i386/avx512f-vgetexppd-2.c: Ditto.
	* gcc.target/i386/avx512f-vgetexpps-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmuludq-2.c: Void for TEST instead of
	static void, delete unused variables, Change parameters for
	UNION_CHECK, MASK_MERGE and MASK_ZERO.
	* gcc.target/i386/avx512f-vcvtpd2dq-2.c: Change type of parameter in
	CALC,  void for TEST instead of static void.
	* gcc.target/i386/avx512f-vcvtpd2udq-2.c: Change parameters for
	UNION_CHECK, MASK_MERGE and MASK_ZERO, void for TEST instead of static
	void.
	* gcc.target/i386/avx512f-vcvttpd2udq-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtudq2pd-2.c: Void for TEST instead of
	static void, change type  of parameter for UNION_TYPE.
	* gcc.target/i386/avx512f-vcvtudq2ps-2.c: Ditto.
	* gcc.target/i386/avx512f-vcvtps2udq-2.c: Add static void for CALC,
	void for TEST instead of static void, delete unused variables, change
	parameters for UNION_CHECK, MASK_MERGE and MASK_ZERO.
	* gcc.target/i386/avx512f-vcvttps2udq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovusdb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovusdw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovusqb-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovusqd-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmovusqw-2.c: Ditto.
	* gcc.target/i386/avx512f-vpmaxud-2.c: Add static void for CALC,
	void for TEST instead of static void, change parameters for UNION_CHECK,
	UNION_TYPE, MASK_MERGE and MASK_ZERO.
	* gcc.target/i386/avx512f-vpmaxuq-2.c: Ditto.
	* gcc.target/i386/avx512f-vpminud-2.c: Ditto.
	* gcc.target/i386/avx512f-vpminuq-2.c: Ditto.
	* gcc.target/i386/avx512f-additional-reg-names.c: Add
	__attribute__((unused)).
	* gcc.target/i386/avx512f-dummy.c: Delete unused variables, add
	__attribute__((unused)).
	* gcc.target/i386/avx512f-kandnw-1.c: Initialize variables.
	* gcc.target/i386/avx512f-kandw-1.c: Ditto.
	* gcc.target/i386/avx512f-klogic-2.c: Ditto.
	* gcc.target/i386/avx512f-knotw-1.c: Ditto.
	* gcc.target/i386/avx512f-korw-1.c: Ditto.
	* gcc.target/i386/avx512f-kunpckbw-1.c: Ditto.
	* gcc.target/i386/avx512f-kxnorw-1.c: Ditto.
	* gcc.target/i386/avx512f-kxorw-1.c: Ditto.
	* gcc.target/i386/avx512f-kortestw-1.c: Initialize variables,
	add __attribute__((unused)).
	* gcc.target/i386/avx512f-vcvttsd2si-2.c: Exclude "avx512f-helper.h"
	* gcc.target/i386/avx512f-vcvttss2si-2.c:Ditto.
	* gcc.target/i386/avx512f-vgetexpsd-2.c: Ditto.
	* gcc.target/i386/avx512f-vgetexpss-2.c: Ditto.
	* gcc.target/i386/avx512f-vrndscalesd-2.c: Ditto.
	* gcc.target/i386/avx512f-vrndscaless-2.c: Ditto.
	* gcc.target/i386/avx512f-vscalefsd-2.c: Ditto.
	* gcc.target/i386/avx512f-vscalefss-2.c: Ditto.
	* gcc.target/i386/avx512f-vgetmantsd-2.c: Exclude "avx512f-helper.h",
	delete unused variables.
	* gcc.target/i386/avx512f-vgetmantss-2.c: Ditto.
	* gcc.target/i386/avx512f-vrcp14sd-2.c: Ditto.
	* gcc.target/i386/avx512f-vrcp14ss-2.c: Ditto.
	* gcc.target/i386/avx512f-vrsqrt14sd-2.c: Ditto.
	* gcc.target/i386/avx512f-vrsqrt14ss-2.c: Ditto.
	* gcc.target/i386/avx512f-helper.h: Void for test_512() instead of
	static void, mask_merging and zero_masking for unsigned types.
	* gcc.target/i386/m128-check.h: Add new unions, CHECK_EXP and
	CHECK_ARRAY for unsigned types.
	* gcc.target/i386/m256-check.h: Ditto.
	* gcc.target/i386/m512-check.h: Ditto.

From-SVN: r211372
---
 gcc/testsuite/ChangeLog                       | 314 ++++++++++++++++++
 .../i386/avx512cd-vpbroadcastmb2q-2.c         |   5 +-
 .../i386/avx512cd-vpbroadcastmw2d-2.c         |   5 +-
 .../gcc.target/i386/avx512cd-vpconflictd-2.c  |   2 +-
 .../gcc.target/i386/avx512cd-vpconflictq-2.c  |   2 +-
 .../gcc.target/i386/avx512cd-vplzcntd-2.c     |   2 +-
 .../gcc.target/i386/avx512cd-vplzcntq-2.c     |   2 +-
 .../i386/avx512f-additional-reg-names.c       |   2 +-
 gcc/testsuite/gcc.target/i386/avx512f-dummy.c |   4 +-
 .../gcc.target/i386/avx512f-helper.h          |  12 +-
 .../gcc.target/i386/avx512f-kandnw-1.c        |   2 +-
 .../gcc.target/i386/avx512f-kandw-1.c         |   2 +-
 .../gcc.target/i386/avx512f-klogic-2.c        |   2 +-
 .../gcc.target/i386/avx512f-knotw-1.c         |   2 +-
 .../gcc.target/i386/avx512f-kortestw-1.c      |  10 +-
 .../gcc.target/i386/avx512f-korw-1.c          |   3 +-
 .../gcc.target/i386/avx512f-kunpckbw-1.c      |   2 +-
 .../gcc.target/i386/avx512f-kxnorw-1.c        |   2 +-
 .../gcc.target/i386/avx512f-kxorw-1.c         |   2 +-
 .../gcc.target/i386/avx512f-vaddpd-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vaddps-2.c        |   3 +-
 .../gcc.target/i386/avx512f-valignd-2.c       |   2 +-
 .../gcc.target/i386/avx512f-valignq-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vblendmpd-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vblendmps-2.c     |   3 +-
 .../i386/avx512f-vbroadcastf32x4-2.c          |   3 +-
 .../i386/avx512f-vbroadcastf64x4-2.c          |   3 +-
 .../i386/avx512f-vbroadcasti32x4-2.c          |   3 +-
 .../i386/avx512f-vbroadcasti64x4-2.c          |   3 +-
 .../gcc.target/i386/avx512f-vbroadcastsd-2.c  |   3 +-
 .../gcc.target/i386/avx512f-vbroadcastss-2.c  |   3 +-
 .../gcc.target/i386/avx512f-vcmppd-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vcmpps-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vcmpsd-2.c        |   1 -
 .../gcc.target/i386/avx512f-vcmpss-2.c        |   1 -
 .../gcc.target/i386/avx512f-vcompresspd-2.c   |   2 +-
 .../gcc.target/i386/avx512f-vcompressps-2.c   |   2 +-
 .../gcc.target/i386/avx512f-vcvtdq2pd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vcvtdq2ps-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vcvtpd2dq-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vcvtpd2ps-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vcvtpd2udq-2.c    |  14 +-
 .../gcc.target/i386/avx512f-vcvtph2ps-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vcvtps2dq-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vcvtps2pd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vcvtps2ph-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vcvtps2udq-2.c    |  17 +-
 .../gcc.target/i386/avx512f-vcvttpd2dq-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vcvttpd2udq-2.c   |  14 +-
 .../gcc.target/i386/avx512f-vcvttps2dq-2.c    |   3 +-
 .../gcc.target/i386/avx512f-vcvttps2udq-2.c   |  17 +-
 .../gcc.target/i386/avx512f-vcvttsd2si-1.c    |   2 +-
 .../gcc.target/i386/avx512f-vcvttsd2si-2.c    |   1 -
 .../gcc.target/i386/avx512f-vcvttss2si-1.c    |   2 +-
 .../gcc.target/i386/avx512f-vcvttss2si-2.c    |   1 -
 .../gcc.target/i386/avx512f-vcvtudq2pd-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vcvtudq2ps-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vdivpd-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vdivps-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vexpandpd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vexpandps-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vextractf32x4-2.c |   4 +-
 .../gcc.target/i386/avx512f-vextracti32x4-2.c |   4 +-
 .../gcc.target/i386/avx512f-vfixupimmpd-2.c   |   4 +-
 .../gcc.target/i386/avx512f-vfixupimmps-2.c   |   4 +-
 .../gcc.target/i386/avx512f-vfixupimmsd-2.c   |   4 +-
 .../gcc.target/i386/avx512f-vfixupimmss-2.c   |   2 +-
 .../gcc.target/i386/avx512f-vfmaddXXXpd-2.c   |   2 +-
 .../gcc.target/i386/avx512f-vfmaddXXXps-2.c   |   2 +-
 .../i386/avx512f-vfmaddsubXXXpd-2.c           |   2 +-
 .../i386/avx512f-vfmaddsubXXXps-2.c           |   2 +-
 .../gcc.target/i386/avx512f-vfmsubXXXpd-2.c   |   2 +-
 .../gcc.target/i386/avx512f-vfmsubXXXps-2.c   |   2 +-
 .../i386/avx512f-vfmsubaddXXXpd-2.c           |   2 +-
 .../i386/avx512f-vfmsubaddXXXps-2.c           |   2 +-
 .../gcc.target/i386/avx512f-vfnmaddXXXpd-2.c  |   2 +-
 .../gcc.target/i386/avx512f-vfnmaddXXXps-2.c  |   2 +-
 .../gcc.target/i386/avx512f-vfnmsubXXXpd-2.c  |   2 +-
 .../gcc.target/i386/avx512f-vfnmsubXXXps-2.c  |   2 +-
 .../gcc.target/i386/avx512f-vgetexppd-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vgetexpps-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vgetexpsd-2.c     |   1 -
 .../gcc.target/i386/avx512f-vgetexpss-2.c     |   1 -
 .../gcc.target/i386/avx512f-vgetmantpd-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vgetmantps-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vgetmantsd-2.c    |   2 -
 .../gcc.target/i386/avx512f-vgetmantss-2.c    |   2 -
 .../gcc.target/i386/avx512f-vinsertf32x4-2.c  |   2 +-
 .../gcc.target/i386/avx512f-vinserti32x4-2.c  |   2 +-
 .../gcc.target/i386/avx512f-vmaxpd-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vmaxps-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vminpd-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vminps-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vmovapd-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vmovaps-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vmovddup-2.c      |   2 +-
 .../gcc.target/i386/avx512f-vmovdqa32-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vmovdqa64-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vmovdqu32-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vmovdqu64-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vmovshdup-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vmovsldup-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vmovupd-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vmovups-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vmulpd-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vmulps-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpabsd-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vpabsq-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vpaddd-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpaddq-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpandd-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vpandnd-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vpandnq-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vpandq-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vpblendmd-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vpblendmq-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vpbroadcastd-2.c  |   3 +-
 .../gcc.target/i386/avx512f-vpbroadcastq-2.c  |   3 +-
 .../gcc.target/i386/avx512f-vpcmpd-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vpcmpeqd-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpcmpeqq-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpcmpged-2.c      |   4 +-
 .../gcc.target/i386/avx512f-vpcmpgeq-2.c      |   4 +-
 .../gcc.target/i386/avx512f-vpcmpgeud-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpcmpgeuq-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpcmpgtd-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpcmpgtq-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpcmpled-2.c      |   4 +-
 .../gcc.target/i386/avx512f-vpcmpleq-2.c      |   4 +-
 .../gcc.target/i386/avx512f-vpcmpleud-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpcmpleuq-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpcmpltd-2.c      |   4 +-
 .../gcc.target/i386/avx512f-vpcmpltq-2.c      |   4 +-
 .../gcc.target/i386/avx512f-vpcmpltud-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpcmpltuq-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpcmpneqd-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpcmpneqq-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpcmpnequd-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vpcmpnequq-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vpcmpq-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vpcmpud-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vpcmpuq-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vpcompressd-2.c   |   2 +-
 .../gcc.target/i386/avx512f-vpcompressq-2.c   |   2 +-
 .../gcc.target/i386/avx512f-vpermd-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vpermi2d-2.c      |   2 +-
 .../gcc.target/i386/avx512f-vpermi2pd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpermi2ps-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpermi2q-2.c      |   2 +-
 .../gcc.target/i386/avx512f-vpermilpd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpermilpdi-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vpermilps-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpermilpsi-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vpermpd-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vpermpdi-2.c      |   2 +-
 .../gcc.target/i386/avx512f-vpermps-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vpermq-imm-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vpermq-var-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vpermt2d-2.c      |   2 +-
 .../gcc.target/i386/avx512f-vpermt2pd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpermt2ps-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpermt2q-2.c      |   2 +-
 .../gcc.target/i386/avx512f-vpexpandd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpexpandq-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpmaxsd-2.c       |   6 +-
 .../gcc.target/i386/avx512f-vpmaxsq-2.c       |   6 +-
 .../gcc.target/i386/avx512f-vpmaxud-2.c       |  17 +-
 .../gcc.target/i386/avx512f-vpmaxuq-2.c       |  16 +-
 .../gcc.target/i386/avx512f-vpminsd-2.c       |   6 +-
 .../gcc.target/i386/avx512f-vpminsq-2.c       |   6 +-
 .../gcc.target/i386/avx512f-vpminud-2.c       |  16 +-
 .../gcc.target/i386/avx512f-vpminuq-2.c       |  16 +-
 .../gcc.target/i386/avx512f-vpmovdb-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpmovdw-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpmovqb-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpmovqd-2.c       |   5 +-
 .../gcc.target/i386/avx512f-vpmovqw-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpmovsdb-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpmovsdw-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpmovsqb-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpmovsqd-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpmovsqw-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vpmovsxbd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpmovsxbq-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpmovsxdq-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpmovsxwd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpmovsxwq-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vpmovusdb-2.c     |  21 +-
 .../gcc.target/i386/avx512f-vpmovusdw-2.c     |  21 +-
 .../gcc.target/i386/avx512f-vpmovusqb-2.c     |  23 +-
 .../gcc.target/i386/avx512f-vpmovusqd-2.c     |  21 +-
 .../gcc.target/i386/avx512f-vpmovusqw-2.c     |  21 +-
 .../gcc.target/i386/avx512f-vpmovzxbd-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpmovzxbq-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpmovzxdq-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpmovzxwd-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpmovzxwq-2.c     |   4 +-
 .../gcc.target/i386/avx512f-vpmuldq-2.c       |   4 +-
 .../gcc.target/i386/avx512f-vpmulld-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vpmuludq-2.c      |  18 +-
 .../gcc.target/i386/avx512f-vpord-2.c         |   2 +-
 .../gcc.target/i386/avx512f-vporq-2.c         |   2 +-
 .../gcc.target/i386/avx512f-vprold-2.c        |   4 +-
 .../gcc.target/i386/avx512f-vprolq-2.c        |   4 +-
 .../gcc.target/i386/avx512f-vprolvd-2.c       |   4 +-
 .../gcc.target/i386/avx512f-vprolvq-2.c       |   4 +-
 .../gcc.target/i386/avx512f-vprord-2.c        |   4 +-
 .../gcc.target/i386/avx512f-vprorq-2.c        |   4 +-
 .../gcc.target/i386/avx512f-vprorvd-2.c       |   4 +-
 .../gcc.target/i386/avx512f-vprorvq-2.c       |   4 +-
 .../gcc.target/i386/avx512f-vpshufd-2.c       |   6 +-
 .../gcc.target/i386/avx512f-vpslld-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpslldi-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpsllq-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpsllqi-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpsllvd-2.c       |   7 +-
 .../gcc.target/i386/avx512f-vpsllvq-2.c       |   9 +-
 .../gcc.target/i386/avx512f-vpsrad-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpsradi-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpsraq-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpsraqi-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpsravd-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpsravq-2.c       |   3 +-
 .../gcc.target/i386/avx512f-vpsrld-2.c        |  19 +-
 .../gcc.target/i386/avx512f-vpsrldi-2.c       |  27 +-
 .../gcc.target/i386/avx512f-vpsrlq-2.c        |  19 +-
 .../gcc.target/i386/avx512f-vpsrlqi-2.c       |  25 +-
 .../gcc.target/i386/avx512f-vpsrlvd-2.c       |  15 +-
 .../gcc.target/i386/avx512f-vpsrlvq-2.c       |  18 +-
 .../gcc.target/i386/avx512f-vpsubd-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpsubq-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vpternlogd-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vpternlogq-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vptestmd-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vptestmq-2.c      |   3 +-
 .../gcc.target/i386/avx512f-vptestnmd-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vptestnmq-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vpunpckhdq-2.c    |   3 +-
 .../gcc.target/i386/avx512f-vpunpckhqdq-2.c   |   3 +-
 .../gcc.target/i386/avx512f-vpunpckldq-2.c    |   3 +-
 .../gcc.target/i386/avx512f-vpunpcklqdq-2.c   |   3 +-
 .../gcc.target/i386/avx512f-vpxord-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vpxorq-2.c        |   2 +-
 .../gcc.target/i386/avx512f-vrcp14pd-2.c      |   2 +-
 .../gcc.target/i386/avx512f-vrcp14ps-2.c      |   2 +-
 .../gcc.target/i386/avx512f-vrcp14sd-2.c      |   4 +-
 .../gcc.target/i386/avx512f-vrcp14ss-2.c      |   4 +-
 .../gcc.target/i386/avx512f-vrndscalepd-2.c   |   3 +-
 .../gcc.target/i386/avx512f-vrndscaleps-2.c   |   2 +-
 .../gcc.target/i386/avx512f-vrndscalesd-2.c   |   1 -
 .../gcc.target/i386/avx512f-vrndscaless-2.c   |   1 -
 .../gcc.target/i386/avx512f-vrsqrt14pd-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vrsqrt14ps-2.c    |   2 +-
 .../gcc.target/i386/avx512f-vrsqrt14sd-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vrsqrt14ss-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vscalefpd-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vscalefps-2.c     |   3 +-
 .../gcc.target/i386/avx512f-vscalefsd-2.c     |   1 -
 .../gcc.target/i386/avx512f-vscalefss-2.c     |   1 -
 .../gcc.target/i386/avx512f-vshuff32x4-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vshuff64x2-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vshufi32x4-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vshufi64x2-2.c    |   4 +-
 .../gcc.target/i386/avx512f-vshufpd-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vshufps-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vsqrtpd-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vsqrtps-2.c       |   2 +-
 .../gcc.target/i386/avx512f-vsubpd-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vsubps-2.c        |   3 +-
 .../gcc.target/i386/avx512f-vunpckhpd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vunpckhps-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vunpcklpd-2.c     |   2 +-
 .../gcc.target/i386/avx512f-vunpcklps-2.c     |   2 +-
 gcc/testsuite/gcc.target/i386/i386.exp        |   6 +-
 gcc/testsuite/gcc.target/i386/m128-check.h    |  21 ++
 gcc/testsuite/gcc.target/i386/m256-check.h    |  28 ++
 gcc/testsuite/gcc.target/i386/m512-check.h    |  30 ++
 277 files changed, 972 insertions(+), 516 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cbf634b6a63..544b80be584 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,317 @@
+2014-06-09  Petr Murzin  <petr.murzin@intel.com>
+
+	* gcc.target/i386/avx512f-vaddpd-2.c:  Add static void for CALC,
+	void for TEST instead of static void.
+	* gcc.target/i386/avx512f-vaddps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vblendmpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vblendmps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vbroadcastf32x4-2.c:Ditto.
+	* gcc.target/i386/avx512f-vbroadcastf64x4-2.c:Ditto.
+	* gcc.target/i386/avx512f-vbroadcasti32x4-2.c: Ditto.
+	* gcc.target/i386/avx512f-vbroadcasti64x4-2.c: Ditto.
+	* gcc.target/i386/avx512f-vbroadcastsd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vbroadcastss-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtps2dq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvttps2dq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vdivpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vdivps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vextractf32x4-2.c: Ditto.
+	* gcc.target/i386/avx512f-vextracti32x4-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmaxpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmaxps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vminpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vminps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmulpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmulps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpaddd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpaddq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpblendmd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpblendmq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpbroadcastd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpbroadcastq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpeqd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpeqq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpgtd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpgtq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovdb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovdw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovqb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovqw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsdb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsdw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsqb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsqd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsqw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpslld-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpslldi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsllq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsllqi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsrad-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsradi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsraq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsraqi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsravd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsravq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsubd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsubq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vptestmd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vptestmq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vptestnmd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vptestnmq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpunpckhdq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpunpckhqdq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpunpckldq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpunpcklqdq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vscalefpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vscalefps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vshuff32x4-2.c: Ditto.
+	* gcc.target/i386/avx512f-vshuff64x2-2.c: Ditto.
+	* gcc.target/i386/avx512f-vshufi32x4-2.c: Ditto.
+	* gcc.target/i386/avx512f-vshufi64x2-2.c: Ditto.
+	* gcc.target/i386/avx512f-vsubpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vsubps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovdb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovdw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovqb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovqw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsdb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsdw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsqb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsqd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsqw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsllvd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsllvq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsrld-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsrldi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsrlq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsrlqi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsrlvd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpsrlvq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpshufd-2.c: Delete variables, void for TEST
+	instead of static void.
+	* gcc.target/i386/avx512f-vpcmpged-2.c: Add static void for CALC,
+	delete unused variables.
+	* gcc.target/i386/avx512f-vpcmpgeq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpgeud-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpgeuq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpled-2.c: Add static void for CALC,
+	delete unused variables, void for TEST instead of static void.
+	* gcc.target/i386/avx512f-vpcmpleq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpleud-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpleuq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpltd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpltq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpltud-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpltuq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpneqd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpneqq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpnequd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpnequq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovqd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmaxsd-2.c: Add static void for CALC,
+	initialize variables.
+	* gcc.target/i386/avx512f-vpmaxsq-2.c:Ditto.
+	* gcc.target/i386/avx512f-vpminsd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpminsq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvttsd2si-1.c: Add missed type.
+	* gcc.target/i386/avx512f-vcvttss2si-1.c: Ditto.
+	* gcc.target/i386/avx512f-vcmpsd-2.c: Delete unused variables.
+	* gcc.target/i386/avx512f-vcmpss-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmuldq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrndscalepd-2.c: Ditto.
+	* gcc.target/i386/i386.exp: Ditto.
+	* gcc.target/i386/avx512cd-vpbroadcastmb2q-2.c: Add static void for CALC,
+	void for TEST instead of static void, initialize variables.
+	* gcc.target/i386/avx512cd-vpbroadcastmw2d-2.c: Ditto.
+	* gcc.target/i386/avx512cd-vpconflictd-2.c: Void for TEST instead of
+	static void.
+	* gcc.target/i386/avx512cd-vpconflictq-2.c: Ditto.
+	* gcc.target/i386/avx512cd-vplzcntd-2.c: Ditto.
+	* gcc.target/i386/avx512cd-vplzcntq-2.c: Ditto.
+	* gcc.target/i386/avx512f-valignd-2.c: Ditto.
+	* gcc.target/i386/avx512f-valignq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcmppd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcmpps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcompresspd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcompressps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtdq2pd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtdq2ps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtpd2ps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtph2ps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtps2pd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtps2ph-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvttpd2dq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vexpandpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vexpandps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmss-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfmaddXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfmaddXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfmaddsubXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfmaddsubXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfmsubXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfmsubXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfmsubaddXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfmsubaddXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfnmaddXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfnmaddXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfnmsubXXXpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfnmsubXXXps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vgetmantpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vgetmantps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vinsertf32x4-2.c: Ditto.
+	* gcc.target/i386/avx512f-vinserti32x4-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovapd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovaps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovddup-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovdqa32-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovdqa64-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovdqu32-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovdqu64-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovshdup-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovsldup-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovupd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vmovups-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpabsd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpabsq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpandd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpandnd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpandnq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpandq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpud-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcmpuq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcompressd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpcompressq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermi2d-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermi2pd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermi2ps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermi2q-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermilpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermilpdi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermilps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermilpsi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermpdi-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermq-imm-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermq-var-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermt2d-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermt2pd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermt2ps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpermt2q-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpexpandd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpexpandq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsxbd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsxbq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsxdq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsxwd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovsxwq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovzxbd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovzxbq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovzxdq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovzxwd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovzxwq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmulld-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpord-2.c: Ditto.
+	* gcc.target/i386/avx512f-vporq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpslld-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpternlogd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpternlogq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpxord-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpxorq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrcp14pd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrcp14ps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrndscaleps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrsqrt14pd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrsqrt14ps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vshufpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vshufps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vsqrtpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vsqrtps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vunpckhpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vunpckhps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vunpcklpd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vunpcklps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vprold-2.c: Put parentheses, void for TEST
+	instead of static void.
+	* gcc.target/i386/avx512f-vprolq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vprolvd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vprolvq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vprord-2.c: Ditto.
+	* gcc.target/i386/avx512f-vprorq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vprorvd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vprorvq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmpd-2.c: Void for TEST instead of
+	static void, delete unused variables.
+	* gcc.target/i386/avx512f-vfixupimmps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vfixupimmsd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vgetexppd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vgetexpps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmuludq-2.c: Void for TEST instead of
+	static void, delete unused variables, Change parameters for
+	UNION_CHECK, MASK_MERGE and MASK_ZERO.
+	* gcc.target/i386/avx512f-vcvtpd2dq-2.c: Change type of parameter in
+	CALC,  void for TEST instead of static void.
+	* gcc.target/i386/avx512f-vcvtpd2udq-2.c: Change parameters for
+	UNION_CHECK, MASK_MERGE and MASK_ZERO, void for TEST instead of static
+	void.
+	* gcc.target/i386/avx512f-vcvttpd2udq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtudq2pd-2.c: Void for TEST instead of
+	static void, change type  of parameter for UNION_TYPE.
+	* gcc.target/i386/avx512f-vcvtudq2ps-2.c: Ditto.
+	* gcc.target/i386/avx512f-vcvtps2udq-2.c: Add static void for CALC,
+	void for TEST instead of static void, delete unused variables, change
+	parameters for UNION_CHECK, MASK_MERGE and MASK_ZERO.
+	* gcc.target/i386/avx512f-vcvttps2udq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovusdb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovusdw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovusqb-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovusqd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmovusqw-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpmaxud-2.c: Add static void for CALC,
+	void for TEST instead of static void, change parameters for UNION_CHECK,
+	UNION_TYPE, MASK_MERGE and MASK_ZERO.
+	* gcc.target/i386/avx512f-vpmaxuq-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpminud-2.c: Ditto.
+	* gcc.target/i386/avx512f-vpminuq-2.c: Ditto.
+	* gcc.target/i386/avx512f-additional-reg-names.c: Add
+	__attribute__((unused)).
+	* gcc.target/i386/avx512f-dummy.c: Delete unused variables, add
+	__attribute__((unused)).
+	* gcc.target/i386/avx512f-kandnw-1.c: Initialize variables.
+	* gcc.target/i386/avx512f-kandw-1.c: Ditto.
+	* gcc.target/i386/avx512f-klogic-2.c: Ditto.
+	* gcc.target/i386/avx512f-knotw-1.c: Ditto.
+	* gcc.target/i386/avx512f-korw-1.c: Ditto.
+	* gcc.target/i386/avx512f-kunpckbw-1.c: Ditto.
+	* gcc.target/i386/avx512f-kxnorw-1.c: Ditto.
+	* gcc.target/i386/avx512f-kxorw-1.c: Ditto.
+	* gcc.target/i386/avx512f-kortestw-1.c: Initialize variables,
+	add __attribute__((unused)).
+	* gcc.target/i386/avx512f-vcvttsd2si-2.c: Exclude "avx512f-helper.h"
+	* gcc.target/i386/avx512f-vcvttss2si-2.c:Ditto.
+	* gcc.target/i386/avx512f-vgetexpsd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vgetexpss-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrndscalesd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrndscaless-2.c: Ditto.
+	* gcc.target/i386/avx512f-vscalefsd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vscalefss-2.c: Ditto.
+	* gcc.target/i386/avx512f-vgetmantsd-2.c: Exclude "avx512f-helper.h",
+	delete unused variables.
+	* gcc.target/i386/avx512f-vgetmantss-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrcp14sd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrcp14ss-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrsqrt14sd-2.c: Ditto.
+	* gcc.target/i386/avx512f-vrsqrt14ss-2.c: Ditto.
+	* gcc.target/i386/avx512f-helper.h: Void for test_512() instead of
+	static void, mask_merging and zero_masking for unsigned types.
+	* gcc.target/i386/m128-check.h: Add new unions, CHECK_EXP and
+	CHECK_ARRAY for unsigned types.
+	* gcc.target/i386/m256-check.h: Ditto.
+	* gcc.target/i386/m512-check.h: Ditto.
+
 2014-06-09  Alan Lawrence  <alan.lawrence@arm.com>
 
 	PR target/61062
diff --git a/gcc/testsuite/gcc.target/i386/avx512cd-vpbroadcastmb2q-2.c b/gcc/testsuite/gcc.target/i386/avx512cd-vpbroadcastmb2q-2.c
index 05f4bfc4252..2e0a082c13a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512cd-vpbroadcastmb2q-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512cd-vpbroadcastmb2q-2.c
@@ -9,6 +9,7 @@
 
 #define SIZE (AVX512F_LEN / 64)
 
+static void
 CALC (long long *res, __mmask8 src)
 {
   int i;
@@ -17,13 +18,13 @@ CALC (long long *res, __mmask8 src)
     res[i] = src;
 }
 
-static void
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) res;
   long long res_ref[SIZE];
-  __mmask8 src;
+  __mmask8 src = 0;
 
   for (i = 0; i < SIZE; i++)
     {
diff --git a/gcc/testsuite/gcc.target/i386/avx512cd-vpbroadcastmw2d-2.c b/gcc/testsuite/gcc.target/i386/avx512cd-vpbroadcastmw2d-2.c
index 7282110ab37..f4bd7e7a60e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512cd-vpbroadcastmw2d-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512cd-vpbroadcastmw2d-2.c
@@ -9,6 +9,7 @@
 
 #define SIZE (AVX512F_LEN / 32)
 
+static void
 CALC (int *res, __mmask16 src)
 {
   int i;
@@ -17,13 +18,13 @@ CALC (int *res, __mmask16 src)
     res[i] = src;
 }
 
-static void
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) res;
   int res_ref[SIZE];
-  __mmask16 src;
+  __mmask16 src = 0;
 
   for (i = 0; i < SIZE; i++)
     {
diff --git a/gcc/testsuite/gcc.target/i386/avx512cd-vpconflictd-2.c b/gcc/testsuite/gcc.target/i386/avx512cd-vpconflictd-2.c
index 16597fbafb0..47bfc670282 100644
--- a/gcc/testsuite/gcc.target/i386/avx512cd-vpconflictd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512cd-vpconflictd-2.c
@@ -25,7 +25,7 @@ CALC (int *s, int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512cd-vpconflictq-2.c b/gcc/testsuite/gcc.target/i386/avx512cd-vpconflictq-2.c
index a2695195c48..c36025b6313 100644
--- a/gcc/testsuite/gcc.target/i386/avx512cd-vpconflictq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512cd-vpconflictq-2.c
@@ -25,7 +25,7 @@ CALC (long long *s, long long *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512cd-vplzcntd-2.c b/gcc/testsuite/gcc.target/i386/avx512cd-vplzcntd-2.c
index 0a357b69fa6..ce495317cb1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512cd-vplzcntd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512cd-vplzcntd-2.c
@@ -25,7 +25,7 @@ CALC (int *s, int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512cd-vplzcntq-2.c b/gcc/testsuite/gcc.target/i386/avx512cd-vplzcntq-2.c
index f0cc40304c9..42bd7970e7d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512cd-vplzcntq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512cd-vplzcntq-2.c
@@ -25,7 +25,7 @@ CALC (long long *s, long long *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-additional-reg-names.c b/gcc/testsuite/gcc.target/i386/avx512f-additional-reg-names.c
index 1bd428aed16..164a1deb08e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-additional-reg-names.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-additional-reg-names.c
@@ -3,7 +3,7 @@
 
 void foo ()
 {
-  register int zmm_var asm ("zmm9");
+  register int zmm_var asm ("zmm9") __attribute__((unused));
 
   __asm__ __volatile__("vxorpd %%zmm0, %%zmm0, %%zmm7\n" : : : "zmm7" );
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-dummy.c b/gcc/testsuite/gcc.target/i386/avx512f-dummy.c
index 84b062789b9..0ef000389fe 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-dummy.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-dummy.c
@@ -7,7 +7,7 @@
 void static
 avx512f_test (void)
 {
-  union512i_q u, s1, s2;
+  union512i_q u;
   long long e[8];
-  volatile int tst = check_union512i_q (u, e);
+  volatile int tst __attribute__((unused)) = check_union512i_q (u, e);
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-helper.h b/gcc/testsuite/gcc.target/i386/avx512f-helper.h
index 61b2e90d197..9beabdf5e43 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-helper.h
+++ b/gcc/testsuite/gcc.target/i386/avx512f-helper.h
@@ -40,6 +40,10 @@ MAKE_MASK_MERGE(i_d, int)
 MAKE_MASK_MERGE(i_q, long long)
 MAKE_MASK_MERGE(, float)
 MAKE_MASK_MERGE(d, double)
+MAKE_MASK_MERGE(i_ub, unsigned char)
+MAKE_MASK_MERGE(i_uw, unsigned short)
+MAKE_MASK_MERGE(i_ud, unsigned int)
+MAKE_MASK_MERGE(i_uq, unsigned long long)
 
 #define MASK_MERGE(TYPE) merge_masking_##TYPE
 
@@ -61,6 +65,11 @@ MAKE_MASK_ZERO(i_d, int)
 MAKE_MASK_ZERO(i_q, long long)
 MAKE_MASK_ZERO(, float)
 MAKE_MASK_ZERO(d, double)
+MAKE_MASK_ZERO(i_ub, unsigned char)
+MAKE_MASK_ZERO(i_uw, unsigned short)
+MAKE_MASK_ZERO(i_ud, unsigned int)
+MAKE_MASK_ZERO(i_uq, unsigned long long)
+
 
 #define MASK_ZERO(TYPE) zero_masking_##TYPE
 
@@ -82,7 +91,8 @@ MAKE_MASK_ZERO(d, double)
 
 #define AVX512F_LEN 512
 #define AVX512F_LEN_HALF 256
-static void test_512 ();
+
+void test_512 ();
 
 #if defined (AVX512F)
 void
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-kandnw-1.c b/gcc/testsuite/gcc.target/i386/avx512f-kandnw-1.c
index 3d777c83015..b81fa6e3f3e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-kandnw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-kandnw-1.c
@@ -8,7 +8,7 @@ void
 avx512f_test ()
 {
   __mmask16 k1, k2, k3;
-  volatile __m512 x;
+  volatile __m512 x = _mm512_setzero_ps();
 
   __asm__( "kmovw %1, %0" : "=k" (k1) : "r" (1) );
   __asm__( "kmovw %1, %0" : "=k" (k2) : "r" (2) );
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-kandw-1.c b/gcc/testsuite/gcc.target/i386/avx512f-kandw-1.c
index 19a3cf4dbc3..78ab14305f4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-kandw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-kandw-1.c
@@ -8,7 +8,7 @@ void
 avx512f_test ()
 {
   __mmask16 k1, k2, k3;
-  volatile __m512 x;
+  volatile __m512 x = _mm512_setzero_ps();
 
   __asm__( "kmovw %1, %0" : "=k" (k1) : "r" (1) );
   __asm__( "kmovw %1, %0" : "=k" (k2) : "r" (2) );
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-klogic-2.c b/gcc/testsuite/gcc.target/i386/avx512f-klogic-2.c
index df7fc9b7b7d..48d4d84df4f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-klogic-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-klogic-2.c
@@ -8,7 +8,7 @@ void
 avx512f_test (void)
 {
   __mmask16 dst, src1, src2, dst_ref;
-  volatile __m512 x;
+  volatile __m512 x = _mm512_setzero_ps(); 
 
   __asm__( "kmovw %1, %0" : "=k" (src1) : "r" (0x0FFF) );
   __asm__( "kmovw %1, %0" : "=k" (src2) : "r" (0x0F0F) );
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-knotw-1.c b/gcc/testsuite/gcc.target/i386/avx512f-knotw-1.c
index a8f8f10b6be..32715a31bca 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-knotw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-knotw-1.c
@@ -8,7 +8,7 @@ void
 avx512f_test ()
 {
   __mmask16 k1, k2;
-  volatile __m512 x;
+  volatile __m512 x = _mm512_setzero_ps(); 
 
   __asm__( "kmovw %1, %0" : "=k" (k1) : "r" (45) );
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-kortestw-1.c b/gcc/testsuite/gcc.target/i386/avx512f-kortestw-1.c
index a3cdd4a1ab7..a33dbf23d5e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-kortestw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-kortestw-1.c
@@ -6,12 +6,12 @@
 
 void
 avx512f_test () {
-  volatile __mmask16 k1;
-  __mmask16 k2;
-  volatile __mmask8 k3;
-  __mmask8 k4;
+  volatile __mmask16 k1 = 0;
+  __mmask16 k2 = 0;
+  volatile __mmask8 k3 = 0;
+  __mmask8 k4 = 0;
 
-  volatile short r;
+  volatile short r __attribute__((unused));
 
   /* Check that appropriate insn sequence is generated at -O0.  */
   r = _mm512_kortestc (k1, k2);
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-korw-1.c b/gcc/testsuite/gcc.target/i386/avx512f-korw-1.c
index 96f837b96b0..9168dd3b571 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-korw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-korw-1.c
@@ -8,7 +8,8 @@ void
 avx512f_test ()
 {
   __mmask16 k1, k2, k3;
-  volatile __m512 x;
+  volatile __m512 x = _mm512_setzero_ps();
+  
 
   __asm__( "kmovw %1, %0" : "=k" (k1) : "r" (1) );
   __asm__( "kmovw %1, %0" : "=k" (k2) : "r" (2) );
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-kunpckbw-1.c b/gcc/testsuite/gcc.target/i386/avx512f-kunpckbw-1.c
index bc55f8b301c..f82a9c87a77 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-kunpckbw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-kunpckbw-1.c
@@ -7,7 +7,7 @@
 void
 avx512f_test () {
   __mmask16 k1, k2, k3;
-  volatile __m512 x;
+  volatile __m512 x = _mm512_setzero_ps(); 
 
   __asm__( "kmovw %1, %0" : "=k" (k1) : "r" (1) );
   __asm__( "kmovw %1, %0" : "=k" (k2) : "r" (2) );
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-kxnorw-1.c b/gcc/testsuite/gcc.target/i386/avx512f-kxnorw-1.c
index 8b12b2ac896..15df525217b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-kxnorw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-kxnorw-1.c
@@ -8,7 +8,7 @@ void
 avx512f_test ()
 {
   __mmask16 k1, k2, k3;
-  volatile __m512 x;
+  volatile __m512 x = _mm512_setzero_ps(); 
 
   __asm__( "kmovw %1, %0" : "=k" (k1) : "r" (1) );
   __asm__( "kmovw %1, %0" : "=k" (k2) : "r" (2) );
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-kxorw-1.c b/gcc/testsuite/gcc.target/i386/avx512f-kxorw-1.c
index 7ae1bc46204..e45462449c8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-kxorw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-kxorw-1.c
@@ -8,7 +8,7 @@ void
 avx512f_test ()
 {
   __mmask16 k1, k2, k3;
-  volatile __m512 x;
+  volatile __m512 x = _mm512_setzero_ps(); 
 
   __asm__( "kmovw %1, %0" : "=k" (k1) : "r" (1) );
   __asm__( "kmovw %1, %0" : "=k" (k2) : "r" (2) );
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vaddpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vaddpd-2.c
index ce6918ed66e..a2467185b29 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vaddpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vaddpd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s1, double *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s1, double *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vaddps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vaddps-2.c
index 6c982bcaffc..e1ea3df5a8e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vaddps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vaddps-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s1, float *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s1, float *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-valignd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-valignd-2.c
index 3d2a71ca1c8..e0cf231b6a8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-valignd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-valignd-2.c
@@ -27,7 +27,7 @@ CALC (int *s1, int *s2, int *r)
     r[i] = s[i + N];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3, s1, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-valignq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-valignq-2.c
index b3c09c7b1a3..92d01440a94 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-valignq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-valignq-2.c
@@ -27,7 +27,7 @@ CALC (long long *s1, long long *s2, long long *r)
     r[i] = s[i + N];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3, s1, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vblendmpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vblendmpd-2.c
index 1fe4cb61605..027a74fcd99 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vblendmpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vblendmpd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s1, double *s2, MASK_TYPE mask)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s1, double *s2, MASK_TYPE mask)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vblendmps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vblendmps-2.c
index e92c70c37e5..e0c9c692287 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vblendmps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vblendmps-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s1, float *s2, MASK_TYPE mask)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s1, float *s2, MASK_TYPE mask)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastf32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastf32x4-2.c
index 79abcdc0d27..d0a3f7e6492 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastf32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastf32x4-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastf64x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastf64x4-2.c
index bc5f6a1cc6f..f646b2c9eff 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastf64x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastf64x4-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcasti32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcasti32x4-2.c
index 61dccc227a1..37fb0d0424b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcasti32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcasti32x4-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (int *r, int *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcasti64x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcasti64x4-2.c
index 6286fca8178..a54e9872b64 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcasti64x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcasti64x4-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (long long *r, long long *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastsd-2.c
index 3ecc1a7c588..b2c056ce696 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastsd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastss-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastss-2.c
index f3f339825bd..ac9ab1ac62b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vbroadcastss-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcmppd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcmppd-2.c
index add23d07a19..a81f36256cd 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcmppd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcmppd-2.c
@@ -26,7 +26,7 @@
     if ((dst_ref & mask) != dst2) abort();
 #endif
 
-static void
+void
 TEST ()
 {
     UNION_TYPE (AVX512F_LEN, d) source1, source2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcmpps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcmpps-2.c
index 15c314e2d60..88dc8908596 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcmpps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcmpps-2.c
@@ -26,7 +26,7 @@
     if ((dst_ref & mask) != dst2) abort();
 #endif
 
-static void
+void
 TEST ()
 {
     UNION_TYPE (AVX512F_LEN,) source1, source2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcmpsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcmpsd-2.c
index 3e4729e4aac..0190722e7f4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcmpsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcmpsd-2.c
@@ -27,7 +27,6 @@ avx512f_test ()
     __m128d source1, source2;
     __mmask8 dst, dst2, mask;
     mask = 1;
-    int i;
 
     CMP(_CMP_EQ_OQ, !isunordered(s1[0], s2[0]) && s1[0] == s2[0]);
     CMP(_CMP_LT_OS, !isunordered(s1[0], s2[0]) && s1[0] < s2[0]);
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcmpss-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcmpss-2.c
index 7343cb05cdb..4a014f1440c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcmpss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcmpss-2.c
@@ -26,7 +26,6 @@ avx512f_test ()
 {
     __m128 source1, source2;
     __mmask8 dst, dst2, mask;
-    int i;
 
     mask = 1;
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcompresspd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcompresspd-2.c
index 4acbadbe729..04553da5f7b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcompresspd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcompresspd-2.c
@@ -23,7 +23,7 @@ CALC (double *s, double *r, MASK_TYPE mask)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s, res1, res2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcompressps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcompressps-2.c
index f996452b091..e934a5f55e0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcompressps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcompressps-2.c
@@ -23,7 +23,7 @@ CALC (float *s, float *r, MASK_TYPE mask)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s, res1, res2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtdq2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtdq2pd-2.c
index 77cdbab0eea..2e4f051a5a3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtdq2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtdq2pd-2.c
@@ -21,7 +21,7 @@ CALC (int *s, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN_HALF, i_d) s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtdq2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtdq2ps-2.c
index 4a3e3aa4baf..ca8e56e4254 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtdq2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtdq2ps-2.c
@@ -20,7 +20,7 @@ CALC (int *s, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2dq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2dq-2.c
index 5ecb640aec5..cdaa182f31b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2dq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2dq-2.c
@@ -11,7 +11,7 @@
 #define DST_SIZE ((AVX512F_LEN_HALF) / 32)
 
 static void
-CALC (double *s, unsigned *r)
+CALC (double *s, int *r)
 {
   int i;
 
@@ -22,7 +22,7 @@ CALC (double *s, unsigned *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2ps-2.c
index fa17ef9aa4c..e79e014e61d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2ps-2.c
@@ -17,7 +17,7 @@ CALC (float *e, UNION_TYPE (AVX512F_LEN, d) s1)
     e[i] = (float) s1.a[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2udq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2udq-2.c
index 24788d97a44..1873cf8e08e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2udq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtpd2udq-2.c
@@ -21,11 +21,11 @@ CALC (double *s, unsigned *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s;
-  UNION_TYPE (AVX512F_LEN_HALF, i_d) res1, res2, res3;
+  UNION_TYPE (AVX512F_LEN_HALF, i_ud) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   unsigned res_ref[DST_SIZE] = { 0 };
   int i;
@@ -44,14 +44,14 @@ TEST (void)
 
   CALC (s.a, res_ref);
 
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SRC_SIZE);
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SRC_SIZE);
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SRC_SIZE);
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SRC_SIZE);
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtph2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtph2ps-2.c
index 725e1e87bb7..ec98f4b3ad5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtph2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtph2ps-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN_HALF, i_w) val;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2dq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2dq-2.c
index a35c2ad02dd..35edd69088f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2dq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2dq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, float *s)
 {
   int i;
@@ -16,7 +17,7 @@ CALC (int *r, float *s)
     r[i] = (s[i] >= 0) ? (int) (s[i] + 0.5) : (int) (s[i] - 0.5);
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2pd-2.c
index 5bed4f33fc9..6dc6d209b67 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2pd-2.c
@@ -21,7 +21,7 @@ CALC (float *s, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN_HALF, ) s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2ph-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2ph-2.c
index 6fe9effd6a0..540bf29a4f9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2ph-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2ph-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) val;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2udq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2udq-2.c
index 7826e2d795c..f97e9f5acd0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2udq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtps2udq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (unsigned *r, float *s)
 {
   int i;
@@ -16,11 +17,11 @@ CALC (unsigned *r, float *s)
     r[i] = (unsigned) (s[i] + 0.5);
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
-  UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3;
+  int i;
+  UNION_TYPE (AVX512F_LEN, i_ud) res1, res2, res3;
   UNION_TYPE (AVX512F_LEN,) src;
   MASK_TYPE mask = MASK_VALUE;
   unsigned res_ref[SIZE];
@@ -37,14 +38,14 @@ TEST (void)
 
   CALC (res_ref, src.a);
 
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttpd2dq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttpd2dq-2.c
index f73c5c3c9f8..cba83ca8df8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttpd2dq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttpd2dq-2.c
@@ -21,7 +21,7 @@ CALC (double *s, int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttpd2udq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttpd2udq-2.c
index a8d3adc8d46..5345589c4f9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttpd2udq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttpd2udq-2.c
@@ -21,11 +21,11 @@ CALC (double *s, unsigned *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s;
-  UNION_TYPE (AVX512F_LEN_HALF, i_d) res1, res2, res3;
+  UNION_TYPE (AVX512F_LEN_HALF, i_ud) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   unsigned res_ref[DST_SIZE] = { 0 };
   int i;
@@ -44,14 +44,14 @@ TEST (void)
 
   CALC (s.a, res_ref);
 
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SRC_SIZE);
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SRC_SIZE);
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SRC_SIZE);
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SRC_SIZE);
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttps2dq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttps2dq-2.c
index f2cb5c708d2..ed8fe5e093d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttps2dq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttps2dq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, float *s)
 {
   int i;
@@ -16,7 +17,7 @@ CALC (int *r, float *s)
     r[i] = (int) s[i];
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttps2udq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttps2udq-2.c
index 2b0212e1c54..e1ab847a54d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttps2udq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttps2udq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (unsigned *r, float *s)
 {
   int i;
@@ -16,11 +17,11 @@ CALC (unsigned *r, float *s)
     r[i] = (unsigned) s[i];
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
-  UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3;
+  int i;
+  UNION_TYPE (AVX512F_LEN, i_ud) res1, res2, res3;
   UNION_TYPE (AVX512F_LEN,) src;
   MASK_TYPE mask = MASK_VALUE;
   unsigned res_ref[SIZE];
@@ -37,14 +38,14 @@ TEST (void)
 
   CALC (res_ref, src.a);
 
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si-1.c
index e813a24a0a1..a5517aefd98 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si-1.c
@@ -5,7 +5,7 @@
 #include <immintrin.h>
 
 volatile __m128d x;
-volatile y;
+volatile int y;
 
 void extern
 avx512f_test (void)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si-2.c
index a447a873421..6584fc860a2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si-2.c
@@ -4,7 +4,6 @@
 
 #include "avx512f-check.h"
 #include "avx512f-mask-type.h"
-#include "avx512f-helper.h"
 
 static int
 __attribute__ ((noinline, unused))
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si-1.c
index 7669a1729a2..32d57cc08aa 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si-1.c
@@ -5,7 +5,7 @@
 #include <immintrin.h>
 
 volatile __m128 x;
-volatile y;
+volatile int y;
 
 void extern
 avx512f_test (void)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si-2.c
index 2aa62c07140..dae96c6e2e9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si-2.c
@@ -4,7 +4,6 @@
 
 #include "avx512f-check.h"
 #include "avx512f-mask-type.h"
-#include "avx512f-helper.h"
 
 static int
 __attribute__ ((noinline, unused))
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtudq2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtudq2pd-2.c
index 814a7b769c2..977141d0c40 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtudq2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtudq2pd-2.c
@@ -21,10 +21,10 @@ CALC (unsigned *s, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
-  UNION_TYPE (AVX512F_LEN_HALF, i_d) s;
+  UNION_TYPE (AVX512F_LEN_HALF, i_ud) s;
   UNION_TYPE (AVX512F_LEN, d) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   double res_ref[DST_SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtudq2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtudq2ps-2.c
index c43df063abc..28c174ee8ef 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtudq2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtudq2ps-2.c
@@ -20,10 +20,10 @@ CALC (unsigned *s, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
-  UNION_TYPE (AVX512F_LEN, i_d) s;
+  UNION_TYPE (AVX512F_LEN, i_ud) s;
   UNION_TYPE (AVX512F_LEN, ) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   float res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vdivpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vdivpd-2.c
index 761ee20f898..397aa41ecd2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vdivpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vdivpd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s1, double *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s1, double *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vdivps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vdivps-2.c
index f5a7b78f7a4..ce591af85d7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vdivps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vdivps-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s1, float *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s1, float *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vexpandpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vexpandpd-2.c
index 373c17df161..9c0589a2900 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vexpandpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vexpandpd-2.c
@@ -21,7 +21,7 @@ CALC (double *s, double *r, MASK_TYPE mask)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, res2, res3, res4, res5;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vexpandps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vexpandps-2.c
index 7143c8ae238..7b6a5404f6d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vexpandps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vexpandps-2.c
@@ -21,7 +21,7 @@ CALC (float *s, float *r, MASK_TYPE mask)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s1, res2, res3, res4, res5;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vextractf32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vextractf32x4-2.c
index 35377b4302a..39d463d9697 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vextractf32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vextractf32x4-2.c
@@ -10,14 +10,14 @@
 #include "avx512f-mask-type.h"
 #include "string.h"
 
-void
+static void
 CALC (UNION_TYPE (AVX512F_LEN,) s1, float *res_ref, int mask)
 {
   memset (res_ref, 0, 16);
   memcpy (res_ref, s1.a + mask * 4, 16);
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) s1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vextracti32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vextracti32x4-2.c
index 1ea77b03422..b51b6ce24e8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vextracti32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vextracti32x4-2.c
@@ -10,14 +10,14 @@
 #include "avx512f-mask-type.h"
 #include "string.h"
 
-void
+static void
 CALC (UNION_TYPE (AVX512F_LEN, i_d) s1, int *res_ref, int mask)
 {
   memset (res_ref, 0, 16);
   memcpy (res_ref, s1.a + mask * 4, 16);
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmpd-2.c
index d4ddd32145b..3f338b9e90d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmpd-2.c
@@ -70,10 +70,10 @@ CALC (double *r, double src, long long tbl)
     }
 }
 
-void static
+void
 TEST (void)
 {
-  int i, j, k;
+  int i, j;
   UNION_TYPE (AVX512F_LEN, d) res1, res2, res3, s1;
   UNION_TYPE (AVX512F_LEN, i_q) s2;
   double res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmps-2.c
index 6c2539d0f4e..bc334ff3b05 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmps-2.c
@@ -71,10 +71,10 @@ CALC (float *r, float src, int tbl)
 }
 
 
-void static
+void
 TEST (void)
 {
-  int i, j, k;
+  int i, j;
   UNION_TYPE (AVX512F_LEN,) res1, res2, res3, s1;
   UNION_TYPE (AVX512F_LEN, i_d) s2;
   float res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmsd-2.c
index 1344c7fd1bc..a0139da00e4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmsd-2.c
@@ -67,13 +67,13 @@ compute_fixupimmpd (double *r, double src, long long tbl)
     }
 }
 
-void static
+void
 avx512f_test (void)
 {
   union128d s1, res1, res2, res3;
   union128i_q s2;
   double res_ref[2];
-  int i, j, k;
+  int i, j;
 
   float vals[2] = { -10, 10 };
   int controls[10] = { 0x11111111,
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmss-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmss-2.c
index 25e165ff51d..692d15ec929 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfixupimmss-2.c
@@ -67,7 +67,7 @@ compute_fixupimmps (float *r, float src, int tbl)
     }
 }
 
-void static
+void
 avx512f_test (void)
 {
   union128 s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfmaddXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfmaddXXXpd-2.c
index 79736300869..165cd7260ae 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfmaddXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfmaddXXXpd-2.c
@@ -20,7 +20,7 @@ CALC (double *s1, double *s2, double *s3, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfmaddXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfmaddXXXps-2.c
index 6883b77d7fb..5e6647d0d53 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfmaddXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfmaddXXXps-2.c
@@ -20,7 +20,7 @@ CALC (float *s1, float *s2, float *s3, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfmaddsubXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfmaddsubXXXpd-2.c
index c546520335f..a243e6c2df9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfmaddsubXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfmaddsubXXXpd-2.c
@@ -23,7 +23,7 @@ CALC (double *s1, double *s2, double *s3, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfmaddsubXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfmaddsubXXXps-2.c
index 2e27ffb46be..4cafccc45c5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfmaddsubXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfmaddsubXXXps-2.c
@@ -23,7 +23,7 @@ CALC (float *s1, float *s2, float *s3, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfmsubXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfmsubXXXpd-2.c
index caebada6d18..1cd0ae0d813 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfmsubXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfmsubXXXpd-2.c
@@ -20,7 +20,7 @@ CALC (double *s1, double *s2, double *s3, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfmsubXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfmsubXXXps-2.c
index da8908f33ca..5952f9d14ee 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfmsubXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfmsubXXXps-2.c
@@ -20,7 +20,7 @@ CALC (float *s1, float *s2, float *s3, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfmsubaddXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfmsubaddXXXpd-2.c
index 537948b1c4b..e32eec829c5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfmsubaddXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfmsubaddXXXpd-2.c
@@ -23,7 +23,7 @@ CALC (double *s1, double *s2, double *s3, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfmsubaddXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfmsubaddXXXps-2.c
index 85be77ccb12..3971c4ed602 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfmsubaddXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfmsubaddXXXps-2.c
@@ -23,7 +23,7 @@ CALC (float *s1, float *s2, float *s3, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfnmaddXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfnmaddXXXpd-2.c
index 71939a5628b..a1d694aea89 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfnmaddXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfnmaddXXXpd-2.c
@@ -20,7 +20,7 @@ CALC (double *s1, double *s2, double *s3, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfnmaddXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfnmaddXXXps-2.c
index b591d23aaa9..3f8785d11ae 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfnmaddXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfnmaddXXXps-2.c
@@ -20,7 +20,7 @@ CALC (float *s1, float *s2, float *s3, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfnmsubXXXpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfnmsubXXXpd-2.c
index 177ea73062a..bf935016010 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfnmsubXXXpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfnmsubXXXpd-2.c
@@ -20,7 +20,7 @@ CALC (double *s1, double *s2, double *s3, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vfnmsubXXXps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vfnmsubXXXps-2.c
index 379708b464a..e2831c43582 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vfnmsubXXXps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vfnmsubXXXps-2.c
@@ -20,7 +20,7 @@ CALC (float *s1, float *s2, float *s3, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s1, s2, s3, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vgetexppd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vgetexppd-2.c
index ec9321aa894..96740e8a47b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vgetexppd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vgetexppd-2.c
@@ -18,13 +18,12 @@ CALC (double *s, double *r)
     r[i] = floor (log (s[i]) / log (2));
 }
 
-void static
+void
 TEST (void)
 {
   int j;
   UNION_TYPE (AVX512F_LEN, d) res1, res2, res3, s;
   double res_ref[SIZE];
-  double res_ref_mask[SIZE];
 
   MASK_TYPE mask = MASK_VALUE;
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vgetexpps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vgetexpps-2.c
index 56f4eaa15fe..6bce4166957 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vgetexpps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vgetexpps-2.c
@@ -18,13 +18,12 @@ CALC (float *s, float *r)
     r[i] = floor (log (s[i]) / log (2));
 }
 
-void static
+void
 TEST (void)
 {
   int j;
   UNION_TYPE (AVX512F_LEN, ) res1,res2,res3,s;
   float res_ref[SIZE];
-  float res_ref_mask[SIZE];
 
   MASK_TYPE mask = MASK_VALUE;
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vgetexpsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vgetexpsd-2.c
index c1e5e5f2202..4f7c94db9ae 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vgetexpsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vgetexpsd-2.c
@@ -6,7 +6,6 @@
 
 #include <math.h>
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 static void
 compute_vgetexpsd (double *s, double *r)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vgetexpss-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vgetexpss-2.c
index 39d77c7a026..926f4d87ffb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vgetexpss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vgetexpss-2.c
@@ -6,7 +6,6 @@
 
 #include <math.h>
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 static void
 compute_vgetexpss (float *s, float *r)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vgetmantpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vgetmantpd-2.c
index 0209021b8b1..cb24b97f159 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vgetmantpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vgetmantpd-2.c
@@ -83,7 +83,7 @@ CALC (double *r, double *s, int interv, int signctrl)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vgetmantps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vgetmantps-2.c
index 25e41d18217..480dd743b51 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vgetmantps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vgetmantps-2.c
@@ -84,7 +84,7 @@ CALC (float *r, float *s, int interv, int signctrl)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vgetmantsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vgetmantsd-2.c
index 563d3cc221c..3a34ca4f05d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vgetmantsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vgetmantsd-2.c
@@ -4,7 +4,6 @@
 /* { dg-require-effective-target c99_runtime } */
 
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 #include <math.h>
 
 union fp_int_t
@@ -77,7 +76,6 @@ compute_vgetmantsd (double *r, double *s1, double *s2, int interv,
 static void
 avx512f_test (void)
 {
-  int i, sign;
   union128d res1, src1, src2;
   double res_ref[2];
   int interv = _MM_MANT_NORM_p5_1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vgetmantss-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vgetmantss-2.c
index 3ffab4ee155..7c30ea7d8e6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vgetmantss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vgetmantss-2.c
@@ -4,7 +4,6 @@
 /* { dg-require-effective-target c99_runtime } */
 
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 #include <math.h>
 
 union fp_int_t
@@ -82,7 +81,6 @@ compute_vgetmantss (float *r, float *s1, float *s2, int interv,
 static void
 avx512f_test (void)
 {
-  int i, sign;
   union128 res1, src1, src2;
   float res_ref[4];
   int interv = _MM_MANT_NORM_p5_1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vinsertf32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vinsertf32x4-2.c
index 9231163c327..2a6c51a905d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vinsertf32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vinsertf32x4-2.c
@@ -17,7 +17,7 @@ CALC (UNION_TYPE (AVX512F_LEN,) s1, union128 s2, float *res_ref, int imm)
   memcpy (res_ref + imm * 4, s2.a, 16);
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vinserti32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vinserti32x4-2.c
index c0cce565b4b..0140f04511a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vinserti32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vinserti32x4-2.c
@@ -17,7 +17,7 @@ CALC (UNION_TYPE (AVX512F_LEN, i_d) s1, union128i_d s2, int *res_ref, int imm)
   memcpy (res_ref + imm * 4, s2.a, 16);
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmaxpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmaxpd-2.c
index 70f60a9688e..334f0edbc75 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmaxpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmaxpd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s1, double *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s1, double *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmaxps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmaxps-2.c
index fc92eaa3aaa..01f8ed0b9c2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmaxps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmaxps-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s1, float *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s1, float *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vminpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vminpd-2.c
index cfb355539e3..9a13129a1e4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vminpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vminpd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s1, double *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s1, double *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vminps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vminps-2.c
index f619b12fe58..d63c3d3dfb4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vminps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vminps-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s1, float *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s1, float *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovapd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovapd-2.c
index 5e720ae8292..f2116ca2d23 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovapd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovapd-2.c
@@ -10,7 +10,7 @@
 #include "avx512f-mask-type.h"
 #define ALIGN ((AVX512F_LEN) / 8)
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s2, s3, res1, res3, res4, res5, res6;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovaps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovaps-2.c
index d92ec968b63..74be618840f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovaps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovaps-2.c
@@ -10,7 +10,7 @@
 #include "avx512f-mask-type.h"
 #define ALIGN ((AVX512F_LEN) / 8)
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s2, s3, res1, res3, res4, res5, res6;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovddup-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovddup-2.c
index 57619c1429b..b789bc179c7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovddup-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovddup-2.c
@@ -21,7 +21,7 @@ CALC (double *s, double *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovdqa32-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovdqa32-2.c
index 685b58b60b4..91a0350908e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovdqa32-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovdqa32-2.c
@@ -10,7 +10,7 @@
 #include "avx512f-mask-type.h"
 #define ALIGN ((AVX512F_LEN) / 8)
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s2, s3, res1, res2, res5, res6, res7, res8;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovdqa64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovdqa64-2.c
index d5f51f2d13a..2a7136fb193 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovdqa64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovdqa64-2.c
@@ -10,7 +10,7 @@
 #include "avx512f-mask-type.h"
 #define ALIGN ((AVX512F_LEN) / 8)
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s2, s3, res1, res3, res4, res5, res6;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovdqu32-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovdqu32-2.c
index f1ae73c1d82..f2edc3dff7b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovdqu32-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovdqu32-2.c
@@ -15,7 +15,7 @@ typedef struct
   int a[SIZE];
 } __attribute__ ((packed)) EVAL(unaligned_array, AVX512F_LEN,);
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s2, res1, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovdqu64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovdqu64-2.c
index 867a2517d54..14176965ace 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovdqu64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovdqu64-2.c
@@ -15,7 +15,7 @@ typedef struct
   long long a[SIZE];
 } __attribute__ ((packed)) EVAL(unaligned_array, AVX512F_LEN,);
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s2, res1, res2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovshdup-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovshdup-2.c
index 1cd8a6b9e99..e2f06a5d7de 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovshdup-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovshdup-2.c
@@ -20,7 +20,7 @@ CALC (float *s, float *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovsldup-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovsldup-2.c
index 032fec82e31..2b91467aee1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovsldup-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovsldup-2.c
@@ -20,7 +20,7 @@ CALC (float *s, float *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovupd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovupd-2.c
index 7e76e29b751..bf602f52d36 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovupd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovupd-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) res1, res2, res3, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmovups-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmovups-2.c
index 7225bda54e2..a937fd136b8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmovups-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmovups-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) res1, res2, res3, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmulpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmulpd-2.c
index bfd2a51559b..08bfe04ac53 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmulpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmulpd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s1, double *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s1, double *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vmulps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vmulps-2.c
index 09bb29967af..ec61ae72e06 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vmulps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vmulps-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s1, float *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s1, float *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpabsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpabsd-2.c
index 124e2e1a938..533bd7876ad 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpabsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpabsd-2.c
@@ -21,7 +21,7 @@ CALC (int *i1, int *r)
       r[i] = i1[i];
 }
 
-static void
+void
 TEST (void)
 {
   int ck[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpabsq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpabsq-2.c
index ff906f6d41d..2918eb9ccca 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpabsq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpabsq-2.c
@@ -21,7 +21,7 @@ CALC (long long *i1, long long *r)
       r[i] = i1[i];
 }
 
-static void
+void
 TEST (void)
 {
   long long ck[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpaddd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpaddd-2.c
index 8aff11eb952..243c2b70b8b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpaddd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpaddd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, int *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (int *r, int *s1, int *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpaddq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpaddq-2.c
index a9d31715229..d35c60ec734 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpaddq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpaddq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (long long *r, long long *s1, long long *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpandd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpandd-2.c
index b422c9d5dbd..b5654d2fe8c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpandd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpandd-2.c
@@ -18,7 +18,7 @@ CALC (int *s1, int *s2, int *r)
     r[i] = s1[i] & s2[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, s2, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpandnd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpandnd-2.c
index f1b12b6e6b0..418b96e6edf 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpandnd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpandnd-2.c
@@ -18,7 +18,7 @@ CALC (int *s1, int *s2, int *r)
     r[i] = (~s1[i]) & s2[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, s2, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpandnq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpandnq-2.c
index d03bd0692f2..585d2885991 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpandnq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpandnq-2.c
@@ -18,7 +18,7 @@ CALC (long long *s1, long long *s2, long long *r)
     r[i] = (~s1[i]) & s2[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpandq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpandq-2.c
index 86ab76ba890..b2f39456449 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpandq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpandq-2.c
@@ -18,7 +18,7 @@ CALC (long long *s1, long long *s2, long long *r)
     r[i] = s1[i] & s2[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpblendmd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpblendmd-2.c
index c2670fbf9cf..04a586bfee9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpblendmd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpblendmd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, int *s2, MASK_TYPE mask)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (int *r, int *s1, int *s2, MASK_TYPE mask)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpblendmq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpblendmq-2.c
index 1fc8a5b5710..cd85676142d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpblendmq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpblendmq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long *s2, MASK_TYPE mask)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (long long *r, long long *s1, long long *s2, MASK_TYPE mask)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastd-2.c
index 67bd3ac2d38..895c99a97cb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (int *r, int *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-2.c
index 4518f6ef4fb..cbd9d7b85d4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (long long *r, long long *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpd-2.c
index 600dfd2c0ca..3a2dccfd4bd 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpd-2.c
@@ -25,7 +25,7 @@
     if ((mask & dst_ref) != dst2) abort();
 #endif
 
-static void
+void
 TEST ()
 {
     UNION_TYPE (AVX512F_LEN, i_d) source1, source2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpeqd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpeqd-2.c
index 9a4c493aa6d..42089f81997 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpeqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpeqd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpeqq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpeqq-2.c
index 8c269eeb10c..7f2ea5787b3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpeqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpeqq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpged-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpged-2.c
index 988587810bd..f2e78128158 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpged-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpged-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2;
   MASK_TYPE res_ref, res1;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeq-2.c
index dfff1dc3484..b77798a3512 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2;
   MASK_TYPE res1, res_ref;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeud-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeud-2.c
index 7bb36678397..ed739347cee 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeud-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2;
   MASK_TYPE res_ref, res1;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeuq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeuq-2.c
index 78cae6941ca..a4ae995dbc1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgeuq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2;
   MASK_TYPE res1, res_ref;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgtd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgtd-2.c
index 6c824360519..87146dd36b4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgtd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgtd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgtq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgtq-2.c
index c1eb5801b2b..39dfd76d3d1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgtq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpgtq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpled-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpled-2.c
index 15573766c31..1def42156d5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpled-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpled-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2;
   MASK_TYPE res_ref, res1;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleq-2.c
index 5fdf9d75203..9ed536def82 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2;
   MASK_TYPE res1, res_ref;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleud-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleud-2.c
index 22c825a09b5..56dcc81a829 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleud-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2;
   MASK_TYPE res_ref, res1;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleuq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleuq-2.c
index e7843d1e4fe..d0c3587b543 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpleuq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2;
   MASK_TYPE res1, res_ref;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltd-2.c
index f8728cd0db1..f0033f60902 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2;
   MASK_TYPE res_ref, res1;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltq-2.c
index 204b69e5753..f4e68cff7f6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2;
   MASK_TYPE res1, res_ref;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltud-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltud-2.c
index aea70ec84c6..5168e564604 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltud-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2;
   MASK_TYPE res_ref, res1;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltuq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltuq-2.c
index 83becbd6f3d..df813d53378 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpltuq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2;
   MASK_TYPE res1, res_ref;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpneqd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpneqd-2.c
index fd9bfc5aa4a..0655779af11 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpneqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpneqd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2;
   MASK_TYPE res_ref, res1;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpneqq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpneqq-2.c
index 1beacd44901..69685843f7a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpneqq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpneqq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2;
   MASK_TYPE res1, res_ref;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpnequd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpnequd-2.c
index 09d11f52ca8..3ca100bc2af 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpnequd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpnequd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, int *s1, int *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, int *s1, int *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2;
   MASK_TYPE res_ref, res1;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpnequq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpnequq-2.c
index 41e1f5b63a3..b3298068cb1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpnequq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpnequq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,13 +21,12 @@ CALC (MASK_TYPE *r, long long *s1, long long *s2)
       *r = *r | (one << i);
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2;
   MASK_TYPE res1, res_ref;
-  MASK_TYPE mask = MASK_VALUE;
   res1 = 0;
 
   for (i = 0; i < SIZE / 2; i++)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpq-2.c
index 2a9ceb6a9f0..7c9b888b255 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpq-2.c
@@ -25,7 +25,7 @@ __mmask8 dst_ref;
     if (dst_ref != dst1) abort();			\
     if ((mask & dst_ref) != dst2) abort();
 
-static void
+void
 TEST ()
 {
     UNION_TYPE (AVX512F_LEN, i_d) source1, source2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpud-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpud-2.c
index c0bb97839f2..7a1ed898271 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpud-2.c
@@ -25,7 +25,7 @@
     if ((mask & dst_ref) != dst2) abort();
 #endif
 
-static void
+void
 TEST ()
 {
     unsigned int s1[16] = {2134,  6678,  453, 54646,
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpuq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpuq-2.c
index 3bd1b865623..f8db6c643a9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcmpuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcmpuq-2.c
@@ -25,7 +25,7 @@
     if ((mask & dst_ref) != dst2) abort();
 #endif
 
-static void
+void
 TEST ()
 {
     UNION_TYPE (AVX512F_LEN, i_q) source1, source2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcompressd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcompressd-2.c
index 2c1e3f586d8..ce06b33c2de 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcompressd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcompressd-2.c
@@ -23,7 +23,7 @@ CALC (int *s, int *r, MASK_TYPE mask)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s, res1, res2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpcompressq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpcompressq-2.c
index 0ea69f0ab77..ebec2417519 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpcompressq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpcompressq-2.c
@@ -23,7 +23,7 @@ CALC (long long *s, long long *r, MASK_TYPE mask)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s, res1, res2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermd-2.c
index 1c494e3d1d5..1b2ce756abb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermd-2.c
@@ -21,7 +21,7 @@ CALC (int *mask, int *src1, int *dst)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3, src1, src2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermi2d-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermi2d-2.c
index 9aa104bbf5d..1c4a80d4ec5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermi2d-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermi2d-2.c
@@ -25,7 +25,7 @@ CALC (int *dst, int *src1, int *ind, int *src2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermi2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermi2pd-2.c
index a2daca0bd55..af73a172c2b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermi2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermi2pd-2.c
@@ -25,7 +25,7 @@ CALC (double *dst, double *src1, long long *ind, double *src2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, k;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermi2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermi2ps-2.c
index 56215cfca14..aa6fbb10a17 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermi2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermi2ps-2.c
@@ -25,7 +25,7 @@ CALC (float *dst, float *src1, int *ind, float *src2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, k;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermi2q-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermi2q-2.c
index 9d7b9bec3f3..c1adb13a2a9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermi2q-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermi2q-2.c
@@ -25,7 +25,7 @@ CALC (long long *dst, long long *src1, long long *ind, long long *src2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermilpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermilpd-2.c
index 27d697bd846..800c7f358f5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermilpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermilpd-2.c
@@ -25,7 +25,7 @@ CALC (double *s1, long long *s2, double *r)
     r[i] = s1[(2 * (i / 2)) + ((s2[i] & 0x02) >> 1)];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermilpdi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermilpdi-2.c
index 9b5ecd4c6c5..26f5a775c73 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermilpdi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermilpdi-2.c
@@ -24,7 +24,7 @@ CALC (double *s1, int s2, double *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermilps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermilps-2.c
index 92c65538d10..fc1ded7b4b6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermilps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermilps-2.c
@@ -25,7 +25,7 @@ CALC (float *s1, int *s2, float *r)
     r[i] = s1[(4 * (i / 4)) + (s2[i] & 0x03)];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermilpsi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermilpsi-2.c
index 381a794b4ed..986dbd17aa2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermilpsi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermilpsi-2.c
@@ -49,7 +49,7 @@ CALC (float *s, float *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermpd-2.c
index 00d171b790d..1007aef9b15 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermpd-2.c
@@ -20,7 +20,7 @@ CALC (long long *mask, double *s1, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) src1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermpdi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermpdi-2.c
index eb8e583812f..d979828a632 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermpdi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermpdi-2.c
@@ -24,7 +24,7 @@ CALC (double *s1, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) src1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermps-2.c
index 53081c48e9c..ce95fc31568 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermps-2.c
@@ -20,7 +20,7 @@ CALC (int *mask, float *s1, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) src1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermq-imm-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermq-imm-2.c
index 6b1d778c6fd..dd88cd46c0b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermq-imm-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermq-imm-2.c
@@ -25,7 +25,7 @@ CALC (long long *src1, int mask, long long *dst)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3, src1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermq-var-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermq-var-2.c
index ff330a571b7..b7c36a5f141 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermq-var-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermq-var-2.c
@@ -21,7 +21,7 @@ CALC (long long *mask, long long *src1, long long *dst)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3, src1, src2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermt2d-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermt2d-2.c
index ef8d1951b6d..f9bd6b5e594 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermt2d-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermt2d-2.c
@@ -25,7 +25,7 @@ CALC (int *dst, int *src1, int *ind, int *src2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermt2pd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermt2pd-2.c
index 511a47015f9..4a72aa4773e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermt2pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermt2pd-2.c
@@ -25,7 +25,7 @@ CALC (double *dst, double *src1, long long *ind, double *src2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermt2ps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermt2ps-2.c
index cd35d1237ae..0c35df14d83 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermt2ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermt2ps-2.c
@@ -25,7 +25,7 @@ CALC (float *dst, float *src1, int *ind, float *src2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpermt2q-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpermt2q-2.c
index 5f449adec2e..c3872909351 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpermt2q-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpermt2q-2.c
@@ -25,7 +25,7 @@ CALC (long long *dst, long long *src1, long long *ind, long long *src2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpexpandd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpexpandd-2.c
index 31b3b5a05ee..7fb0590f7fc 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpexpandd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpexpandd-2.c
@@ -21,7 +21,7 @@ CALC (int *s, int *r, MASK_TYPE mask)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpexpandq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpexpandq-2.c
index f72799c574e..c346382bae2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpexpandq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpexpandq-2.c
@@ -21,7 +21,7 @@ CALC (long long *s, long long *r, MASK_TYPE mask)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmaxsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmaxsd-2.c
index 78c5511a37a..765ce6215ba 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmaxsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmaxsd-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-
+void static
 CALC (int *src1, int *src2, int *dst)
 {
   int i;
@@ -18,10 +18,10 @@ CALC (int *src1, int *src2, int *dst)
     dst[i] = src1[i] > src2[i] ? src1[i] : src2[i];
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
+  int i, sign = 1;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2, res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   int res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmaxsq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmaxsq-2.c
index 10bcd8230f6..4c2993f7201 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmaxsq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmaxsq-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
-
+void static
 CALC (long long *src1, long long *src2, long long *dst)
 {
   int i;
@@ -18,10 +18,10 @@ CALC (long long *src1, long long *src2, long long *dst)
     dst[i] = src1[i] > src2[i] ? src1[i] : src2[i];
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
+  int i, sign = 1;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2, res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   long long res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmaxud-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmaxud-2.c
index b014be8627f..860539403c6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmaxud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmaxud-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-
+static void
 CALC (unsigned *src1, unsigned *src2,
       unsigned *dst)
 {
@@ -19,14 +19,13 @@ CALC (unsigned *src1, unsigned *src2,
     dst[i] = src1[i] > src2[i] ? src1[i] : src2[i];
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_d) src1, src2, res1, res2, res3;
+  UNION_TYPE (AVX512F_LEN, i_ud) src1, src2, res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   unsigned res_ref[SIZE];
-
   for (i = 0; i < SIZE; i++)
     {
       src1.a[i] =  i;
@@ -40,14 +39,14 @@ TEST (void)
 
   CALC (src1.a, src2.a, res_ref);
 
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmaxuq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmaxuq-2.c
index e2daacd3983..fbd42de2c23 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmaxuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmaxuq-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
-
+static void
 CALC (unsigned long long *src1, unsigned long long *src2,
     unsigned long long *dst)
 {
@@ -19,11 +19,11 @@ CALC (unsigned long long *src1, unsigned long long *src2,
     dst[i] = src1[i] > src2[i] ? src1[i] : src2[i];
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_q) src1, src2, res1, res2, res3;
+  UNION_TYPE (AVX512F_LEN, i_uq) src1, src2, res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   unsigned long long res_ref[SIZE];
 
@@ -40,14 +40,14 @@ TEST (void)
 
   CALC (src1.a, src2.a, res_ref);
 
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res2, res_ref))
+  MASK_MERGE (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res3, res_ref))
+  MASK_ZERO (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpminsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpminsd-2.c
index 1a6b82bfdd4..1f8ec1dd337 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpminsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpminsd-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-
+void static
 CALC (int *src1, int *src2, int *dst)
 {
   int i;
@@ -18,10 +18,10 @@ CALC (int *src1, int *src2, int *dst)
     dst[i] = src1[i] < src2[i] ? src1[i] : src2[i];
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
+  int i, sign = 1;
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2, res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   int res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpminsq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpminsq-2.c
index f646489ad44..519873f9d12 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpminsq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpminsq-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
-
+void static
 CALC (long long *src1, long long *src2, long long *dst)
 {
   int i;
@@ -18,10 +18,10 @@ CALC (long long *src1, long long *src2, long long *dst)
     dst[i] = src1[i] < src2[i] ? src1[i] : src2[i];
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
+  int i, sign = 1;
   UNION_TYPE (AVX512F_LEN, i_q) src1, src2, res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   long long res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpminud-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpminud-2.c
index 17aac43a5ad..d66df8ad856 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpminud-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpminud-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-
+static void
 CALC (unsigned *src1, unsigned *src2,
       unsigned *dst)
 {
@@ -19,11 +19,11 @@ CALC (unsigned *src1, unsigned *src2,
     dst[i] = src1[i] < src2[i] ? src1[i] : src2[i];
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_d) src1, src2, res1, res2, res3;
+  UNION_TYPE (AVX512F_LEN, i_ud) src1, src2, res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   unsigned res_ref[SIZE];
 
@@ -40,14 +40,14 @@ TEST (void)
 
   CALC (src1.a, src2.a, res_ref);
 
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpminuq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpminuq-2.c
index 4c27977ace8..34d0723be97 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpminuq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpminuq-2.c
@@ -9,7 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
-
+static void
 CALC (unsigned long long *src1, unsigned long long *src2,
     unsigned long long *dst)
 {
@@ -19,11 +19,11 @@ CALC (unsigned long long *src1, unsigned long long *src2,
     dst[i] = src1[i] < src2[i] ? src1[i] : src2[i];
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_q) src1, src2, res1, res2, res3;
+  UNION_TYPE (AVX512F_LEN, i_uq) src1, src2, res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   unsigned long long res_ref[SIZE];
 
@@ -40,14 +40,14 @@ TEST (void)
 
   CALC (src1.a, src2.a, res_ref);
 
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res2, res_ref))
+  MASK_MERGE (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res3, res_ref))
+  MASK_ZERO (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovdb-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovdb-2.c
index cc63f481654..0e418f98ed2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovdb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovdb-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (char *r, int *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (char *r, int *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovdw-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovdw-2.c
index 43fe8cb163a..376c105c0b2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovdw-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #define SIZE_HALF (AVX512F_LEN_HALF / 16)
 
+void static
 CALC (short *r, int *s)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (short *r, int *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovqb-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovqb-2.c
index 1b0fbbb3d05..892ad74e0d1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovqb-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (char *r, long long *s, int mem)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (char *r, long long *s, int mem)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovqd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovqd-2.c
index db5054b9323..57170faf8f8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovqd-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #define SIZE_HALF (AVX512F_LEN_HALF / 32)
 
+void static
 CALC (int *r, long long *s)
 {
   int i;
@@ -19,11 +20,11 @@ CALC (int *r, long long *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
-  UNION_TYPE (AVX512F_LEN_HALF, i_d) res1, res2, res3, res5;
+  UNION_TYPE (AVX512F_LEN_HALF, i_d) res1, res2, res3;
   int res4[SIZE_HALF];
   UNION_TYPE (AVX512F_LEN, i_q) src;
   MASK_TYPE mask = MASK_VALUE;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovqw-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovqw-2.c
index 9bdd6e10d6f..27b816511da 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovqw-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (short *r, long long *s)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (short *r, long long *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsdb-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsdb-2.c
index 4ac69b51717..116c8b69e71 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsdb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsdb-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #include <limits.h>
 
+static void
 CALC (char *r, int *s)
 {
   int i;
@@ -25,7 +26,7 @@ CALC (char *r, int *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsdw-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsdw-2.c
index 98d8745d9fe..e175cce1c48 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsdw-2.c
@@ -11,6 +11,7 @@
 #define SIZE_HALF (AVX512F_LEN_HALF / 16)
 #include <limits.h>
 
+static void
 CALC (short *r, int *s)
 {
   int i;
@@ -26,7 +27,7 @@ CALC (short *r, int *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqb-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqb-2.c
index 0fb7883de05..babe6e22b99 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqb-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #include <limits.h>
 
+void static
 CALC (char *r, long long *s, int mem)
 {
   int i;
@@ -26,7 +27,7 @@ CALC (char *r, long long *s, int mem)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqd-2.c
index 3230528a3b0..342f9cb76b5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqd-2.c
@@ -11,6 +11,7 @@
 #define SIZE_HALF (AVX512F_LEN_HALF / 32)
 #include <limits.h>
 
+static void
 CALC (int *r, long long *s)
 {
   int i;
@@ -26,7 +27,7 @@ CALC (int *r, long long *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqw-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqw-2.c
index 25e54a73dee..bc1619a8308 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsqw-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #include <limits.h>
 
+void static
 CALC (short *r, long long *s)
 {
   int i;
@@ -25,7 +26,7 @@ CALC (short *r, long long *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxbd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxbd-2.c
index 3bfb6ab75f9..2e8e2cbeea4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxbd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxbd-2.c
@@ -20,7 +20,7 @@ CALC (char *s, int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   union128i_b s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxbq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxbq-2.c
index 540d21819a6..18b6c1b4f56 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxbq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxbq-2.c
@@ -20,7 +20,7 @@ CALC (char *s, long long int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   union128i_b s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxdq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxdq-2.c
index f1e131e00ae..aaa94223aae 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxdq-2.c
@@ -20,7 +20,7 @@ CALC (int *s, long long int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN_HALF, i_d) s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxwd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxwd-2.c
index 04b43a6e83a..56aa43da1e0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxwd-2.c
@@ -20,7 +20,7 @@ CALC (short *s, int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN_HALF, i_w) s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxwq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxwq-2.c
index 9e6832d86de..c77607bd466 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxwq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovsxwq-2.c
@@ -20,7 +20,7 @@ CALC (short *s, long long int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   union128i_w s;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusdb-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusdb-2.c
index f13bb95b3d8..8907a72f3ea 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusdb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusdb-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #include <limits.h>
 
+static void
 CALC (unsigned char *r, unsigned int *s)
 {
   int i;
@@ -20,13 +21,13 @@ CALC (unsigned char *r, unsigned int *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
-  UNION_TYPE (128, i_b) res1, res2, res3;
+  int i;
+  UNION_TYPE (128, i_ub) res1, res2, res3;
   unsigned char res4[16];
-  UNION_TYPE (AVX512F_LEN, i_d) src;
+  UNION_TYPE (AVX512F_LEN, i_ud) src;
   MASK_TYPE mask = MASK_VALUE;
   unsigned char res_ref[16];
 
@@ -44,17 +45,17 @@ TEST (void)
 
   CALC (res_ref, src.a);
 
-  if (UNION_CHECK (128, i_b) (res1, res_ref))
+  if (UNION_CHECK (128, i_ub) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_b) (res_ref, mask, SIZE);
-  if (UNION_CHECK (128, i_b) (res2, res_ref))
+  MASK_MERGE (i_ub) (res_ref, mask, SIZE);
+  if (UNION_CHECK (128, i_ub) (res2, res_ref))
     abort ();
 
-  if (checkVc (res4, res_ref, 16))
+  if (checkVuc (res4, res_ref, 16))
     abort ();
 
-  MASK_ZERO (i_b) (res_ref, mask, SIZE);
-  if (UNION_CHECK (128, i_b) (res3, res_ref))
+  MASK_ZERO (i_ub) (res_ref, mask, SIZE);
+  if (UNION_CHECK (128, i_ub) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusdw-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusdw-2.c
index c33a10b7115..c2c2624b498 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusdw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusdw-2.c
@@ -11,6 +11,7 @@
 #define SIZE_HALF (AVX512F_LEN_HALF / 16)
 #include <limits.h>
 
+static void
 CALC (unsigned short *r, unsigned int *s)
 {
   int i;
@@ -21,13 +22,13 @@ CALC (unsigned short *r, unsigned int *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
-  UNION_TYPE (AVX512F_LEN_HALF, i_w) res1, res2, res3;
+  int i;
+  UNION_TYPE (AVX512F_LEN_HALF, i_uw) res1, res2, res3;
   unsigned short res4[SIZE_HALF];
-  UNION_TYPE (AVX512F_LEN, i_d) src;
+  UNION_TYPE (AVX512F_LEN, i_ud) src;
   MASK_TYPE mask = MASK_VALUE;
   unsigned short res_ref[SIZE_HALF];
 
@@ -45,17 +46,17 @@ TEST (void)
 
   CALC (res_ref, src.a);
 
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_w) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_uw) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_w) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_w) (res2, res_ref))
+  MASK_MERGE (i_uw) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_uw) (res2, res_ref))
     abort ();
 
-  if (checkVs (res4, res_ref, SIZE_HALF))
+  if (checkVus (res4, res_ref, SIZE_HALF))
     abort ();
 
-  MASK_ZERO (i_w) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_w) (res3, res_ref))
+  MASK_ZERO (i_uw) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_uw) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqb-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqb-2.c
index 43fb9d275cc..8c20544524b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqb-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqb-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #include <limits.h>
 
+static void
 CALC (unsigned char *r, unsigned long long *s, int mem)
 {
   int i;
@@ -21,13 +22,13 @@ CALC (unsigned char *r, unsigned long long *s, int mem)
     }
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
-  UNION_TYPE (128, i_b) res1, res2, res3;
+  int i;
+  UNION_TYPE (128, i_ub) res1, res2, res3;
   unsigned char res4[16];
-  UNION_TYPE (AVX512F_LEN, i_q) src;
+  UNION_TYPE (AVX512F_LEN, i_uq) src;
   MASK_TYPE mask = MASK_VALUE;
   unsigned char res_ref[16];
   unsigned char res_ref2[16];
@@ -51,23 +52,23 @@ TEST (void)
 
   CALC (res_ref, src.a, 0);
 
-  if (UNION_CHECK (128, i_b) (res1, res_ref))
+  if (UNION_CHECK (128, i_ub) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_b) (res_ref, mask, SIZE);
-  if (UNION_CHECK (128, i_b) (res2, res_ref))
+  MASK_MERGE (i_ub) (res_ref, mask, SIZE);
+  if (UNION_CHECK (128, i_ub) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_b) (res_ref, mask, SIZE);
-  if (UNION_CHECK (128, i_b) (res3, res_ref))
+  MASK_ZERO (i_ub) (res_ref, mask, SIZE);
+  if (UNION_CHECK (128, i_ub) (res3, res_ref))
     abort ();
 
   INTRINSIC (_mask_cvtusepi64_storeu_epi8) (res4, mask, src.x);
 
   CALC (res_ref2, src.a, 1);
-  MASK_MERGE (i_b) (res_ref2, mask, SIZE);
+  MASK_MERGE (i_ub) (res_ref2, mask, SIZE);
 
-  if (checkVc (res4, res_ref2, 16))
+  if (checkVuc (res4, res_ref2, 16))
     abort ();
 
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqd-2.c
index 79613b36ac3..f500ea3c285 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqd-2.c
@@ -11,6 +11,7 @@
 #define SIZE_HALF (AVX512F_LEN_HALF / 32)
 #include <limits.h>
 
+static void
 CALC (unsigned int *r, unsigned long long *s)
 {
   int i;
@@ -21,13 +22,13 @@ CALC (unsigned int *r, unsigned long long *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
-  UNION_TYPE (AVX512F_LEN_HALF, i_d) res1, res2, res3;
+  int i;
+  UNION_TYPE (AVX512F_LEN_HALF, i_ud) res1, res2, res3;
   unsigned int res4[SIZE_HALF];
-  UNION_TYPE (AVX512F_LEN, i_q) src;
+  UNION_TYPE (AVX512F_LEN, i_uq) src;
   MASK_TYPE mask = MASK_VALUE;
   unsigned int res_ref[SIZE_HALF];
 
@@ -45,17 +46,17 @@ TEST (void)
 
   CALC (res_ref, src.a);
 
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res2, res_ref))
     abort ();
 
-  if (checkVi (res4, res_ref, SIZE_HALF))
+  if (checkVui (res4, res_ref, SIZE_HALF))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN_HALF, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN_HALF, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqw-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqw-2.c
index f905eed83f0..c1ce9ed65bc 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovusqw-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #include <limits.h>
 
+static void
 CALC (unsigned short *r, unsigned long long *s)
 {
   int i;
@@ -20,13 +21,13 @@ CALC (unsigned short *r, unsigned long long *s)
     }
 }
 
-void static
+void
 TEST (void)
 {
-  int i, sign;
-  UNION_TYPE (128, i_w) res1, res2, res3;
+  int i;
+  UNION_TYPE (128, i_uw) res1, res2, res3;
   unsigned short res4[8];
-  UNION_TYPE (AVX512F_LEN, i_q) src;
+  UNION_TYPE (AVX512F_LEN, i_uq) src;
   MASK_TYPE mask = MASK_VALUE;
   unsigned short res_ref[8];
 
@@ -44,17 +45,17 @@ TEST (void)
 
   CALC (res_ref, src.a);
 
-  if (UNION_CHECK (128, i_w) (res1, res_ref))
+  if (UNION_CHECK (128, i_uw) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_w) (res_ref, mask, SIZE);
-  if (UNION_CHECK (128, i_w) (res2, res_ref))
+  MASK_MERGE (i_uw) (res_ref, mask, SIZE);
+  if (UNION_CHECK (128, i_uw) (res2, res_ref))
     abort ();
 
-  if (checkVs (res4, res_ref, 8))
+  if (checkVus (res4, res_ref, 8))
     abort ();
 
-  MASK_ZERO (i_w) (res_ref, mask, SIZE);
-  if (UNION_CHECK (128, i_w) (res3, res_ref))
+  MASK_ZERO (i_uw) (res_ref, mask, SIZE);
+  if (UNION_CHECK (128, i_uw) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxbd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxbd-2.c
index eb2b9509f5e..2184d8e1550 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxbd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxbd-2.c
@@ -20,10 +20,10 @@ CALC (unsigned char *s, int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
-  union128i_b s;
+  union128i_ub s;
   UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   int res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxbq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxbq-2.c
index e1629951ad4..6d9c935f14b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxbq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxbq-2.c
@@ -20,10 +20,10 @@ CALC (unsigned char *s, long long int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
-  union128i_b s;
+  union128i_ub s;
   UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   long long int res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxdq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxdq-2.c
index 69c352279d0..650be93be5e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxdq-2.c
@@ -20,10 +20,10 @@ CALC (unsigned *s, long long int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
-  UNION_TYPE (AVX512F_LEN_HALF, i_d) s;
+  UNION_TYPE (AVX512F_LEN_HALF, i_ud) s;
   UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   long long int res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxwd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxwd-2.c
index ea533143374..8823b892060 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxwd-2.c
@@ -20,10 +20,10 @@ CALC (unsigned short *s, int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
-  UNION_TYPE (AVX512F_LEN_HALF, i_w) s;
+  UNION_TYPE (AVX512F_LEN_HALF, i_uw) s;
   UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   int res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxwq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxwq-2.c
index 9e0fc7668cc..fcff47bd4c9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxwq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmovzxwq-2.c
@@ -20,10 +20,10 @@ CALC (unsigned short *s, long long int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
-  union128i_w s;
+  union128i_uw s;
   UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   long long int res_ref[SIZE];
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmuldq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmuldq-2.c
index 83058dcf897..a827c99f3ef 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmuldq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmuldq-2.c
@@ -19,14 +19,14 @@ CALC (int *s1, int *s2, long long int *r)
     r[i] = s1[i * 2] * s2[i * 2];
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, s2;
   UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   long long res_ref[DST_SIZE];
-  int i, sign = 1;
+  int i;
 
   for (i = 0; i < SRC_SIZE; i++)
     {
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmulld-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmulld-2.c
index a08120c436d..71b964085a0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmulld-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmulld-2.c
@@ -19,7 +19,7 @@ CALC (int *src1, int *src2, int *dst)
     dst[i] = src1[i] * src2[i];
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) src1, src2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpmuludq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpmuludq-2.c
index fc0416b6cf6..e7e087229ee 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpmuludq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpmuludq-2.c
@@ -19,14 +19,14 @@ CALC (unsigned int *s1, unsigned int *s2, unsigned long long *r)
     r[i] = s1[i * 2] * s2[i * 2];
 }
 
-static void
+void
 TEST (void)
 {
-  UNION_TYPE (AVX512F_LEN, i_d) s1, s2;
-  UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3;
+  UNION_TYPE (AVX512F_LEN, i_ud) s1, s2;
+  UNION_TYPE (AVX512F_LEN, i_uq) res1, res2, res3;
   MASK_TYPE mask = MASK_VALUE;
   unsigned long long res_ref[DST_SIZE];
-  int i, sign = 1;
+  int i;
 
   for (i = 0; i < SRC_SIZE; i++)
     {
@@ -42,14 +42,14 @@ TEST (void)
   res2.x = INTRINSIC (_mask_mul_epu32) (res2.x, mask, s1.x, s2.x);
   res3.x = INTRINSIC (_maskz_mul_epu32) (mask, s1.x, s2.x);
 
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_q) (res_ref, mask, DST_SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res2, res_ref))
+  MASK_MERGE (i_uq) (res_ref, mask, DST_SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_q) (res_ref, mask, DST_SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res3, res_ref))
+  MASK_ZERO (i_uq) (res_ref, mask, DST_SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpord-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpord-2.c
index 9493aa01fbc..5656a81e3fb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpord-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpord-2.c
@@ -18,7 +18,7 @@ CALC (int *s1, int *s2, int *r)
     r[i] = s1[i] | s2[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, s2, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vporq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vporq-2.c
index 843ecbd37f3..9af7172e31c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vporq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vporq-2.c
@@ -18,7 +18,7 @@ CALC (long long *s1, long long *s2, long long *r)
     r[i] = s1[i] | s2[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vprold-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vprold-2.c
index e56115d19a7..350b2ff5aea 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vprold-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vprold-2.c
@@ -17,10 +17,10 @@ CALC (int *s1, int count, int *r)
   unsigned int i;
 
   for (i = 0; i < SIZE; i++)
-    r[i] = (s1[i] << count) | (s1[i] >> sizeof (s1[i]) * 8 - count);
+    r[i] = (s1[i] << count) | (s1[i] >> (sizeof (s1[i]) * 8 - count));
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vprolq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vprolq-2.c
index 116a6aa6bd7..8a5718fbddb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vprolq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vprolq-2.c
@@ -17,10 +17,10 @@ CALC (long long *s1, int count, long long *r)
   unsigned int i;
 
   for (i = 0; i < SIZE; i++)
-    r[i] = (s1[i] << count) | (s1[i] >> sizeof (s1[i]) * 8 - count);
+    r[i] = (s1[i] << count) | (s1[i] >> (sizeof (s1[i]) * 8 - count));
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vprolvd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vprolvd-2.c
index e537ae8f95d..2d6f4d33f6b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vprolvd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vprolvd-2.c
@@ -15,10 +15,10 @@ CALC (int *s1, int *s2, int *r)
   unsigned int i;
 
   for (i = 0; i < SIZE; i++)
-    r[i] = (s1[i] << s2[i]) | (s1[i] >> sizeof (s1[i]) * 8 - s2[i]);
+    r[i] = (s1[i] << s2[i]) | (s1[i] >> (sizeof (s1[i]) * 8 - s2[i]));
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vprolvq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vprolvq-2.c
index a1c748d50b6..bcfeb057fc2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vprolvq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vprolvq-2.c
@@ -15,10 +15,10 @@ CALC (long long *s1, long long *s2, long long *r)
   unsigned int i;
 
   for (i = 0; i < SIZE; i++)
-    r[i] = (s1[i] << s2[i]) | (s1[i] >> sizeof (s1[i]) * 8 - s2[i]);
+    r[i] = (s1[i] << s2[i]) | (s1[i] >> (sizeof (s1[i]) * 8 - s2[i]));
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vprord-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vprord-2.c
index 5223fe0a7d1..7592e3e4194 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vprord-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vprord-2.c
@@ -17,10 +17,10 @@ CALC (int *s1, int count, int *r)
   unsigned int i;
 
   for (i = 0; i < SIZE; i++)
-    r[i] = (s1[i] >> count) | (s1[i] << sizeof (s1[i]) * 8 - count);
+    r[i] = (s1[i] >> count) | (s1[i] << (sizeof (s1[i]) * 8 - count));
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vprorq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vprorq-2.c
index 704b0a50a7e..95c9bdaae09 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vprorq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vprorq-2.c
@@ -17,10 +17,10 @@ CALC (long long *s1, int count, long long *r)
   unsigned int i;
 
   for (i = 0; i < SIZE; i++)
-    r[i] = (s1[i] >> count) | (s1[i] << sizeof (s1[i]) * 8 - count);
+    r[i] = (s1[i] >> count) | (s1[i] << (sizeof (s1[i]) * 8 - count));
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vprorvd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vprorvd-2.c
index eaf8df92e4b..0be8d69e9f9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vprorvd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vprorvd-2.c
@@ -15,10 +15,10 @@ CALC (int *s1, int *s2, int *r)
   unsigned int i;
 
   for (i = 0; i < SIZE; i++)
-    r[i] = (s1[i] >> s2[i]) | (s1[i] << sizeof (s1[i]) * 8 - s2[i]);
+    r[i] = (s1[i] >> s2[i]) | (s1[i] << (sizeof (s1[i]) * 8 - s2[i]));
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vprorvq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vprorvq-2.c
index 035ce96772c..b8738bf2618 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vprorvq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vprorvq-2.c
@@ -15,10 +15,10 @@ CALC (long long *s1, long long *s2, long long *r)
   unsigned int i;
 
   for (i = 0; i < SIZE; i++)
-    r[i] = (s1[i] >> s2[i]) | (s1[i] << sizeof (s1[i]) * 8 - s2[i]);
+    r[i] = (s1[i] >> s2[i]) | (s1[i] << (sizeof (s1[i]) * 8 - s2[i]));
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpshufd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpshufd-2.c
index a6379c372e8..6bab108659d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpshufd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpshufd-2.c
@@ -23,17 +23,17 @@ CALC (int *s1, unsigned char imm, int *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, res1, res2, res3;
   int res_ref[SIZE];
-  int i, j, sign = 1;
+  int j, sign = 1;
   MASK_TYPE mask = MASK_VALUE;
 
   for (j = 0; j < SIZE; j++)
     {
-      s1.a[j] = j * i * sign;
+      s1.a[j] = j * sign;
       res1.a[j] = DEFAULT_VALUE;
       res2.a[j] = DEFAULT_VALUE;
       res3.a[j] = DEFAULT_VALUE;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpslld-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpslld-2.c
index c6c8a9c1c7b..b11f7f7db88 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpslld-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpslld-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, long long* s2)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (int *r, int *s1, long long* s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpslldi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpslldi-2.c
index c3bfdd28a5d..638b882ab17 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpslldi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpslldi-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, int count)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (int *r, int *s1, int count)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsllq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsllq-2.c
index 5addaa51798..0f818fd2a27 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsllq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsllq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1,  long long* s2)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (long long *r, long long *s1,  long long* s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsllqi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsllqi-2.c
index e15b324d11a..39be492d0e3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsllqi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsllqi-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long count)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (long long *r, long long *s1, long long count)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsllvd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsllvd-2.c
index 82ff3a65253..5f094ddd475 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsllvd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsllvd-2.c
@@ -9,7 +9,8 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-CALC (unsigned int *r, unsigned int *s1, unsigned int *s2)
+static void
+CALC (int *r, int *s1, int *s2)
 {
   int i;
   for (i = 0; i < SIZE; i++)
@@ -18,13 +19,13 @@ CALC (unsigned int *r, unsigned int *s1, unsigned int *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3, src1, src2;
   MASK_TYPE mask = MASK_VALUE;
-  unsigned int res_ref[SIZE];
+  int res_ref[SIZE];
 
   for (i = 0; i < SIZE; i++)
     {
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsllvq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsllvq-2.c
index e2b48d7fdde..7ddacdffe66 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsllvq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsllvq-2.c
@@ -9,8 +9,9 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
-CALC (unsigned long long *r, unsigned long long *s1,
-      unsigned long long *s2)
+static void
+CALC (long long *r, long long *s1,
+      long long *s2)
 {
   int i;
   for (i = 0; i < SIZE; i++)
@@ -19,13 +20,13 @@ CALC (unsigned long long *r, unsigned long long *s1,
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
   UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3, src1, src2;
   MASK_TYPE mask = MASK_VALUE;
-  unsigned long long res_ref[SIZE];
+  long long res_ref[SIZE];
 
   for (i = 0; i < SIZE; i++)
     {
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsrad-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsrad-2.c
index 596f98b4397..7b433e0c1fe 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsrad-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsrad-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, long long *s2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (int *r, int *s1, long long *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsradi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsradi-2.c
index 3ba3ff1315b..c74d085b2d6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsradi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsradi-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, int count)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (int *r, int *s1, int count)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsraq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsraq-2.c
index c5ae9c67d19..575291a82d6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsraq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsraq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long *s2)
 {
   int i;
@@ -21,7 +22,7 @@ CALC (long long *r, long long *s1, long long *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsraqi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsraqi-2.c
index 47c273297da..d45a620df54 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsraqi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsraqi-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long count)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (long long *r, long long *s1, long long count)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsravd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsravd-2.c
index 0651c24cc00..ff97489b7b6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsravd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsravd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, int *s2)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (int *r, int *s1, int *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsravq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsravq-2.c
index 3b7063f57a2..57d2a940118 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsravq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsravq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long *s2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (long long *r, long long *s1, long long *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsrld-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsrld-2.c
index 653a8f8f304..1bd748a1ba8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsrld-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsrld-2.c
@@ -9,7 +9,8 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-CALC (unsigned int *r, unsigned int *s1,  unsigned long long* s2)
+static void
+CALC (unsigned int *r, unsigned int *s1, unsigned long long *s2)
 {
   int i;
   unsigned int count = s2[0];
@@ -19,12 +20,12 @@ CALC (unsigned int *r, unsigned int *s1,  unsigned long long* s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3, src1;
-  UNION_TYPE (128, i_q) src2;
+  UNION_TYPE (AVX512F_LEN, i_ud) res1, res2, res3, src1;
+  UNION_TYPE (128, i_uq) src2;
   MASK_TYPE mask = MASK_VALUE;
   unsigned int res_ref[SIZE];
 
@@ -46,15 +47,15 @@ TEST (void)
 
       CALC (res_ref, src1.a, src2.a);
 
-      if (UNION_CHECK (AVX512F_LEN, i_d) (res1, res_ref))
+      if (UNION_CHECK (AVX512F_LEN, i_ud) (res1, res_ref))
 	abort ();
 
-      MASK_MERGE (i_d) (res_ref, mask, SIZE);
-      if (UNION_CHECK (AVX512F_LEN, i_d) (res2, res_ref))
+      MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+      if (UNION_CHECK (AVX512F_LEN, i_ud) (res2, res_ref))
 	abort ();
 
-      MASK_ZERO (i_d) (res_ref, mask, SIZE);
-      if (UNION_CHECK (AVX512F_LEN, i_d) (res3, res_ref))
+      MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+      if (UNION_CHECK (AVX512F_LEN, i_ud) (res3, res_ref))
 	abort ();
     }
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsrldi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsrldi-2.c
index e178445fb73..0e730979398 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsrldi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsrldi-2.c
@@ -9,7 +9,8 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
-CALC (unsigned int *r, unsigned int *s1, unsigned int count)
+static void
+CALC (unsigned int *r, unsigned int *s1, int count)
 {
   int i;
   for (i = 0; i < SIZE; i++)
@@ -18,11 +19,11 @@ CALC (unsigned int *r, unsigned int *s1, unsigned int count)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3, src1;
+  UNION_TYPE (AVX512F_LEN, i_ud) res1, res2, res3, src1;
   MASK_TYPE mask = MASK_VALUE;
   unsigned int res_ref[SIZE];
 
@@ -41,15 +42,15 @@ TEST (void)
 
   CALC (res_ref, src1.a, 3);
 
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res3, res_ref))
     abort ();
 
 
@@ -63,14 +64,14 @@ TEST (void)
 
   CALC (res_ref, src1.a, 33);
 
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsrlq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsrlq-2.c
index 40305287350..8f362bce8dd 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsrlq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsrlq-2.c
@@ -9,7 +9,8 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
-CALC (unsigned long long *r, unsigned long long *s1,  unsigned long long* s2)
+static void
+CALC (unsigned long long *r, unsigned long long *s1, unsigned long long* s2)
 {
   int i;
   unsigned long long count = s2[0];
@@ -19,12 +20,12 @@ CALC (unsigned long long *r, unsigned long long *s1,  unsigned long long* s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3, src1;
-  UNION_TYPE (128, i_q) src2;
+  UNION_TYPE (AVX512F_LEN, i_uq) res1, res2, res3, src1;
+  UNION_TYPE (128, i_uq) src2;
   MASK_TYPE mask = MASK_VALUE;
   unsigned long long res_ref[SIZE];
 
@@ -46,15 +47,15 @@ TEST (void)
 
       CALC (res_ref, src1.a, src2.a);
 
-      if (UNION_CHECK (AVX512F_LEN, i_q) (res1, res_ref))
+      if (UNION_CHECK (AVX512F_LEN, i_uq) (res1, res_ref))
 	abort ();
 
-      MASK_MERGE (i_q) (res_ref, mask, SIZE);
-      if (UNION_CHECK (AVX512F_LEN, i_q) (res2, res_ref))
+      MASK_MERGE (i_uq) (res_ref, mask, SIZE);
+      if (UNION_CHECK (AVX512F_LEN, i_uq) (res2, res_ref))
 	abort ();
 
-      MASK_ZERO (i_q) (res_ref, mask, SIZE);
-      if (UNION_CHECK (AVX512F_LEN, i_q) (res3, res_ref))
+      MASK_ZERO (i_uq) (res_ref, mask, SIZE);
+      if (UNION_CHECK (AVX512F_LEN, i_uq) (res3, res_ref))
 	abort ();
     }
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsrlqi-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsrlqi-2.c
index 3fedac4c88f..c68a629b8f8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsrlqi-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsrlqi-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (unsigned long long *r, unsigned long long *s1,
       unsigned long long count)
 {
@@ -19,11 +20,11 @@ CALC (unsigned long long *r, unsigned long long *s1,
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3, src1;
+  UNION_TYPE (AVX512F_LEN, i_uq) res1, res2, res3, src1;
   MASK_TYPE mask = MASK_VALUE;
   unsigned long long res_ref[SIZE];
 
@@ -42,15 +43,15 @@ TEST (void)
 
   CALC (res_ref, src1.a, 3);
 
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res2, res_ref))
+  MASK_MERGE (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res3, res_ref))
+  MASK_ZERO (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res3, res_ref))
     abort ();
 
 
@@ -64,14 +65,14 @@ TEST (void)
 
   CALC (res_ref, src1.a, 65);
 
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res2, res_ref))
+  MASK_MERGE (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res3, res_ref))
+  MASK_ZERO (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsrlvd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsrlvd-2.c
index 514d36a37dc..8e04d6db491 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsrlvd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsrlvd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (unsigned int *r, unsigned int *s1, unsigned int *s2)
 {
   int i;
@@ -18,11 +19,11 @@ CALC (unsigned int *r, unsigned int *s1, unsigned int *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_d) res1, res2, res3, src1, src2;
+  UNION_TYPE (AVX512F_LEN, i_ud) res1, res2, res3, src1, src2;
   MASK_TYPE mask = MASK_VALUE;
   unsigned int res_ref[SIZE];
 
@@ -41,14 +42,14 @@ TEST (void)
 
   CALC (res_ref, src1.a, src2.a);
 
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res2, res_ref))
+  MASK_MERGE (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_d) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_d) (res3, res_ref))
+  MASK_ZERO (i_ud) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_ud) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsrlvq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsrlvq-2.c
index 586b8c2f930..3cc4b11be99 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsrlvq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsrlvq-2.c
@@ -9,8 +9,8 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
-CALC (unsigned long long *r, unsigned long long *s1,
-      unsigned long long *s2)
+static void
+CALC (unsigned long long *r, unsigned long long *s1, unsigned long long *s2)
 {
   int i;
   for (i = 0; i < SIZE; i++)
@@ -19,11 +19,11 @@ CALC (unsigned long long *r, unsigned long long *s1,
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i;
-  UNION_TYPE (AVX512F_LEN, i_q) res1, res2, res3, src1, src2;
+  UNION_TYPE (AVX512F_LEN, i_uq) res1, res2, res3, src1, src2;
   MASK_TYPE mask = MASK_VALUE;
   unsigned long long res_ref[SIZE];
 
@@ -42,14 +42,14 @@ TEST (void)
 
   CALC (res_ref, src1.a, src2.a);
 
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res1, res_ref))
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res1, res_ref))
     abort ();
 
-  MASK_MERGE (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res2, res_ref))
+  MASK_MERGE (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res2, res_ref))
     abort ();
 
-  MASK_ZERO (i_q) (res_ref, mask, SIZE);
-  if (UNION_CHECK (AVX512F_LEN, i_q) (res3, res_ref))
+  MASK_ZERO (i_uq) (res_ref, mask, SIZE);
+  if (UNION_CHECK (AVX512F_LEN, i_uq) (res3, res_ref))
     abort ();
 }
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsubd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsubd-2.c
index acc26ce832c..902ccffba5b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsubd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsubd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, int *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (int *r, int *s1, int *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpsubq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpsubq-2.c
index ba16ee18470..a78d85f6ab4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpsubq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpsubq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (long long *r, long long *s1, long long *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpternlogd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpternlogd-2.c
index c9813ed2432..67df0d46581 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpternlogd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpternlogd-2.c
@@ -32,7 +32,7 @@ CALC (int *src1, int *src2, int *src3, int imm, int *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) src2, src3, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpternlogq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpternlogq-2.c
index a8065541ecc..4bbb864a0cb 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpternlogq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpternlogq-2.c
@@ -34,7 +34,7 @@ CALC (long long *src1, long long *src2, long long *src3,
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) src2, src3, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vptestmd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vptestmd-2.c
index 5025fab3088..e776fdc7e36 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vptestmd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vptestmd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *res, int *src1, int *src2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (MASK_TYPE *res, int *src1, int *src2)
       *res = *res | one << i;
 }
 
-static void
+void
 TEST (void)
 {
   int i, sign = 1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vptestmq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vptestmq-2.c
index 9ec9e48b3b1..283a8447145 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vptestmq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vptestmq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *res, long long *src1, long long *src2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (MASK_TYPE *res, long long *src1, long long *src2)
       *res = *res | one << i;
 }
 
-static void
+void
 TEST (void)
 {
   int i, sign = 1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vptestnmd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vptestnmd-2.c
index b2b4d0e1e67..f72954b9969 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vptestnmd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vptestnmd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *res, int *src1, int *src2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (MASK_TYPE *res, int *src1, int *src2)
       *res = *res | one << i;
 }
 
-static void
+void
 TEST (void)
 {
   int i, sign = 1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vptestnmq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vptestnmq-2.c
index b6330d21342..d35a944259a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vptestnmq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vptestnmq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (MASK_TYPE *res, long long *src1, long long *src2)
 {
   int i;
@@ -20,7 +21,7 @@ CALC (MASK_TYPE *res, long long *src1, long long *src2)
       *res = *res | one << i;
 }
 
-static void
+void
 TEST (void)
 {
   int i, sign = 1;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpunpckhdq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpunpckhdq-2.c
index adb9b7a53aa..f499fdf5318 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpunpckhdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpunpckhdq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, int *s2)
 {
   int i;
@@ -21,7 +22,7 @@ CALC (int *r, int *s1, int *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpunpckhqdq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpunpckhqdq-2.c
index b226274df16..b0c8c2324df 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpunpckhqdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpunpckhqdq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long *s2)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (long long *r, long long *s1, long long *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpunpckldq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpunpckldq-2.c
index b715fde17ad..7cdaa74358c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpunpckldq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpunpckldq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (int *r, int *s1, int *s2)
 {
   int i;
@@ -21,7 +22,7 @@ CALC (int *r, int *s1, int *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpunpcklqdq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpunpcklqdq-2.c
index 2892f1c3210..2d84fb98cb3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpunpcklqdq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpunpcklqdq-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (long long *r, long long *s1, long long *s2)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (long long *r, long long *s1, long long *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpxord-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpxord-2.c
index 7a9666ce7c6..fa431aed140 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpxord-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpxord-2.c
@@ -18,7 +18,7 @@ CALC (int *s1, int *s2, int *r)
     r[i] = s1[i] ^ s2[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) s1, s2, res1, res2, res3, res4;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpxorq-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vpxorq-2.c
index 288b0085ff6..ef605476bbc 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpxorq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpxorq-2.c
@@ -18,7 +18,7 @@ CALC (long long *s1, long long *s2, long long *r)
     r[i] = s1[i] ^ s2[i];
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrcp14pd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrcp14pd-2.c
index 4653d77309b..00e3308716d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrcp14pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrcp14pd-2.c
@@ -20,7 +20,7 @@ CALC (double *s, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrcp14ps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrcp14ps-2.c
index 6e0e577914b..d730a0642c2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrcp14ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrcp14ps-2.c
@@ -20,7 +20,7 @@ CALC (float *s, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrcp14sd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrcp14sd-2.c
index f94460036c0..cb405c38b08 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrcp14sd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrcp14sd-2.c
@@ -3,7 +3,6 @@
 /* { dg-require-effective-target avx512f } */
 
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 static void
 compute_vrcp14sd (double *s1, double *s2, double *r)
@@ -15,12 +14,11 @@ compute_vrcp14sd (double *s1, double *s2, double *r)
 static void
 avx512f_test (void)
 {
-  union128d s1, s2, res1, res2, res3;
+  union128d s1, s2, res1;
   double res_ref[2];
 
   s1.x = _mm_set_pd (-3.0, 111.111);
   s2.x = _mm_set_pd (222.222, -2.0);
-  res2.a[0] = DEFAULT_VALUE;
 
   res1.x = _mm_rcp14_sd (s1.x, s2.x);
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrcp14ss-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrcp14ss-2.c
index 7aca591bfca..40025896a28 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrcp14ss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrcp14ss-2.c
@@ -3,7 +3,6 @@
 /* { dg-require-effective-target avx512f } */
 
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 static void
 compute_vrcp14ss (float *s1, float *s2, float *r)
@@ -17,12 +16,11 @@ compute_vrcp14ss (float *s1, float *s2, float *r)
 static void
 avx512f_test (void)
 {
-  union128 s1, s2, res1, res2, res3;
+  union128 s1, s2, res1;
   float res_ref[4];
 
   s1.x = _mm_set_ps (-24.043, 68.346, -43.35, 546.46);
   s2.x = _mm_set_ps (222.222, 333.333, 444.444, -2.0);
-  res2.a[0] = DEFAULT_VALUE;
 
   res1.x = _mm_rcp14_ss (s1.x, s2.x);
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrndscalepd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrndscalepd-2.c
index f18cdcbcab2..d882d2fb2ed 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrndscalepd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrndscalepd-2.c
@@ -31,13 +31,12 @@ CALC (double *s, double *r, int imm)
       }
 }
 
-void static
+void
 TEST (void)
 {
   int imm, i, j;
   UNION_TYPE (AVX512F_LEN, d) res1,res2,res3,s;
   double res_ref[SIZE];
-  double res_ref_mask[SIZE];
 
   MASK_TYPE mask = 6 ^ (0xff >> SIZE);
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrndscaleps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrndscaleps-2.c
index 097253d754c..ca8edad8f40 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrndscaleps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrndscaleps-2.c
@@ -31,7 +31,7 @@ CALC (float *s, float *r, int imm)
       }
 }
 
-void static
+void
 TEST (void)
 {
   int imm, i, j;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-2.c
index 5b4e8423cad..b96aa462790 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrndscalesd-2.c
@@ -6,7 +6,6 @@
 
 #include <math.h>
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 static void
 compute_rndscalesd (double *s1, double *s2, double *r, int imm)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-2.c
index 45052bc61fc..42dd645ab87 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrndscaless-2.c
@@ -6,7 +6,6 @@
 
 #include <math.h>
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 static void
 compute_rndscaless (float *s1, float *s2, float *r, int imm)
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14pd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14pd-2.c
index 76e39cf805a..3648fcc135c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14pd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14pd-2.c
@@ -21,7 +21,7 @@ CALC (double *s, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14ps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14ps-2.c
index 4e6f77dd40a..2c120a2d64a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14ps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14ps-2.c
@@ -21,7 +21,7 @@ CALC (float *s, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14sd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14sd-2.c
index ef4e407f7d1..dc96158b289 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14sd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14sd-2.c
@@ -4,7 +4,6 @@
 
 #include <math.h>
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 static void
 compute_vrsqrt14sd (double *s1, double *s2, double *r)
@@ -16,12 +15,11 @@ compute_vrsqrt14sd (double *s1, double *s2, double *r)
 static void
 avx512f_test (void)
 {
-  union128d s1, s2, res1, res2, res3;
+  union128d s1, s2, res1;
   double res_ref[2];
 
   s1.x = _mm_set_pd (-3.0, 111.111);
   s2.x = _mm_set_pd (222.222, 4.0);
-  res2.a[0] = DEFAULT_VALUE;
 
   res1.x = _mm_rsqrt14_sd (s1.x, s2.x);
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14ss-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14ss-2.c
index b01420f7af0..10d8664cda8 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14ss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vrsqrt14ss-2.c
@@ -4,7 +4,6 @@
 
 #include <math.h>
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 static void
 compute_vrsqrt14ss (float *s1, float *s2, float *r)
@@ -18,12 +17,11 @@ compute_vrsqrt14ss (float *s1, float *s2, float *r)
 static void
 avx512f_test (void)
 {
-  union128 s1, s2, res1, res2, res3;
+  union128 s1, s2, res1;
   float res_ref[4];
 
   s1.x = _mm_set_ps (-24.43, 68.346, -43.35, 546.46);
   s2.x = _mm_set_ps (222.222, 333.333, 444.444, 4.0);
-  res2.a[0] = DEFAULT_VALUE;
 
   res1.x = _mm_rsqrt14_ss (s1.x, s2.x);
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vscalefpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vscalefpd-2.c
index 829f7418f4f..cbfe3de91e6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vscalefpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vscalefpd-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #include <math.h>
 
+void static
 CALC (double *r, double *s1, double *s2)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (double *r, double *s1, double *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vscalefps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vscalefps-2.c
index 59c32369f96..bf4a25a3cb5 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vscalefps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vscalefps-2.c
@@ -10,6 +10,7 @@
 #include "avx512f-mask-type.h"
 #include <math.h>
 
+void static
 CALC (float *r, float *s1, float *s2)
 {
   int i;
@@ -19,7 +20,7 @@ CALC (float *r, float *s1, float *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vscalefsd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vscalefsd-2.c
index 131fc67c032..28738f77837 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vscalefsd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vscalefsd-2.c
@@ -4,7 +4,6 @@
 
 #include <math.h>
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 #define SIZE (128 / 64)
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vscalefss-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vscalefss-2.c
index 3e8f6d19345..935618438a1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vscalefss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vscalefss-2.c
@@ -4,7 +4,6 @@
 
 #include <math.h>
 #include "avx512f-check.h"
-#include "avx512f-helper.h"
 
 #define SIZE (128 / 32)
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vshuff32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vshuff32x4-2.c
index 35eabc2cfe0..fa976260af4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vshuff32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vshuff32x4-2.c
@@ -10,7 +10,7 @@
 #include "avx512f-mask-type.h"
 #include "string.h"
 
-void
+static void
 CALC (float *e, UNION_TYPE (AVX512F_LEN,) s1, UNION_TYPE (AVX512F_LEN,) s2,
       int imm)
 {
@@ -31,7 +31,7 @@ CALC (float *e, UNION_TYPE (AVX512F_LEN,) s1, UNION_TYPE (AVX512F_LEN,) s2,
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) u1, u2, u3, s1, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vshuff64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vshuff64x2-2.c
index 9fee4201ac8..9f5e093b39b 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vshuff64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vshuff64x2-2.c
@@ -10,7 +10,7 @@
 #include "avx512f-mask-type.h"
 #include "string.h"
 
-void
+static void
 CALC (double *e, UNION_TYPE (AVX512F_LEN, d) s1,
       UNION_TYPE (AVX512F_LEN, d) s2, int imm)
 {
@@ -31,7 +31,7 @@ CALC (double *e, UNION_TYPE (AVX512F_LEN, d) s1,
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) u1, u2, u3, s1, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vshufi32x4-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vshufi32x4-2.c
index 9b1603c66fb..b51eec7d97f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vshufi32x4-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vshufi32x4-2.c
@@ -10,7 +10,7 @@
 #include "avx512f-mask-type.h"
 #include "string.h"
 
-void
+static void
 CALC (int *e, UNION_TYPE (AVX512F_LEN, i_d) s1,
       UNION_TYPE (AVX512F_LEN, i_d) s2, int imm)
 {
@@ -31,7 +31,7 @@ CALC (int *e, UNION_TYPE (AVX512F_LEN, i_d) s1,
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_d) u1, u2, u3, s1, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vshufi64x2-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vshufi64x2-2.c
index 85a59188333..5428eaeeb60 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vshufi64x2-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vshufi64x2-2.c
@@ -10,7 +10,7 @@
 #include "avx512f-mask-type.h"
 #include "string.h"
 
-void
+static void
 CALC (long long *e, UNION_TYPE (AVX512F_LEN, i_q) s1,
       UNION_TYPE (AVX512F_LEN, i_q) s2, int imm)
 {
@@ -31,7 +31,7 @@ CALC (long long *e, UNION_TYPE (AVX512F_LEN, i_q) s1,
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, i_q) u1, u2, u3, s1, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vshufpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vshufpd-2.c
index d70228af17e..3645fd7e21a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vshufpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vshufpd-2.c
@@ -26,7 +26,7 @@ CALC (double *e, UNION_TYPE (AVX512F_LEN, d) s1,
 #endif
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) u1, u2, u3, s1, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vshufps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vshufps-2.c
index ed378d1c40b..c3243812947 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vshufps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vshufps-2.c
@@ -35,7 +35,7 @@ CALC (float *e, UNION_TYPE (AVX512F_LEN,) s1, UNION_TYPE (AVX512F_LEN,) s2,
 #endif
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) u1, u2, u3, s1, s2;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vsqrtpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vsqrtpd-2.c
index 27b649157f1..b334079f91f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vsqrtpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vsqrtpd-2.c
@@ -21,7 +21,7 @@ CALC (double *s, double *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vsqrtps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vsqrtps-2.c
index 4fc45e3953f..19fb9e9751a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vsqrtps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vsqrtps-2.c
@@ -21,7 +21,7 @@ CALC (float *s, float *r)
     }
 }
 
-static void
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) s, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vsubpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vsubpd-2.c
index a462631b2c3..98291942dac 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vsubpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vsubpd-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (double *r, double *s1, double *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (double *r, double *s1, double *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vsubps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vsubps-2.c
index 366b7e74436..921be5b996f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vsubps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vsubps-2.c
@@ -9,6 +9,7 @@
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
+static void
 CALC (float *r, float *s1, float *s2)
 {
   int i;
@@ -18,7 +19,7 @@ CALC (float *r, float *s1, float *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   int i, sign;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vunpckhpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vunpckhpd-2.c
index 60898bbf22c..35172ef4fe3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vunpckhpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vunpckhpd-2.c
@@ -21,7 +21,7 @@ CALC (double *s1, double *s2, double *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vunpckhps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vunpckhps-2.c
index 6047985bc70..d7780682300 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vunpckhps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vunpckhps-2.c
@@ -23,7 +23,7 @@ CALC (float *s1, float *s2, float *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, ) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vunpcklpd-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vunpcklpd-2.c
index 3317e4acff9..1b9a06ff5c6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vunpcklpd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vunpcklpd-2.c
@@ -21,7 +21,7 @@ CALC (double *s1, double *s2, double *r)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN, d) s1, s2, res1, res2, res3;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vunpcklps-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vunpcklps-2.c
index 538a9fa80ec..e30c6c516a9 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vunpcklps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vunpcklps-2.c
@@ -22,7 +22,7 @@ CALC (float *e, float *s1, float *s2)
     }
 }
 
-void static
+void
 TEST (void)
 {
   UNION_TYPE (AVX512F_LEN,) s1, s2, u1, u2, u3;
diff --git a/gcc/testsuite/gcc.target/i386/i386.exp b/gcc/testsuite/gcc.target/i386/i386.exp
index d9b36cd30da..c753a2b6658 100644
--- a/gcc/testsuite/gcc.target/i386/i386.exp
+++ b/gcc/testsuite/gcc.target/i386/i386.exp
@@ -261,8 +261,7 @@ proc check_effective_target_avx512f { } {
 	__v8di
 	mm512_and_epi64  (__v8di __X, __v8di __Y)
 	{
-            __v8di __W;
-            return __builtin_ia32_pandq512_mask (__X, __Y, __W, -1);
+            return __builtin_ia32_pandq512_mask (__X, __Y, __X, -1);
 	}
     } "-mavx512f" ]
 }
@@ -288,8 +287,7 @@ proc check_effective_target_avx512er { } {
 	__v16sf
 	mm512_exp2a23_ps  (__v16sf __X)
 	{
-        __v16sf __W;
-	    return __builtin_ia32_exp2ps_mask (__X, __W, -1, 4);
+	    return __builtin_ia32_exp2ps_mask (__X, __X, -1, 4);
 	}
    } "-Wno-psabi -mavx512er" ]
 }
diff --git a/gcc/testsuite/gcc.target/i386/m128-check.h b/gcc/testsuite/gcc.target/i386/m128-check.h
index 98dc2699839..abb792b09dc 100644
--- a/gcc/testsuite/gcc.target/i386/m128-check.h
+++ b/gcc/testsuite/gcc.target/i386/m128-check.h
@@ -34,12 +34,25 @@ typedef union
   int a[4];
 } union128i_d;
 
+typedef union
+{
+  __m128i x;
+  unsigned int a[4];
+} union128i_ud;
+
 typedef union
 {
   __m128i x;
   long long a[2];
 } union128i_q;
 
+typedef union
+{
+  __m128i x;
+  unsigned long long a[2];
+} union128i_uq;
+
+
 typedef union
 {
   __m128d x;
@@ -87,7 +100,9 @@ CHECK_EXP (union128i_ub, unsigned char, "%d")
 CHECK_EXP (union128i_w, short, "%d")
 CHECK_EXP (union128i_uw, unsigned short, "%d")
 CHECK_EXP (union128i_d, int, "0x%x")
+CHECK_EXP (union128i_ud, unsigned int, "0x%x")
 CHECK_EXP (union128i_q, long long, "0x%llx")
+CHECK_EXP (union128i_uq, unsigned long long, "0x%llx")
 CHECK_EXP (union128d, double, "%f")
 #endif
 
@@ -117,6 +132,12 @@ CHECK_ARRAY(c, char, "0x%hhx")
 CHECK_ARRAY(s, short, "0x%hx")
 CHECK_ARRAY(i, int, "0x%x")
 CHECK_ARRAY(l, long long, "0x%llx")
+CHECK_ARRAY(uc, unsigned char, "0x%hhx")
+CHECK_ARRAY(us, unsigned short, "0x%hx")
+CHECK_ARRAY(ui, unsigned int, "0x%x")
+CHECK_ARRAY(ul, unsigned long long, "0x%llx")
+
+
 
 #define CHECK_FP_ARRAY(ARRAY, TYPE, ESP, FMT)                   \
 static int                                              \
diff --git a/gcc/testsuite/gcc.target/i386/m256-check.h b/gcc/testsuite/gcc.target/i386/m256-check.h
index e1843550ecd..6dbc3a0d9d7 100644
--- a/gcc/testsuite/gcc.target/i386/m256-check.h
+++ b/gcc/testsuite/gcc.target/i386/m256-check.h
@@ -44,12 +44,40 @@ typedef union
   double a[4];
 } union256d;
 
+typedef union
+{
+  __m256i x;
+  unsigned char a[32];
+} union256i_ub;
+         
+typedef union
+{
+  __m256i x;
+  unsigned short a[16];
+} union256i_uw;
+                 
+typedef union
+{
+  __m256i x;
+  unsigned int a[8];
+} union256i_ud;
+  
+typedef union
+{
+  __m256i x;
+  unsigned long long a[4];
+} union256i_uq;
+                          
 CHECK_EXP (union256i_b, char, "%d")
 CHECK_EXP (union256i_w, short, "%d")
 CHECK_EXP (union256i_d, int, "0x%x")
 CHECK_EXP (union256i_q, long long, "0x%llx")
 CHECK_EXP (union256, float, "%f")
 CHECK_EXP (union256d, double, "%f")
+CHECK_EXP (union256i_ub, unsigned char, "%d")
+CHECK_EXP (union256i_uw, unsigned short, "%d")
+CHECK_EXP (union256i_ud, unsigned int, "0x%x")
+CHECK_EXP (union256i_uq, unsigned long long, "0x%llx")
 
 #define CHECK_FP_EXP(UINON_TYPE, VALUE_TYPE, ESP, FMT)		\
 static int							\
diff --git a/gcc/testsuite/gcc.target/i386/m512-check.h b/gcc/testsuite/gcc.target/i386/m512-check.h
index 375b15ade79..64e085bc602 100644
--- a/gcc/testsuite/gcc.target/i386/m512-check.h
+++ b/gcc/testsuite/gcc.target/i386/m512-check.h
@@ -37,12 +37,42 @@ typedef union
   double a[8];
 } union512d;
 
+typedef union
+{
+  __m512i x;
+  unsigned char a[64];
+} union512i_ub;
+          
+typedef union
+{
+ __m512i x;
+ unsigned short a[32];
+ } union512i_uw;
+                      
+typedef union
+{
+ __m512i x;
+ unsigned int a[16];
+} union512i_ud;
+                  
+typedef union
+{
+ __m512i x;
+ unsigned long long a[8];
+} union512i_uq;
+                                    
+
 CHECK_EXP (union512i_b, char, "%d")
 CHECK_EXP (union512i_w, short, "%d")
 CHECK_EXP (union512i_d, int, "0x%x")
 CHECK_EXP (union512i_q, long long, "0x%llx")
 CHECK_EXP (union512, float, "%f")
 CHECK_EXP (union512d, double, "%f")
+CHECK_EXP (union512i_ub, unsigned char, "%d")
+CHECK_EXP (union512i_uw, unsigned short, "%d")
+CHECK_EXP (union512i_ud, unsigned int, "0x%x")
+CHECK_EXP (union512i_uq, unsigned long long, "0x%llx")
+     
 
 CHECK_FP_EXP (union512, float, ESP_FLOAT, "%f")
 CHECK_FP_EXP (union512d, double, ESP_DOUBLE, "%f")