+2007-10-19 Sebastian Pop <sebastian.pop@amd.com>
+
+ PR tree-optimization/23820
+ PR tree-optimization/24309
+ PR tree-optimization/33766
+ * testsuite/gcc.dg/tree-ssa/pr23820.c: New.
+ * testsuite/gcc.dg/tree-ssa/pr24309.c: New.
+ * testsuite/gcc.dg/tree-ssa/pr33766.c: New.
+ * testsuite/gcc.dg/tree-ssa/ltrans-3.c: XFAILed.
+ * tree-loop-linear.c (perfect_loop_nest_depth): New.
+ (linear_transform_loops): Use perfect_loop_nest_depth.
+ * lambda-code.c (perfect_nest_p): Outer loops in perfect nests
+ should have a single condition: their exit.
+
2007-10-19 Richard Guenther <rguenther@suse.de>
PR middle-end/33816
size_t i;
tree exit_cond;
+ /* Loops at depth 0 are perfect nests. */
if (!loop->inner)
return true;
+
bbs = get_loop_body (loop);
exit_cond = get_loop_exit_condition (loop);
+
for (i = 0; i < loop->num_nodes; i++)
{
if (bbs[i]->loop_father == loop)
{
block_stmt_iterator bsi;
+
for (bsi = bsi_start (bbs[i]); !bsi_end_p (bsi); bsi_next (&bsi))
{
tree stmt = bsi_stmt (bsi);
+
+ if (TREE_CODE (stmt) == COND_EXPR
+ && exit_cond != stmt)
+ goto non_perfectly_nested;
+
if (stmt == exit_cond
|| not_interesting_stmt (stmt)
|| stmt_is_bumper_for_loop (loop, stmt))
continue;
+
+ non_perfectly_nested:
free (bbs);
return false;
}
}
}
+
free (bbs);
- /* See if the inner loops are perfectly nested as well. */
- if (loop->inner)
- return perfect_nest_p (loop->inner);
- return true;
+
+ return perfect_nest_p (loop->inner);
}
/* Replace the USES of X in STMT, or uses with the same step as X with Y.
return trans;
}
+/* Return the number of nested loops in LOOP_NEST, or 0 if the loops
+ are not perfectly nested. */
+
+static unsigned int
+perfect_loop_nest_depth (struct loop *loop_nest)
+{
+ struct loop *temp;
+ unsigned int depth = 1;
+
+ /* If it's not a loop nest, we don't want it. We also don't handle
+ sibling loops properly, which are loops of the following form:
+
+ | for (i = 0; i < 50; i++)
+ | {
+ | for (j = 0; j < 50; j++)
+ | {
+ | ...
+ | }
+ | for (j = 0; j < 50; j++)
+ | {
+ | ...
+ | }
+ | }
+ */
+
+ if (!loop_nest->inner || !single_exit (loop_nest))
+ return 0;
+
+ for (temp = loop_nest->inner; temp; temp = temp->inner)
+ {
+ /* If we have a sibling loop or multiple exit edges, jump ship. */
+ if (temp->next || !single_exit (temp))
+ return 0;
+
+ depth++;
+ }
+
+ return depth;
+}
+
/* Perform a set of linear transforms on loops. */
void
unsigned int depth = 0;
VEC (ddr_p, heap) *dependence_relations;
VEC (data_reference_p, heap) *datarefs;
- struct loop *temp;
lambda_loopnest before, after;
lambda_trans_matrix trans;
- bool problem = false;
struct obstack lambda_obstack;
gcc_obstack_init (&lambda_obstack);
- /* If it's not a loop nest, we don't want it.
- We also don't handle sibling loops properly,
- which are loops of the following form:
- for (i = 0; i < 50; i++)
- {
- for (j = 0; j < 50; j++)
- {
- ...
- }
- for (j = 0; j < 50; j++)
- {
- ...
- }
- } */
- if (!loop_nest->inner || !single_exit (loop_nest))
+ depth = perfect_loop_nest_depth (loop_nest);
+ if (depth == 0)
continue;
+
VEC_truncate (tree, oldivs, 0);
VEC_truncate (tree, invariants, 0);
- depth = 1;
- for (temp = loop_nest->inner; temp; temp = temp->inner)
- {
- /* If we have a sibling loop or multiple exit edges, jump ship. */
- if (temp->next || !single_exit (temp))
- {
- problem = true;
- break;
- }
- depth ++;
- }
- if (problem)
- continue;
- /* Analyze data references and dependence relations using scev. */
-
datarefs = VEC_alloc (data_reference_p, heap, 10);
dependence_relations = VEC_alloc (ddr_p, heap, 10 * 10);
compute_data_dependences_for_loop (loop_nest, true, &datarefs,