Fix AVX-512 popcnt and bitalg tests.

gcc/testsuite/
	PR target/83828
	* gcc.target/i386/avx512bitalg-vpopcntb-1.c: Fix test.
	* gcc.target/i386/avx512bitalg-vpopcntw-1.c: Ditto.
	* gcc.target/i386/avx512bitalg-vpshufbitqmb-1.c: Ditto.
	* gcc.target/i386/avx512vpopcntdq-vpopcntd-1.c: Ditto.
	* gcc.target/i386/avx512vpopcntdq-vpopcntq-1.c: Ditto.

From-SVN: r257579

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a76336d0d019bbf126a6b5baf2cf72ea55d3174..a0bd3b22e4ef8c13b48bf8007a70a05b1138b438 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2018-02-12  Olga Makhotina  <olga.makhotina@intel.com>
+
+       PR target/83828
+       * gcc.target/i386/avx512bitalg-vpopcntb-1.c: Fix test.
+       * gcc.target/i386/avx512bitalg-vpopcntw-1.c: Ditto.
+       * gcc.target/i386/avx512bitalg-vpshufbitqmb-1.c: Ditto.
+       * gcc.target/i386/avx512vpopcntdq-vpopcntd-1.c: Ditto.
+       * gcc.target/i386/avx512vpopcntdq-vpopcntq-1.c: Ditto.
+
 2018-02-12  Olga Makhotina  <olga.makhotina@intel.com>
 
        * gcc.target/i386/avx512f-vscalefsd-1.c (_mm_mask_scalef_round_sd,

diff --git a/gcc/testsuite/gcc.target/i386/avx512bitalg-vpopcntb-1.c b/gcc/testsuite/gcc.target/i386/avx512bitalg-vpopcntb-1.c
index 9847e2e04d34d3ffdd4cb267c1af28f6698c36e8..3dcd48f7e2af567d25a6277a4543e1e1e3bb0ca0 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/avx512bitalg-vpopcntb-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bitalg-vpopcntb-1.c
@@ -3,11 +3,10 @@
 /* { dg-require-effective-target avx512bitalg } */
 /* { dg-require-effective-target avx512bw } */
 
-#include "avx512f-helper.h"
-
 #define AVX512BITALG
 #define SIZE (AVX512F_LEN / 8)
 
+#include "avx512f-helper.h"
 #include "avx512f-mask-type.h"
 
 #define TYPE char

diff --git a/gcc/testsuite/gcc.target/i386/avx512bitalg-vpopcntw-1.c b/gcc/testsuite/gcc.target/i386/avx512bitalg-vpopcntw-1.c
index c2d5a79b3308e25c3aafd300eb42ad923b17d2a7..4f866db2f7aaf6de7e191b474218625201d6fffa 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/avx512bitalg-vpopcntw-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bitalg-vpopcntw-1.c
@@ -3,11 +3,10 @@
 /* { dg-require-effective-target avx512bitalg } */
 /* { dg-require-effective-target avx512bw } */
 
-#include "avx512f-helper.h"
-
 #define AVX512BITALG
 #define SIZE (AVX512F_LEN / 16)
 
+#include "avx512f-helper.h"
 #include "avx512f-mask-type.h"
 
 #define TYPE short

diff --git a/gcc/testsuite/gcc.target/i386/avx512bitalg-vpshufbitqmb-1.c b/gcc/testsuite/gcc.target/i386/avx512bitalg-vpshufbitqmb-1.c
index 727fb130ab581c2757afd4b7ae5ee448eebf4496..668064aa4e19a75eebe55c99def5796d0b303d78 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/avx512bitalg-vpshufbitqmb-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bitalg-vpshufbitqmb-1.c
@@ -2,11 +2,10 @@
 /* { dg-options "-O2 -mavx512bitalg -mavx512f -mavx512bw" } */
 /* { dg-require-effective-target avx512bitalg } */
 
-#include "avx512f-helper.h"
-
 #define AVX512BITALG
 #define SIZE (AVX512F_LEN / 8)
 
+#include "avx512f-helper.h"
 #include "avx512f-mask-type.h"
 
 #define TYPE unsigned long long

diff --git a/gcc/testsuite/gcc.target/i386/avx512vpopcntdq-vpopcntd-1.c b/gcc/testsuite/gcc.target/i386/avx512vpopcntdq-vpopcntd-1.c
index 4fb949fb4c3035b1e9a6f35ee3a745aacb0981ba..245dcd4d534b18218174eb42c969e80732c1bcf6 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/avx512vpopcntdq-vpopcntd-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vpopcntdq-vpopcntd-1.c
@@ -2,11 +2,10 @@
 /* { dg-options "-O2 -mavx512vpopcntdq" } */
 /* { dg-require-effective-target avx512vpopcntdq } */
 
-#include "avx512f-helper.h"
-
 #define AVX512VPOPCNTDQ
 #define SIZE (AVX512F_LEN / 32)
 
+#include "avx512f-helper.h"
 #include "avx512f-mask-type.h"
 
 #define TYPE int

diff --git a/gcc/testsuite/gcc.target/i386/avx512vpopcntdq-vpopcntq-1.c b/gcc/testsuite/gcc.target/i386/avx512vpopcntdq-vpopcntq-1.c
index cc0d8b8e0361db48fddbc344c651d0c249ddd515..27555c496d6d96fbf1fbcc764f160cc1b2abc833 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/avx512vpopcntdq-vpopcntq-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vpopcntdq-vpopcntq-1.c
@@ -2,11 +2,10 @@
 /* { dg-options "-O2 -mavx512vpopcntdq" } */
 /* { dg-require-effective-target avx512vpopcntdq } */
 
-#include "avx512f-helper.h"
-
 #define AVX512VPOPCNTDQ
 #define SIZE (AVX512F_LEN / 64)
 
+#include "avx512f-helper.h"
 #include "avx512f-mask-type.h"
 
 #define TYPE long long