#include "irdump.h"
+/* A variant of the loop tree that avoids loops without head.
+ This reduces the depth of the loop tree. */
+#define NO_LOOPS_WITHOUT_HEAD 1
+
+
INLINE void add_loop_son(ir_loop *loop, ir_loop *son);
INLINE void add_loop_node(ir_loop *loop, ir_node *n);
static ir_graph *outermost_ir_graph; /* The outermost graph the scc is computed
- for */
+ for */
static ir_loop *current_loop; /* Current loop construction is working
- on. */
+ on. */
static int loop_node_cnt = 0; /* Counts the number of allocated loop nodes.
- Each loop node gets a unique number.
- What for? ev. remove. @@@ */
+ Each loop node gets a unique number.
+ What for? ev. remove. @@@ */
static int current_dfn = 1; /* Counter to generate depth first numbering
- of visited nodes. */
+ of visited nodes. */
+
+static int max_loop_depth = 0;
void link_to_reg_end (ir_node *n, void *env);
void set_projx_link(ir_node *cb_projx, ir_node *end_projx);
son->outer_loop = father;
add_loop_son(father, son);
son->depth = father->depth+1;
+ if (son->depth > max_loop_depth) max_loop_depth = son->depth;
} else { /* The root loop */
son->outer_loop = son;
son->depth = 0;
(get_irn_op(cb) == op_EndReg) ||
(get_irn_op(cb) == op_EndExcept)) {
init_node(cb, NULL);
- init_node(get_nodes_Block(cb), NULL);
+ init_node(get_nodes_block(cb), NULL);
}
}
#endif
if ((get_irn_op(n) == op_Block) &&
(get_Block_n_cfgpreds(n) == 1) &&
(get_irn_op(skip_Proj(get_Block_cfgpred(n, 0))) == op_Start) &&
- (get_nodes_Block(skip_Proj(get_Block_cfgpred(n, 0))) == n)) {
+ (get_nodes_block(skip_Proj(get_Block_cfgpred(n, 0))) == n)) {
return true;
}
#if 0
if (get_irn_op(n) == op_Phi ||
get_irn_op(n) == op_Block ||
(get_irn_op(n) == op_Filter && interprocedural_view) ||
- (get_irg_pinned(get_irn_irg(n)) == floats &&
- get_op_pinned(get_irn_op(n)) == floats))
+ (get_irg_pinned(get_irn_irg(n)) == op_pin_state_floats &&
+ get_irn_pinned(n) == op_pin_state_floats))
// Here we could test for backedge at -1 which is illegal
return 0;
else
if (res_index == -2) /* no smallest dfn pred found. */
res_index = largest_dfn_pred (m);
- if ((m == n) && (res_index == -2)) {
+ if ((m == n) && (res_index == -2)) { /* dont walk past loop head. */
i = -1;
}
break;
int arity = get_irn_arity(start_block);
for(j = 0; j < arity; j++)
{
- ir_node *begin_projx = get_Block_cfgpred(get_irg_start_block(get_irn_irg(end_projx)), get_Proj_proj(end_projx));
+ ir_node *begin_projx = get_Block_cfgpred(get_irg_start_block(get_irn_irg(end_projx)),
+ get_Proj_proj(end_projx));
DDMN(begin_projx);
if(get_irn_n(start_block, j) == begin_projx)
{
static pmap *projx_link = NULL;
void link_to_reg_end (ir_node *n, void *env) {
- if(get_irn_op(n) == op_Proj && get_irn_mode(n) == mode_X && get_irn_op(get_irn_n(n, 0)) == op_EndReg)
- {
+ if(get_irn_op(n) == op_Proj &&
+ get_irn_mode(n) == mode_X &&
+ get_irn_op(get_irn_n(n, 0)) == op_EndReg) {
/* Reg End Projx -> Find the CallBegin Projx and hash it */
ir_node *end_projx = n;
- ir_node *begin_projx = get_Block_cfgpred(get_irg_start_block(get_irn_irg(end_projx)), get_Proj_proj(end_projx));
+ ir_node *begin_projx = get_Block_cfgpred(get_irg_start_block(get_irn_irg(end_projx)),
+ get_Proj_proj(end_projx));
printf("Linked the following ProjxNodes:\n");
DDMN(begin_projx);
DDMN(end_projx);
#endif
+INLINE static int
+is_outermost_loop(ir_loop *l) {
+ return l == get_loop_outer_loop(l);
+}
/*-----------------------------------------------------------*
Next actions: Open a new loop on the loop tree and
try to find inner loops */
-#define NO_LOOPS_WITHOUT_HEAD 1
#if NO_LOOPS_WITHOUT_HEAD
/* This is an adaption of the algorithm from fiasco / optscc to
* avoid loops without Block or Phi as first node. This should
* severely reduce the number of evaluations of nodes to detect
* a fixpoint in the heap analysis.
* Further it avoids loops without firm nodes that cause errors
- * in the heap analyses. */
+ * in the heap analyses.
+ * But attention: don't do it for the outermost loop: This loop
+ * is not iterated. A first block can be a loop head in case of
+ * an endless recursion. */
ir_loop *l;
int close;
- if (get_loop_n_elements(current_loop) > 0) {
+ if ((get_loop_n_elements(current_loop) > 0) || (is_outermost_loop(current_loop))) {
l = new_loop();
close = 1;
} else {
Next actions: Open a new loop on the loop tree and
try to find inner loops */
-#define NO_LOOPS_WITHOUT_HEAD 1
#if NO_LOOPS_WITHOUT_HEAD
/* This is an adaption of the algorithm from fiasco / optscc to
* avoid loops without Block or Phi as first node. This should
ir_loop *l;
int close;
- if (get_loop_n_elements(current_loop) > 0) {
+ if ((get_loop_n_elements(current_loop) > 0) || (is_outermost_loop(current_loop))) {
l = new_loop();
close = 1;
} else {
/* Constructs backedge information for irg. In interprocedural view constructs
backedges for all methods called by irg, too. */
-void construct_backedges(ir_graph *irg) {
+int construct_backedges(ir_graph *irg) {
ir_graph *rem = current_ir_graph;
ir_loop *head_rem;
assert(!interprocedural_view &&
"not implemented, use construct_ip_backedges");
+ max_loop_depth = 0;
current_ir_graph = irg;
outermost_ir_graph = irg;
new_loop(); /* sets current_loop */
head_rem = current_loop; /* Just for assertion */
- if (interprocedural_view) {
- set_irg_visited(current_ir_graph, inc_max_irg_visited());
- init_ip_walk ();
- } else {
- inc_irg_visited(current_ir_graph);
- }
+ inc_irg_visited(current_ir_graph);
scc(get_irg_end(current_ir_graph));
- if (interprocedural_view) finish_ip_walk();
-
assert(head_rem == current_loop);
set_irg_loop(current_ir_graph, current_loop);
set_irg_loopinfo_state(current_ir_graph, loopinfo_consistent);
}
*/
current_ir_graph = rem;
-}
-
-
-#if 0
-void construct_ip_backedges (void) {
- ir_graph *rem = current_ir_graph;
- int rem_ipv = interprocedural_view;
- int i, j;
-
- outermost_ir_graph = get_irp_main_irg();
-
- init_ip_scc();
-
- current_loop = NULL;
- new_loop(); /* sets current_loop */
- interprocedural_view = 1;
-
- inc_max_irg_visited();
- for (i = 0; i < get_irp_n_irgs(); i++)
- set_irg_visited(get_irp_irg(i), get_max_irg_visited());
- for (i = 0; i < get_irp_n_irgs(); i++) {
- ir_node *sb;
- current_ir_graph = get_irp_irg(i);
- /* Find real entry points */
- sb = get_irg_start_block(current_ir_graph);
- if ((get_Block_n_cfgpreds(sb) > 1) ||
- (get_nodes_Block(get_Block_cfgpred(sb, 0)) != sb)) continue;
- /* Compute scc for this graph */
- outermost_ir_graph = current_ir_graph;
- set_irg_visited(outermost_ir_graph, get_max_irg_visited());
- scc(get_irg_end(current_ir_graph));
- for (j = 0; j < get_End_n_keepalives(get_irg_end(outermost_ir_graph)); j++)
- scc(get_End_keepalive(get_irg_end(outermost_ir_graph), j));
- }
+ return max_loop_depth;
+}
- set_irg_loop(outermost_ir_graph, current_loop);
- set_irg_loopinfo_state(current_ir_graph, loopinfo_ip_consistent);
- assert(get_irg_loop(outermost_ir_graph)->kind == k_ir_loop);
- current_ir_graph = rem;
- interprocedural_view = rem_ipv;
-}
-#else
-void construct_ip_backedges (void) {
+int construct_ip_backedges (void) {
ir_graph *rem = current_ir_graph;
int rem_ipv = interprocedural_view;
int i;
+ max_loop_depth = 0;
assert(get_irp_ip_view_state() == ip_view_valid);
outermost_ir_graph = get_irp_main_irg();
current_ir_graph = rem;
interprocedural_view = rem_ipv;
+ return max_loop_depth;
}
-#endif
+
void my_construct_ip_backedges (void) {
ir_graph *rem = current_ir_graph;
int rem_ipv = interprocedural_view;
projects / libfirm / blobdiff