This patch disables processing of conditional candidates in SLSR for the
time being, until I can sort out the cause of a related bootstrap
failure. Bootstrapped on powerpc64-unknown-linux-gnu with no
regressions; bootstrapped on i686-pc-linux-gnu to verify bootstrap now
works. Committed.
Thanks,
Bill
gcc:
2013-05-03 Bill Schmidt <wschm...@linux.vnet.ibm.com>
* gimple-ssa-strength-reduction.c (slsr_process_phi): Disable.
(find_candidates_in_block): Disable slsr_process_phi.
gcc/testsuite:
2013-05-03 Bill Schmidt <wschm...@linux.vnet.ibm.com>
* gcc.dg/tree-ssa/slsr-32.c: Skip test for now.
* 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.
Index: gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c (revision 198586)
+++ gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c (working copy)
@@ -3,6 +3,7 @@
/* { dg-do compile } */
/* { dg-options "-O3 -fdump-tree-optimized" } */
+/* { dg-skip-if "" { *-*-* } } */
int
f (int s, int c, int i)
Index: gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c (revision 198586)
+++ gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c (working copy)
@@ -3,6 +3,7 @@
/* { dg-do compile } */
/* { dg-options "-O3 -fdump-tree-optimized" } */
+/* { dg-skip-if "" { *-*-* } } */
int
f (int c, int i)
Index: gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c (revision 198586)
+++ gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c (working copy)
@@ -3,6 +3,7 @@
/* { dg-do compile } */
/* { dg-options "-O3 -fdump-tree-optimized" } */
+/* { dg-skip-if "" { *-*-* } } */
extern void
g (void);
Index: gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c (revision 198586)
+++ gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c (working copy)
@@ -4,6 +4,7 @@
/* { dg-do compile } */
/* { dg-options "-O3 -fdump-tree-optimized" } */
+/* { dg-skip-if "" { *-*-* } } */
int
f (int c, int i)
Index: gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c (revision 198586)
+++ gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c (working copy)
@@ -4,6 +4,7 @@
/* { dg-do compile } */
/* { dg-options "-O3 -fdump-tree-optimized" } */
+/* { dg-skip-if "" { *-*-* } } */
int
f (int s, int c, int i)
Index: gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c (revision 198586)
+++ gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c (working copy)
@@ -4,6 +4,7 @@
/* { dg-do compile } */
/* { dg-options "-O3 -fdump-tree-optimized" } */
+/* { dg-skip-if "" { *-*-* } } */
int
f (int s, int c, int i)
Index: gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c (revision 198586)
+++ gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c (working copy)
@@ -4,6 +4,7 @@
/* { dg-do compile } */
/* { dg-options "-O3 -fdump-tree-optimized" } */
+/* { dg-skip-if "" { *-*-* } } */
int
f (int c, int i)
Index: gcc/gimple-ssa-strength-reduction.c
===================================================================
--- gcc/gimple-ssa-strength-reduction.c (revision 198586)
+++ gcc/gimple-ssa-strength-reduction.c (working copy)
@@ -657,6 +657,9 @@ 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
@@ -747,6 +750,7 @@ 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:
@@ -1519,8 +1523,12 @@ find_candidates_in_block (struct dom_walk_data *wa
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))
{
