Fix some of vect-avg-*.c testcases

The vect-avg-*.c testcases are trying to make sure
the AVG internal function are used and not
doing promotion to `vector unsigned short`
but when V4QI is implemented, `vector(2) unsigned short`
shows up in the detail dump file and causes the failure.
To fix this checking the optimized dump instead of the vect dump
for `vector unsigned short` to make sure the vectorizer does not
do the promotion.

Built and tested for aarch64-linux-gnu.

gcc/testsuite/ChangeLog:

	* gcc.dg/vect/vect-avg-1.c: Check optimized dump
	for `vector *signed short` instead of the `vect` dump.
	* gcc.dg/vect/vect-avg-11.c: Likewise.
	* gcc.dg/vect/vect-avg-12.c: Likewise.
	* gcc.dg/vect/vect-avg-13.c: Likewise.
	* gcc.dg/vect/vect-avg-14.c: Likewise.
	* gcc.dg/vect/vect-avg-2.c: Likewise.
	* gcc.dg/vect/vect-avg-3.c: Likewise.
	* gcc.dg/vect/vect-avg-4.c: Likewise.
	* gcc.dg/vect/vect-avg-5.c: Likewise.
	* gcc.dg/vect/vect-avg-6.c: Likewise.
	* gcc.dg/vect/vect-avg-7.c: Likewise.
	* gcc.dg/vect/vect-avg-8.c: Likewise.

Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-1.c b/gcc/testsuite/gcc.dg/vect/vect-avg-1.c
index 4a752cd7d573cd53ea1a59dba0180d017a7f73a5..052903762c94a2265b5be192bc6ab4efbe262ecb 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-1.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #include "tree-vect.h"
 
@@ -44,5 +45,5 @@ main (void)
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_FLOOR} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-11.c b/gcc/testsuite/gcc.dg/vect/vect-avg-11.c
index 0046f8ceb4e7b2688059073645175b8845246346..e91be1175c9eda04f6c2427a028ba651dd38b90d 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-11.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-11.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #include "tree-vect.h"
 
@@ -54,5 +55,5 @@ main (void)
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_FLOOR} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-12.c b/gcc/testsuite/gcc.dg/vect/vect-avg-12.c
index f40331ea1bf91beaea7dc164e267760738a922d5..cc64c589535666886c4d21d42dc97fe2e15ad28f 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-12.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-12.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS signed
 
@@ -6,5 +7,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_FLOOR} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-13.c b/gcc/testsuite/gcc.dg/vect/vect-avg-13.c
index 7957c0e4adc3691f52cac02bed111591aeda9a24..ff55c01dc2274a386842adcaa3198c00695b38cf 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-13.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-13.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS unsigned
 #define BIAS 1
@@ -7,5 +8,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_CEIL} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-14.c b/gcc/testsuite/gcc.dg/vect/vect-avg-14.c
index 8ab11f74e942a7034b688e69071eceff4aa17b01..4161a08161c4c32cfb7a596944de9bc4ff7559d4 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-14.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-14.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS signed
 #define BIAS 1
@@ -7,5 +8,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_CEIL} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-2.c b/gcc/testsuite/gcc.dg/vect/vect-avg-2.c
index b5586b5f01309d278c91a8a81eac816a1503cdb2..a58122c9906dbb9c62f3a58064b485a25c3850d8 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-2.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS signed
 
@@ -6,5 +7,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_FLOOR} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-3.c b/gcc/testsuite/gcc.dg/vect/vect-avg-3.c
index 104fe9613937a21c7079d0e49a18da2e0b559d70..1ae689491e8775f7b01c88afa84b0a45caedc187 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-3.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS unsigned
 #define BIAS 1
@@ -7,5 +8,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_CEIL} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-4.c b/gcc/testsuite/gcc.dg/vect/vect-avg-4.c
index 92181d7fc3d9ffae96b58de24ed5298a6846ed06..87fb826a7fcc26b26ec3bdb43e4d92afa72331d7 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-4.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS signed
 #define BIAS 1
@@ -7,5 +8,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_CEIL} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-5.c b/gcc/testsuite/gcc.dg/vect/vect-avg-5.c
index 6bdaeff0d5ab4c55bb5cba1df51a85c4525be6fb..73dcb369c9ec63242f8967f6ec3ac26631407428 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-5.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #include "tree-vect.h"
 
@@ -48,5 +49,5 @@ main (void)
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_FLOOR} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-6.c b/gcc/testsuite/gcc.dg/vect/vect-avg-6.c
index efe97b8a5f1ce482c28042354e20293d0ecfc932..2cf48a4cd34a922d02c5725128874c3b585a971d 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-6.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS signed
 
@@ -6,5 +7,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_FLOOR} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-7.c b/gcc/testsuite/gcc.dg/vect/vect-avg-7.c
index 62a8474f690a927d80832c4a95af0118407224ec..365ce7a3f7b5b0b7ce7e7afae2111fac1e3e4891 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-7.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS unsigned
 #define BIAS 1
@@ -7,5 +8,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_CEIL} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-avg-8.c b/gcc/testsuite/gcc.dg/vect/vect-avg-8.c
index cc7c4cde6b036b9820a52e12710daadb05135fa0..b8e4c04b068057c337d297fde3b70a0d6e1b6e97 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-avg-8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-avg-8.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 #define SIGNEDNESS signed
 #define BIAS 1
@@ -7,5 +8,5 @@
 
 /* { dg-final { scan-tree-dump "vect_recog_average_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump {\.AVG_CEIL} "vect" { target vect_avg_qi } } } */
-/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "vect" { target vect_avg_qi } } } */
+/* { dg-final { scan-tree-dump-not {vector\([^\n]*short} "optimized" { target vect_avg_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { target vect_avg_qi } } } */