gimple-ssa-strength-reduction.c (slsr_process_phi): Re-enable.

gcc:

2013-05-06  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>

	* gimple-ssa-strength-reduction.c (slsr_process_phi): Re-enable.
	(find_candidates_in_block): Re-enable slsr_process_phi.
	(create_phi_basis): Fix double counting of candidate adjustment.

gcc/testsuite:

2013-05-06  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>

	* gcc.dg/tree-ssa/slsr-32.c: Re-enable.
	* gcc.dg/tree-ssa/slsr-33.c: Likewise.
	* gcc.dg/tree-ssa/slsr-34.c: Likewise.
	* gcc.dg/tree-ssa/slsr-35.c: Likewise.
	* gcc.dg/tree-ssa/slsr-36.c: Likewise.
	* gcc.dg/tree-ssa/slsr-37.c: Likewise.
	* gcc.dg/tree-ssa/slsr-38.c: Likewise.

From-SVN: r198627

10 files changed, 18 insertions, 17 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ddcdb19..6621de1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-06  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+
+	* gimple-ssa-strength-reduction.c (slsr_process_phi): Re-enable.
+	(find_candidates_in_block): Re-enable slsr_process_phi.
+	(create_phi_basis): Fix double counting of candidate adjustment.
+
 2013-05-06  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/57147
diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index 2098f64..01e35dc 100644
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -657,9 +657,6 @@ add_cand_for_stmt (gimple gs, slsr_cand_t c)
   *slot = c;
 }
 
-// FORNOW: Disable conditional candidate processing until bootstrap
-// issue can be sorted out for i686-pc-linux-gnu.
-#if 0
 /* Given PHI which contains a phi statement, determine whether it
    satisfies all the requirements of a phi candidate.  If so, create
    a candidate.  Note that a CAND_PHI never has a basis itself, but
@@ -750,7 +747,6 @@ slsr_process_phi (gimple phi, bool speed)
   /* Add the candidate to the statement-candidate mapping.  */
   add_cand_for_stmt (phi, c);
 }
-#endif
 
 /* Look for the following pattern:
 
@@ -1523,12 +1519,8 @@ find_candidates_in_block (struct dom_walk_data *walk_data ATTRIBUTE_UNUSED,
   bool speed = optimize_bb_for_speed_p (bb);
   gimple_stmt_iterator gsi;
 
-// FORNOW: Disable conditional candidate processing until bootstrap
-// issue can be sorted out for i686-pc-linux-gnu.
-#if 0
   for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi))
     slsr_process_phi (gsi_stmt (gsi), speed);
-#endif
 
   for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
     {
@@ -2098,7 +2090,7 @@ create_phi_basis (slsr_cand_t c, gimple from_phi, tree basis_name,
 	  feeding_def = gimple_assign_lhs (basis->cand_stmt);
 	else
 	  {
-	    double_int incr = c->index - basis->index;
+	    double_int incr = -basis->index;
 	    feeding_def = create_add_on_incoming_edge (c, basis_name, incr,
 						       e, loc, known_stride);
 	  }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 26cc566..a3b6da7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,14 @@
-2013-05-03  Teresa Johnson  <tejohnson@google.com>
+2013-05-06  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+
+	* gcc.dg/tree-ssa/slsr-32.c: Re-enable.
+	* gcc.dg/tree-ssa/slsr-33.c: Likewise.
+	* gcc.dg/tree-ssa/slsr-34.c: Likewise.
+	* gcc.dg/tree-ssa/slsr-35.c: Likewise.
+	* gcc.dg/tree-ssa/slsr-36.c: Likewise.
+	* gcc.dg/tree-ssa/slsr-37.c: Likewise.
+	* gcc.dg/tree-ssa/slsr-38.c: Likewise.
+
+2013-05-06  Teresa Johnson  <tejohnson@google.com>
 
 	PR bootstrap/57154
 	* gcc.dg/pr57154.c: New test.
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c
index 17501eb..73e6797 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c
@@ -3,7 +3,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3 -fdump-tree-optimized" } */
-/* { dg-skip-if "" { *-*-* } } */
 
 int
 f (int s, int c, int i)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c
index 9258e44..5cd4276 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c
@@ -3,7 +3,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3 -fdump-tree-optimized" } */
-/* { dg-skip-if "" { *-*-* } } */
 
 int
 f (int c, int i)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c
index 116dbaf..3593f86 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c
@@ -3,7 +3,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3 -fdump-tree-optimized" } */
-/* { dg-skip-if "" { *-*-* } } */
 
 extern void
 g (void);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c
index f0d4ada..3f4d136 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c
@@ -4,7 +4,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3 -fdump-tree-optimized" } */
-/* { dg-skip-if "" { *-*-* } } */
 
 int
 f (int c, int i)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c
index f7b92c3..8cb09e0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c
@@ -4,7 +4,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3 -fdump-tree-optimized" } */
-/* { dg-skip-if "" { *-*-* } } */
 
 int
 f (int s, int c, int i)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c
index 8c44fad..fb13b20 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c
@@ -4,7 +4,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3 -fdump-tree-optimized" } */
-/* { dg-skip-if "" { *-*-* } } */
 
 int
 f (int s, int c, int i)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c
index 6e82d77..1a0ab79 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c
@@ -4,7 +4,6 @@
 
 /* { dg-do compile } */
 /* { dg-options "-O3 -fdump-tree-optimized" } */
-/* { dg-skip-if "" { *-*-* } } */
 
 int
 f (int c, int i)