From 5d1a5a53783dbfe3e1b9697f1dad4c685cf503c7 Mon Sep 17 00:00:00 2001
From: Cong Hou <congh@google.com>
Date: Wed, 9 Apr 2014 07:37:14 -0400
Subject: [PATCH] re PR testsuite/60773 (FAIL: gcc.dg/vect/pr60656.c -flto
 -ffat-lto-objects  scan-tree-dump-times vect "vectorized 1 loops" 1)

2014-04-09  Cong Hou  <congh@google.com>

	PR testsuite/60773
	* doc/sourcebuild.texi (vect_widen_mult_si_to_di_pattern): Add
	documentation.

	* lib/target-supports.exp:
	(check_effective_target_vect_widen_si_to_di_pattern): New.
	* gcc.dg/vect/pr60656.c: Require vect_long effective target.
	Use scan-tree-dump-times for vect_widen_mult_si_to_di_pattern
	targets only.
	(foo): Fix up formatting.
	(main): Call check_vect.

From-SVN: r209241
---
 gcc/ChangeLog                         |  6 ++++++
 gcc/doc/sourcebuild.texi              |  4 ++++
 gcc/testsuite/ChangeLog               | 11 +++++++++++
 gcc/testsuite/gcc.dg/vect/pr60656.c   | 10 ++++++----
 gcc/testsuite/lib/target-supports.exp | 21 +++++++++++++++++++++
 5 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afc90799640d..5803746de11f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-09  Cong Hou  <congh@google.com>
+
+	PR testsuite/60773
+	* doc/sourcebuild.texi (vect_widen_mult_si_to_di_pattern): Add
+	documentation.
+
 2014-04-08  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	* config/rs6000/rs6000.c (rs6000_expand_vector_set): Use vnand
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index 85ef819c7675..914860813ca0 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -1428,6 +1428,10 @@ Target supports a vector widening multiplication of @code{short} operands
 into @code{int} results, or can promote (unpack) from @code{short} to
 @code{int} and perform non-widening multiplication of @code{int}.
 
+@item vect_widen_mult_si_to_di_pattern
+Target supports a vector widening multiplication of @code{int} operands
+into @code{long} results.
+
 @item vect_sdot_qi
 Target supports a vector dot-product of @code{signed char}.
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 86a3f29acc35..4255e5175a6e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2014-04-09  Cong Hou  <congh@google.com>
+
+	PR testsuite/60773
+	* lib/target-supports.exp:
+	(check_effective_target_vect_widen_si_to_di_pattern): New.
+	* gcc.dg/vect/pr60656.c: Require vect_long effective target.
+	Use scan-tree-dump-times for vect_widen_mult_si_to_di_pattern
+	targets only.
+	(foo): Fix up formatting.
+	(main): Call check_vect.
+
 2014-04-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/59115
diff --git a/gcc/testsuite/gcc.dg/vect/pr60656.c b/gcc/testsuite/gcc.dg/vect/pr60656.c
index ebaab62b97c3..4950275fb871 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60656.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60656.c
@@ -1,4 +1,5 @@
 /* { dg-require-effective-target vect_int } */
+/* { dg-require-effective-target vect_long } */
 
 #include "tree-vect.h"
 
@@ -12,7 +13,7 @@ foo ()
   for(i = 0; i < 4; ++i)
     {
       long P = v[i];
-      s += P*P*P;
+      s += P * P * P;
     }
   return s;
 }
@@ -27,7 +28,7 @@ bar ()
   for(i = 0; i < 4; ++i)
     {
       long P = v[i];
-      s += P*P*P;
+      s += P * P * P;
       __asm__ volatile ("");
     }
   return s;
@@ -35,11 +36,12 @@ bar ()
 
 int main()
 {
+  check_vect ();
+
   if (foo () != bar ())
     abort ();
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_si_to_di_pattern } } } */
 /* { dg-final { cleanup-tree-dump "vect" } } */
-
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 1a5c2fa1b972..f81663a8e619 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -3738,6 +3738,27 @@ proc check_effective_target_vect_widen_mult_hi_to_si_pattern { } {
     return $et_vect_widen_mult_hi_to_si_pattern_saved
 }
 
+# Return 1 if the target plus current options supports a vector
+# widening multiplication of *int* args into *long* result, 0 otherwise.
+#
+# This won't change for different subtargets so cache the result.
+
+proc check_effective_target_vect_widen_mult_si_to_di_pattern { } {
+    global et_vect_widen_mult_si_to_di_pattern
+
+    if [info exists et_vect_widen_mult_si_to_di_pattern_saved] {
+        verbose "check_effective_target_vect_widen_mult_si_to_di_pattern: using cached result" 2
+    } else {
+        if {[istarget ia64-*-*]
+              || [istarget i?86-*-*]
+	      || [istarget x86_64-*-*] } {
+            set et_vect_widen_mult_si_to_di_pattern_saved 1
+        }
+    }
+    verbose "check_effective_target_vect_widen_mult_si_to_di_pattern: returning $et_vect_widen_mult_si_to_di_pattern_saved" 2
+    return $et_vect_widen_mult_si_to_di_pattern_saved
+}
+
 # Return 1 if the target plus current options supports a vector
 # widening shift, 0 otherwise.
 #
-- 
GitLab