From: Olga Makhotina <olga.makhotina@intel.com>
Date: Mon, 12 Feb 2018 06:14:15 +0000 (+0000)
Subject: Fix AVX-512 popcnt and bitalg tests.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c337f3612f66f7bcf716dc84a7be89e0344109cc;p=gcc.git

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 1a76336d0d0..a0bd3b22e4e 100644
--- 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 9847e2e04d3..3dcd48f7e2a 100644
--- 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 c2d5a79b330..4f866db2f7a 100644
--- 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 727fb130ab5..668064aa4e1 100644
--- 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 4fb949fb4c3..245dcd4d534 100644
--- 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 cc0d8b8e036..27555c496d6 100644
--- 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