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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ddcdb19fbf03d77c9f3df2ae82af2d5417fd41f1..6621de19a645efc4cc8d9268ef574f6e5dcb1bc5 100644 (file)
--- 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 2098f6456275c78980d792954e9312719dc21feb..01e35dcf96567d6de9d774cbf54b9ee65c836a15 100644 (file)
--- 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;
 }
 \f
-// 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 26cc566c7632a630f164515a7fffc7ca4e628c83..a3b6da7175709169879e9b9c3e969ac1860d1789 100644 (file)
--- 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 17501ebffe08d3004f892aff3367093a8d4a1d91..73e67974338760eee26e52dbf04d2ac1bb1a3a0a 100644 (file)
--- 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 9258e440bfdac8907c1774178db001baa2e1d74b..5cd4276577b89be5b001c64972f65192e4dba2fa 100644 (file)
--- 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 116dbaf7897d628720e0ee51d8c72469ce5c8cef..3593f869b6bc4452f996c47a9204dc6ad8a16592 100644 (file)
--- 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 f0d4ada680de4641c7486f13e1a808a6e17198ef..3f4d136171ae34d5efc694ea51d4714661e32375 100644 (file)
--- 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 f7b92c39affa8d52c48b49aa8ca9c6a85a955d0a..8cb09e0cf504c589e3387b8eed770a772af78f5f 100644 (file)
--- 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 8c44fad2d9816bbe9cb7147991ff8d2feea0abb9..fb13b20e142584cb1f880f390256f858bcf5c6c6 100644 (file)
--- 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 6e82d77fea1cd3f525f77172ef5fd5d4a00c578b..1a0ab79bd55754965499dd8f7faecd2e47f567f9 100644 (file)
--- 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)