From e7029027d04ede583d186f3f9dafedb8a885b249 Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Mon, 14 Jan 2008 08:55:43 +0000 Subject: [PATCH] - fixed some memory leaks by maturing the generated loops (putting flexiple arrays onto obstack) - allocating helper data an additional obstack that can be easily freed - fixed indentation [r17366] --- ir/ana/ircfscc.c | 1045 +++++++++++++++++++++++----------------------- 1 file changed, 526 insertions(+), 519 deletions(-) diff --git a/ir/ana/ircfscc.c b/ir/ana/ircfscc.c index 81a0bef5e..a8219fa01 100644 --- a/ir/ana/ircfscc.c +++ b/ir/ana/ircfscc.c @@ -45,19 +45,21 @@ #define NO_CFLOOPS_WITHOUT_HEAD 1 -static ir_graph *outermost_ir_graph; /* The outermost graph the scc is computed - for */ -static ir_loop *current_loop; /* Current cfloop construction is working - on. */ -static int loop_node_cnt = 0; /* Counts the number of allocated cfloop nodes. - Each cfloop node gets a unique number. - What for? ev. remove. @@@ */ -static int current_dfn = 1; /* Counter to generate depth first numbering - of visited nodes. */ +/** The outermost graph the scc is computed for */ +static ir_graph *outermost_ir_graph; +/** Current cfloop construction is working on. */ +static ir_loop *current_loop; +/** Counts the number of allocated cfloop nodes. + * Each cfloop node gets a unique number. + * @todo What for? ev. remove. + */ +static int loop_node_cnt = 0; +/** Counter to generate depth first numbering of visited nodes. */ +static int current_dfn = 1; static int max_loop_depth = 0; -void link_to_reg_end (ir_node *n, void *env); +void link_to_reg_end(ir_node *n, void *env); /**********************************************************************/ /* Node attributes **/ @@ -72,185 +74,172 @@ void link_to_reg_end (ir_node *n, void *env); * construction. */ typedef struct scc_info { - int in_stack; /**< Marks whether node is on the stack. */ - int dfn; /**< Depth first search number. */ - int uplink; /**< dfn number of ancestor. */ + int in_stack; /**< Marks whether node is on the stack. */ + int dfn; /**< Depth first search number. */ + int uplink; /**< dfn number of ancestor. */ } scc_info; -/** Allocate a new scc_info on the obstack of the outermost graph */ -static INLINE scc_info *new_scc_info(void) { - scc_info *info = obstack_alloc (outermost_ir_graph->obst, sizeof (scc_info)); - memset (info, 0, sizeof (scc_info)); - return info; +/** Allocate a new scc_info on the given obstack */ +static INLINE scc_info *new_scc_info(struct obstack *obst) { + scc_info *info = obstack_alloc(obst, sizeof(*info)); + memset(info, 0, sizeof(*info)); + return info; } /** * Marks the node n to be on the stack. */ -static INLINE void -mark_irn_in_stack (ir_node *n) { - scc_info *info = get_irn_link(n); - info->in_stack = 1; +static INLINE void mark_irn_in_stack(ir_node *n) { + scc_info *info = get_irn_link(n); + info->in_stack = 1; } /** * Marks the node n to be not on the stack. */ -static INLINE void -mark_irn_not_in_stack (ir_node *n) { - scc_info *info = get_irn_link(n); - info->in_stack = 0; +static INLINE void mark_irn_not_in_stack(ir_node *n) { + scc_info *info = get_irn_link(n); + info->in_stack = 0; } /** * Returns whether node n is on the stack. */ -static INLINE int -irn_is_in_stack (ir_node *n) { - scc_info *info = get_irn_link(n); - return info->in_stack; +static INLINE int irn_is_in_stack(ir_node *n) { + scc_info *info = get_irn_link(n); + return info->in_stack; } /** * Sets node n uplink value. */ -static INLINE void -set_irn_uplink (ir_node *n, int uplink) { - scc_info *info = get_irn_link(n); - info->uplink = uplink; +static INLINE void set_irn_uplink(ir_node *n, int uplink) { + scc_info *info = get_irn_link(n); + info->uplink = uplink; } /** * Return node n uplink value. */ -static INLINE int -get_irn_uplink (ir_node *n) { - scc_info *info = get_irn_link(n); - return info->uplink; +static INLINE int get_irn_uplink(ir_node *n) { + scc_info *info = get_irn_link(n); + return info->uplink; } /** * Sets node n dfn value. */ -static INLINE void -set_irn_dfn (ir_node *n, int dfn) { - scc_info *info = get_irn_link(n); - info->dfn = dfn; +static INLINE void set_irn_dfn(ir_node *n, int dfn) { + scc_info *info = get_irn_link(n); + info->dfn = dfn; } /** * Returns node n dfn value. */ -static INLINE int -get_irn_dfn (ir_node *n) { - scc_info *info = get_irn_link(n); - return info->dfn; +static INLINE int get_irn_dfn(ir_node *n) { + scc_info *info = get_irn_link(n); + return info->dfn; } /**********************************************************************/ /* A stack. **/ /**********************************************************************/ -static ir_node **stack = NULL; /**< An IR-node stack */ -static int tos = 0; /**< The top (index) of the IR-node stack */ +/** An IR-node stack */ +static ir_node **stack = NULL; +/** The top (index) of the IR-node stack */ +static int tos = 0; /** * Initializes the IR-node stack */ static INLINE void init_stack(void) { - if (stack) { - ARR_RESIZE(ir_node *, stack, 1000); - } else { - stack = NEW_ARR_F(ir_node *, 1000); - } - tos = 0; + if (stack) { + ARR_RESIZE(ir_node *, stack, 1000); + } else { + stack = NEW_ARR_F(ir_node *, 1000); + } + tos = 0; } /** * Push a node n onto the IR-node stack. */ -static INLINE void -push (ir_node *n) -{ - if (tos == ARR_LEN(stack)) { - int nlen = ARR_LEN(stack) * 2; - ARR_RESIZE(ir_node *, stack, nlen); - } - stack[tos++] = n; - mark_irn_in_stack(n); +static INLINE void push(ir_node *n) { + if (tos == ARR_LEN(stack)) { + int nlen = ARR_LEN(stack) * 2; + ARR_RESIZE(ir_node *, stack, nlen); + } + stack[tos++] = n; + mark_irn_in_stack(n); } /** * Pop a node from the IR-node stack and return it. */ -static INLINE ir_node * -pop (void) -{ - ir_node *n = stack[--tos]; - mark_irn_not_in_stack(n); - return n; +static INLINE ir_node *pop(void) { + ir_node *n = stack[--tos]; + mark_irn_not_in_stack(n); + return n; } /** * The nodes from tos up to n belong to the current loop. * Removes them from the stack and adds them to the current loop. */ -static INLINE void -pop_scc_to_loop(ir_node *n) -{ - ir_node *m; +static INLINE void pop_scc_to_loop(ir_node *n) { + ir_node *m; - /*for (;;) {*/ - do { - m = pop(); - loop_node_cnt++; - set_irn_dfn(m, loop_node_cnt); - add_loop_node(current_loop, m); - set_irn_loop(m, current_loop); - /* if (m==n) break;*/ - } while(m != n); + do { + m = pop(); + loop_node_cnt++; + set_irn_dfn(m, loop_node_cnt); + add_loop_node(current_loop, m); + set_irn_loop(m, current_loop); + } while (m != n); } /* GL ??? my last son is my grandson??? Removes cfloops with no ir_nodes in them. Such loops have only another loop as son. (Why can't they have two loops as sons? Does it never get that far? ) */ -static void close_loop (ir_loop *l) -{ - int last = get_loop_n_elements(l) - 1; - loop_element lelement = get_loop_element(l, last); - ir_loop *last_son = lelement.son; +static void close_loop(ir_loop *l) { + int last = get_loop_n_elements(l) - 1; + loop_element lelement = get_loop_element(l, last); + ir_loop *last_son = lelement.son; + + if (get_kind(last_son) == k_ir_loop && + get_loop_n_elements(last_son) == 1) { + ir_loop *gson; - if (get_kind(last_son) == k_ir_loop && - get_loop_n_elements(last_son) == 1) { - ir_loop *gson; + lelement = get_loop_element(last_son, 0); + gson = lelement.son; + if (get_kind(gson) == k_ir_loop) { + loop_element new_last_son; - lelement = get_loop_element(last_son, 0); - gson = lelement.son; - if(get_kind(gson) == k_ir_loop) { - loop_element new_last_son; + gson->outer_loop = l; + new_last_son.son = gson; + l->children[last] = new_last_son; - gson -> outer_loop = l; - new_last_son.son = gson; - l -> children[last] = new_last_son; - } - } + /* the loop last_son is dead now, recover at least some memory */ + DEL_ARR_F(last_son->children); + } + } - current_loop = l; + current_loop = l; } /** * Removes and unmarks all nodes up to n from the stack. * The nodes must be visited once more to assign them to a scc. */ -static INLINE void -pop_scc_unmark_visit (ir_node *n) -{ - ir_node *m; +static INLINE void pop_scc_unmark_visit(ir_node *n) { + ir_node *m; - do { - m = pop(); - set_irn_visited(m, 0); - } while (m != n); + do { + m = pop(); + set_irn_visited(m, 0); + } while (m != n); } /**********************************************************************/ @@ -260,36 +249,37 @@ pop_scc_unmark_visit (ir_node *n) /** * Allocates a new loop as son of current_loop. Sets current_loop * to the new loop and returns its father. + * The loop is allocated on the outermost_ir_graphs's obstack. */ -static ir_loop *new_loop (void) { - ir_loop *father, *son; - - father = current_loop; - - son = obstack_alloc(outermost_ir_graph->obst, sizeof(*son)); - memset(son, 0, sizeof(*son)); - son->kind = k_ir_loop; - son->children = NEW_ARR_F(loop_element, 0); - son->n_nodes = 0; - son->n_sons = 0; - if (father) { - 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; - } +static ir_loop *new_loop(void) { + ir_loop *father, *son; + + father = current_loop; + + son = obstack_alloc(outermost_ir_graph->obst, sizeof(*son)); + memset(son, 0, sizeof(*son)); + son->kind = k_ir_loop; + son->children = NEW_ARR_F(loop_element, 0); + son->n_nodes = 0; + son->n_sons = 0; + if (father) { + 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; + } #ifdef DEBUG_libfirm - son->loop_nr = get_irp_new_node_nr(); - son->link = NULL; + son->loop_nr = get_irp_new_node_nr(); + son->link = NULL; #endif - current_loop = son; - return father; + current_loop = son; + return father; } /**********************************************************************/ @@ -303,46 +293,41 @@ static ir_loop *new_loop (void) { * Clear the backedges for all nodes. * Called from a walker. */ -static INLINE void -init_node (ir_node *n, void *env) -{ - (void) env; - if (is_Block(n)) - set_irn_link (n, new_scc_info()); - clear_backedges(n); +static INLINE void init_node(ir_node *n, void *env) { + struct obstack *obst = env; + if (is_Block(n)) + set_irn_link(n, new_scc_info(obst)); + clear_backedges(n); } /** * Initializes the common global settings for the scc algorithm */ -static INLINE void -init_scc_common (void) { - current_dfn = 1; - loop_node_cnt = 0; - init_stack(); +static INLINE void init_scc_common(void) { + current_dfn = 1; + loop_node_cnt = 0; + init_stack(); } /** * Initializes the scc algorithm for the intraprocedural case. * Add scc info to every block node. */ -static INLINE void -init_scc (ir_graph *irg) { - init_scc_common(); - irg_walk_graph(irg, init_node, NULL, NULL); +static INLINE void init_scc(ir_graph *irg, struct obstack *obst) { + init_scc_common(); + irg_walk_graph(irg, init_node, NULL, obst); } #ifdef INTERPROCEDURAL_VIEW /** * Initializes the scc algorithm for the interprocedural case. */ -static INLINE void -init_ip_scc (void) { - init_scc_common(); - cg_walk (init_node, NULL, NULL); +static INLINE void init_ip_scc(struct obstack *obst) { + init_scc_common(); + cg_walk(init_node, NULL, obst); #if EXPERIMENTAL_CFLOOP_TREE - cg_walk (link_to_reg_end, NULL, NULL); + cg_walk(link_to_reg_end, NULL, NULL); #endif } #endif @@ -352,15 +337,15 @@ init_ip_scc (void) { * that gets the initial control flow from the Start node. */ static int is_outermost_StartBlock(ir_node *n) { - /* Test whether this is the outermost Start node. If so - recursion must end. */ - assert(is_Block(n)); - if ((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)) { - return 1; - } - return 0; + /* Test whether this is the outermost Start node. If so + recursion must end. */ + assert(is_Block(n)); + if (get_Block_n_cfgpreds(n) == 1 && + is_Start(skip_Proj(get_Block_cfgpred(n, 0))) && + get_Block_cfgpred_block(n, 0) == n) { + return 1; + } + return 0; } /** Returns non-zero if n is a loop header, i.e., it is a Block node @@ -369,30 +354,28 @@ static int is_outermost_StartBlock(ir_node *n) { * @param n the block node to check * @param root only needed for assertion. */ -static int -is_head (ir_node *n, ir_node *root) -{ - int i, arity; - int some_outof_loop = 0, some_in_loop = 0; - - assert(is_Block(n)); - - if (!is_outermost_StartBlock(n)) { - arity = get_irn_arity(n); - for (i = 0; i < arity; i++) { - ir_node *pred = get_nodes_block(skip_Proj(get_irn_n(n, i))); - if (is_backedge(n, i)) continue; - if (!irn_is_in_stack(pred)) { - some_outof_loop = 1; - } else { - if (get_irn_uplink(pred) < get_irn_uplink(root)) { - assert(get_irn_uplink(pred) >= get_irn_uplink(root)); - } - some_in_loop = 1; - } - } - } - return some_outof_loop & some_in_loop; +static int is_head(ir_node *n, ir_node *root) { + int i, arity; + int some_outof_loop = 0, some_in_loop = 0; + + assert(is_Block(n)); + + if (!is_outermost_StartBlock(n)) { + arity = get_irn_arity(n); + for (i = 0; i < arity; i++) { + ir_node *pred = get_nodes_block(skip_Proj(get_irn_n(n, i))); + if (is_backedge(n, i)) continue; + if (!irn_is_in_stack(pred)) { + some_outof_loop = 1; + } else { + if (get_irn_uplink(pred) < get_irn_uplink(root)) { + assert(get_irn_uplink(pred) >= get_irn_uplink(root)); + } + some_in_loop = 1; + } + } + } + return some_outof_loop & some_in_loop; } @@ -404,78 +387,73 @@ is_head (ir_node *n, ir_node *root) * @param n the block node to check * @param root only needed for assertion. */ -static int -is_endless_head (ir_node *n, ir_node *root) -{ - int i, arity; - int some_outof_loop = 0, some_in_loop = 0; - - assert(is_Block(n)); - /* Test for legal loop header: Block, Phi, ... */ - if (!is_outermost_StartBlock(n)) { - arity = get_irn_arity(n); - for (i = 0; i < arity; i++) { - ir_node *pred = get_nodes_block(skip_Proj(get_irn_n(n, i))); - assert(pred); - if (is_backedge(n, i)) { continue; } - if (!irn_is_in_stack(pred)) { - some_outof_loop = 1; //printf(" some out of loop "); - } else { - if(get_irn_uplink(pred) < get_irn_uplink(root)) { - assert(get_irn_uplink(pred) >= get_irn_uplink(root)); - } - some_in_loop = 1; - } - } - } - return !some_outof_loop && some_in_loop; +static int is_endless_head(ir_node *n, ir_node *root) { + int i, arity; + int some_outof_loop = 0, some_in_loop = 0; + + assert(is_Block(n)); + /* Test for legal loop header: Block, Phi, ... */ + if (!is_outermost_StartBlock(n)) { + arity = get_irn_arity(n); + for (i = 0; i < arity; i++) { + ir_node *pred = get_nodes_block(skip_Proj(get_irn_n(n, i))); + assert(pred); + if (is_backedge(n, i)) + continue; + if (!irn_is_in_stack(pred)) { + some_outof_loop = 1; //printf(" some out of loop "); + } else { + if (get_irn_uplink(pred) < get_irn_uplink(root)) { + assert(get_irn_uplink(pred) >= get_irn_uplink(root)); + } + some_in_loop = 1; + } + } + } + return !some_outof_loop && some_in_loop; } /** * Returns index of the predecessor with the smallest dfn number * greater-equal than limit. */ -static int -smallest_dfn_pred (ir_node *n, int limit) -{ - int i, index = -2, min = -1; - - if (!is_outermost_StartBlock(n)) { - int arity = get_irn_arity(n); - for (i = 0; i < arity; i++) { - ir_node *pred = get_nodes_block(skip_Proj(get_irn_n(n, i))); - if (is_backedge(n, i) || !irn_is_in_stack(pred)) - continue; - if (get_irn_dfn(pred) >= limit && (min == -1 || get_irn_dfn(pred) < min)) { - index = i; - min = get_irn_dfn(pred); - } - } - } - return index; +static int smallest_dfn_pred(ir_node *n, int limit) { + int i, index = -2, min = -1; + + if (!is_outermost_StartBlock(n)) { + int arity = get_irn_arity(n); + for (i = 0; i < arity; i++) { + ir_node *pred = get_nodes_block(skip_Proj(get_irn_n(n, i))); + if (is_backedge(n, i) || !irn_is_in_stack(pred)) + continue; + if (get_irn_dfn(pred) >= limit && (min == -1 || get_irn_dfn(pred) < min)) { + index = i; + min = get_irn_dfn(pred); + } + } + } + return index; } /** * Returns index of the predecessor with the largest dfn number. */ -static int -largest_dfn_pred (ir_node *n) -{ - int i, index = -2, max = -1; - - if (!is_outermost_StartBlock(n)) { - int arity = get_irn_arity(n); - for (i = 0; i < arity; i++) { - ir_node *pred = get_nodes_block(skip_Proj(get_irn_n(n, i))); - if (is_backedge (n, i) || !irn_is_in_stack(pred)) - continue; - if (get_irn_dfn(pred) > max) { - index = i; - max = get_irn_dfn(pred); - } - } - } - return index; +static int largest_dfn_pred(ir_node *n) { + int i, index = -2, max = -1; + + if (!is_outermost_StartBlock(n)) { + int arity = get_irn_arity(n); + for (i = 0; i < arity; i++) { + ir_node *pred = get_nodes_block(skip_Proj(get_irn_n(n, i))); + if (is_backedge(n, i) || !irn_is_in_stack(pred)) + continue; + if (get_irn_dfn(pred) > max) { + index = i; + max = get_irn_dfn(pred); + } + } + } + return index; } /** @@ -484,70 +462,68 @@ largest_dfn_pred (ir_node *n) * returns the tail of the loop. * If it finds no backedge returns NULL. */ -static ir_node * -find_tail (ir_node *n) { - ir_node *m; - int i, res_index = -2; - - m = stack[tos-1]; /* tos = top of stack */ - if (is_head(m, n)) { - res_index = smallest_dfn_pred(m, 0); - if ((res_index == -2) && /* no smallest dfn pred found. */ - (n == m)) - return NULL; - } else { - if (m == n) return NULL; - for (i = tos-2; i >= 0; --i) { - - m = stack[i]; - if (is_head (m, n)) { - res_index = smallest_dfn_pred (m, get_irn_dfn(m) + 1); - if (res_index == -2) /* no smallest dfn pred found. */ - res_index = largest_dfn_pred (m); - - if ((m == n) && (res_index == -2)) { - i = -1; - } - break; - } - - - /* We should not walk past our selves on the stack: The upcoming nodes - are not in this loop. We assume a loop not reachable from Start. */ - if (m == n) { - i = -1; - break; - } - } - - if (i < 0) { - /* A dead loop not reachable from Start. */ - for (i = tos-2; i >= 0; --i) { - m = stack[i]; - if (is_endless_head (m, n)) { - res_index = smallest_dfn_pred (m, get_irn_dfn(m) + 1); - if (res_index == -2) /* no smallest dfn pred found. */ - res_index = largest_dfn_pred (m); - break; - } - if (m == n) break; /* It's not an unreachable loop, either. */ - } - //assert(0 && "no head found on stack"); - } - - } - assert (res_index > -2); - - set_backedge (m, res_index); - return is_outermost_StartBlock(n) ? NULL : get_nodes_block(skip_Proj(get_irn_n(m, res_index))); +static ir_node *find_tail(ir_node *n) { + ir_node *m; + int i, res_index = -2; + + m = stack[tos-1]; /* tos = top of stack */ + if (is_head(m, n)) { + res_index = smallest_dfn_pred(m, 0); + if ((res_index == -2) && /* no smallest dfn pred found. */ + (n == m)) + return NULL; + } else { + if (m == n) + return NULL; + for (i = tos-2; i >= 0; --i) { + + m = stack[i]; + if (is_head(m, n)) { + res_index = smallest_dfn_pred(m, get_irn_dfn(m) + 1); + if (res_index == -2) /* no smallest dfn pred found. */ + res_index = largest_dfn_pred(m); + + if ((m == n) && (res_index == -2)) { + i = -1; + } + break; + } + + + /* We should not walk past our selves on the stack: The upcoming nodes + are not in this loop. We assume a loop not reachable from Start. */ + if (m == n) { + i = -1; + break; + } + } + + if (i < 0) { + /* A dead loop not reachable from Start. */ + for (i = tos-2; i >= 0; --i) { + m = stack[i]; + if (is_endless_head (m, n)) { + res_index = smallest_dfn_pred (m, get_irn_dfn(m) + 1); + if (res_index == -2) /* no smallest dfn pred found. */ + res_index = largest_dfn_pred (m); + break; + } + if (m == n) break; /* It's not an unreachable loop, either. */ + } + //assert(0 && "no head found on stack"); + } + } + assert(res_index > -2); + + set_backedge(m, res_index); + return is_outermost_StartBlock(n) ? NULL : get_nodes_block(skip_Proj(get_irn_n(m, res_index))); } /** * returns non.zero if l is the outermost loop. */ -INLINE static int -is_outermost_loop(ir_loop *l) { - return l == get_loop_outer_loop(l); +INLINE static int is_outermost_loop(ir_loop *l) { + return l == get_loop_outer_loop(l); } /*-----------------------------------------------------------* @@ -557,218 +533,247 @@ is_outermost_loop(ir_loop *l) { /** * Walks over all blocks of a graph */ -static void cfscc (ir_node *n) { - int i; - - assert(is_Block(n)); - - if (irn_visited(n)) return; - mark_irn_visited(n); - - /* Initialize the node */ - set_irn_dfn(n, current_dfn); /* Depth first number for this node */ - set_irn_uplink(n, current_dfn); /* ... is default uplink. */ - set_irn_loop(n, NULL); - ++current_dfn; - push(n); - - if (!is_outermost_StartBlock(n)) { - int arity = get_irn_arity(n); - - for (i = 0; i < arity; i++) { - ir_node *m; - - if (is_backedge(n, i)) - continue; - m = get_nodes_block(skip_Proj(get_irn_n(n, i))); - - cfscc(m); - if (irn_is_in_stack(m)) { - /* Uplink of m is smaller if n->m is a backedge. - Propagate the uplink to mark the cfloop. */ - if (get_irn_uplink(m) < get_irn_uplink(n)) - set_irn_uplink(n, get_irn_uplink(m)); - } - } - } - - if (get_irn_dfn(n) == get_irn_uplink(n)) { - /* This condition holds for - 1) the node with the incoming backedge. - That is: We found a cfloop! - 2) Straight line code, because no uplink has been propagated, so the - uplink still is the same as the dfn. - - But n might not be a proper cfloop head for the analysis. Proper cfloop - heads are Block and Phi nodes. find_tail searches the stack for - Block's and Phi's and takes those nodes as cfloop heads for the current - cfloop instead and marks the incoming edge as backedge. */ - - ir_node *tail = find_tail(n); - if (tail) { - /* We have a cfloop, that is no straight line code, - because we found a cfloop head! - Next actions: Open a new cfloop on the cfloop tree and - try to find inner cfloops */ +static void cfscc(ir_node *n) { + int i; + + assert(is_Block(n)); + + if (irn_visited(n)) return; + mark_irn_visited(n); + + /* Initialize the node */ + set_irn_dfn(n, current_dfn); /* Depth first number for this node */ + set_irn_uplink(n, current_dfn); /* ... is default uplink. */ + set_irn_loop(n, NULL); + ++current_dfn; + push(n); + + if (!is_outermost_StartBlock(n)) { + int arity = get_irn_arity(n); + + for (i = 0; i < arity; i++) { + ir_node *m; + + if (is_backedge(n, i)) + continue; + m = get_nodes_block(skip_Proj(get_irn_n(n, i))); + + cfscc(m); + if (irn_is_in_stack(m)) { + /* Uplink of m is smaller if n->m is a backedge. + Propagate the uplink to mark the cfloop. */ + if (get_irn_uplink(m) < get_irn_uplink(n)) + set_irn_uplink(n, get_irn_uplink(m)); + } + } + } + + if (get_irn_dfn(n) == get_irn_uplink(n)) { + /* This condition holds for + 1) the node with the incoming backedge. + That is: We found a cfloop! + 2) Straight line code, because no uplink has been propagated, so the + uplink still is the same as the dfn. + + But n might not be a proper cfloop head for the analysis. Proper cfloop + heads are Block and Phi nodes. find_tail searches the stack for + Block's and Phi's and takes those nodes as cfloop heads for the current + cfloop instead and marks the incoming edge as backedge. */ + + ir_node *tail = find_tail(n); + if (tail) { + /* We have a cfloop, that is no straight line code, + because we found a cfloop head! + Next actions: Open a new cfloop on the cfloop tree and + try to find inner cfloops */ #if NO_CFLOOPS_WITHOUT_HEAD - /* This is an adaption of the algorithm from fiasco / optscc to - * avoid cfloops 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 cfloops without firm nodes that cause errors - * in the heap analyses. */ - - ir_loop *l; - int close; - if ((get_loop_n_elements(current_loop) > 0) || (is_outermost_loop(current_loop))) { - l = new_loop(); - close = 1; - } else { - l = current_loop; - close = 0; - } + /* This is an adaption of the algorithm from fiasco / optscc to + * avoid cfloops 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 cfloops without firm nodes that cause errors + * in the heap analyses. */ + + ir_loop *l; + int close; + if ((get_loop_n_elements(current_loop) > 0) || (is_outermost_loop(current_loop))) { + l = new_loop(); + close = 1; + } else { + l = current_loop; + close = 0; + } #else - ir_loop *l = new_loop(); + ir_loop *l = new_loop(); #endif - /* Remove the cfloop from the stack ... */ - pop_scc_unmark_visit (n); + /* Remove the cfloop from the stack ... */ + pop_scc_unmark_visit (n); - /* The current backedge has been marked, that is temporarily eliminated, - by find tail. Start the scc algorithm - anew on the subgraph thats left (the current cfloop without the backedge) - in order to find more inner cfloops. */ + /* The current backedge has been marked, that is temporarily eliminated, + by find tail. Start the scc algorithm + anew on the subgraph thats left (the current cfloop without the backedge) + in order to find more inner cfloops. */ - cfscc (tail); + cfscc(tail); - assert (irn_visited(n)); + assert(irn_visited(n)); #if NO_CFLOOPS_WITHOUT_HEAD - if (close) + if (close) #endif - close_loop(l); - } - else { - /* AS: No cfloop head was found, that is we have straight line code. - Pop all nodes from the stack to the current cfloop. */ - pop_scc_to_loop(n); - } - } + close_loop(l); + } else { + /* AS: No cfloop head was found, that is we have straight line code. + Pop all nodes from the stack to the current cfloop. */ + pop_scc_to_loop(n); + } + } +} + +/** + * Mature all loops by removing the flexible arrays of a loop. + */ +static void mature_loops(ir_loop *loop) { + loop_element *new_children = DUP_ARR_D(loop_element, outermost_ir_graph->obst, loop->children); + DEL_ARR_F(loop->children); + loop->children = new_children; + + if (loop->n_sons > 0) { + /* we have child loops, mature them */ + int i; + + for (i = ARR_LEN(new_children) - 1; i >= 0; --i) { + loop_element child = new_children[i]; + + if (*child.kind == k_ir_loop) { + mature_loops(child.son); + } + } + } } /* Constructs control flow backedge information for irg. */ int construct_cf_backedges(ir_graph *irg) { - ir_graph *rem = current_ir_graph; - ir_loop *head_rem; - ir_node *end = get_irg_end(irg); - int i; + ir_graph *rem = current_ir_graph; + ir_loop *head_rem; + ir_node *end = get_irg_end(irg); + struct obstack temp; + int i; - assert(!get_interprocedural_view() && - "use construct_ip_cf_backedges()"); - max_loop_depth = 0; + assert(!get_interprocedural_view() && + "use construct_ip_cf_backedges()"); + max_loop_depth = 0; - current_ir_graph = irg; - outermost_ir_graph = irg; + current_ir_graph = irg; + outermost_ir_graph = irg; - init_scc(current_ir_graph); + obstack_init(&temp); + init_scc(irg, &temp); - current_loop = NULL; - new_loop(); /* sets current_loop */ - head_rem = current_loop; /* Just for assertion */ + current_loop = NULL; + new_loop(); /* sets current_loop */ + head_rem = current_loop; /* Just for assertion */ - inc_irg_visited(current_ir_graph); + inc_irg_visited(irg); - /* walk over all blocks of the graph, including keep alives */ - cfscc(get_irg_end_block(current_ir_graph)); - for (i = 0; i < get_End_n_keepalives(end); i++) { - ir_node *el = get_End_keepalive(end, i); - if (is_Block(el)) cfscc(el); - } + /* walk over all blocks of the graph, including keep alives */ + cfscc(get_irg_end_block(irg)); + for (i = get_End_n_keepalives(end) - 1; i >= 0; --i) { + ir_node *el = get_End_keepalive(end, i); + if (is_Block(el)) + cfscc(el); + } - assert(head_rem == current_loop); - set_irg_loop(current_ir_graph, current_loop); - set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_consistent); - assert(get_irg_loop(current_ir_graph)->kind == k_ir_loop); + assert(head_rem == current_loop); + mature_loops(current_loop); + set_irg_loop(irg, current_loop); + set_irg_loopinfo_state(irg, loopinfo_cf_consistent); + assert(get_irg_loop(irg)->kind == k_ir_loop); - current_ir_graph = rem; - return max_loop_depth; + obstack_free(&temp, NULL); + current_ir_graph = rem; + return max_loop_depth; } #ifdef INTERPROCEDURAL_VIEW int construct_ip_cf_backedges (void) { - ir_graph *rem = current_ir_graph; - int rem_ipv = get_interprocedural_view(); - int i; - - assert(get_irp_ip_view_state() == ip_view_valid); - max_loop_depth = 0; - outermost_ir_graph = get_irp_main_irg(); - - init_ip_scc(); - - current_loop = NULL; - new_loop(); /* sets current_loop */ - set_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()); - - /** We have to start the walk at the same nodes as cg_walk. **/ - /* Walk starting at unreachable procedures. Only these - * have End blocks visible in interprocedural view. */ - for (i = 0; i < get_irp_n_irgs(); i++) { - ir_node *sb; - current_ir_graph = get_irp_irg(i); - - 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; - - cfscc(get_irg_end_block(current_ir_graph)); - } - - /* Check whether we walked all procedures: there could be procedures - with cyclic calls but no call from the outside. */ - for (i = 0; i < get_irp_n_irgs(); i++) { - ir_node *sb; - current_ir_graph = get_irp_irg(i); - - /* Test start block: if inner procedure end and end block are not - * visible and therefore not marked. */ - sb = get_irg_start_block(current_ir_graph); - if (get_irn_visited(sb) < get_irg_visited(current_ir_graph)) cfscc(sb); - } - - /* Walk all endless cfloops in inner procedures. - * We recognize an inner procedure if the End node is not visited. */ - for (i = 0; i < get_irp_n_irgs(); i++) { - ir_node *e; - current_ir_graph = get_irp_irg(i); - - e = get_irg_end(current_ir_graph); - if (get_irn_visited(e) < get_irg_visited(current_ir_graph)) { - int j; - /* Don't visit the End node. */ - for (j = 0; j < get_End_n_keepalives(e); j++) { - ir_node *el = get_End_keepalive(e, j); - if (is_Block(el)) cfscc(el); - } - } - } - - set_irg_loop(outermost_ir_graph, current_loop); - set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_ip_consistent); - assert(get_irg_loop(outermost_ir_graph)->kind == k_ir_loop); - - current_ir_graph = rem; - set_interprocedural_view(rem_ipv); - return max_loop_depth; + ir_graph *rem = current_ir_graph; + int rem_ipv = get_interprocedural_view(); + struct obstack temp; + int i; + + assert(get_irp_ip_view_state() == ip_view_valid); + max_loop_depth = 0; + outermost_ir_graph = get_irp_main_irg(); + + obstack_init(&temp); + init_ip_scc(&temp); + + current_loop = NULL; + new_loop(); /* sets current_loop */ + set_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()); + + /** We have to start the walk at the same nodes as cg_walk. **/ + /* Walk starting at unreachable procedures. Only these + * have End blocks visible in interprocedural view. */ + for (i = 0; i < get_irp_n_irgs(); i++) { + ir_node *sb; + current_ir_graph = get_irp_irg(i); + + 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; + + cfscc(get_irg_end_block(current_ir_graph)); + } + + /* Check whether we walked all procedures: there could be procedures + with cyclic calls but no call from the outside. */ + for (i = 0; i < get_irp_n_irgs(); i++) { + ir_node *sb; + current_ir_graph = get_irp_irg(i); + + /* Test start block: if inner procedure end and end block are not + * visible and therefore not marked. */ + sb = get_irg_start_block(current_ir_graph); + if (get_irn_visited(sb) < get_irg_visited(current_ir_graph)) cfscc(sb); + } + + /* Walk all endless cfloops in inner procedures. + * We recognize an inner procedure if the End node is not visited. */ + for (i = 0; i < get_irp_n_irgs(); i++) { + ir_node *e; + current_ir_graph = get_irp_irg(i); + + e = get_irg_end(current_ir_graph); + if (get_irn_visited(e) < get_irg_visited(current_ir_graph)) { + int j; + /* Don't visit the End node. */ + for (j = 0; j < get_End_n_keepalives(e); j++) { + ir_node *el = get_End_keepalive(e, j); + if (is_Block(el)) cfscc(el); + } + } + } + + set_irg_loop(outermost_ir_graph, current_loop); + set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_ip_consistent); + assert(get_irg_loop(outermost_ir_graph)->kind == k_ir_loop); + + obstack_free(&temp, NULL); + current_ir_graph = rem; + set_interprocedural_view(rem_ipv); + return max_loop_depth; } #endif @@ -777,19 +782,19 @@ int construct_ip_cf_backedges (void) { * backedge information pf a block. */ static void reset_backedges(ir_node *block) { - int rem; + int rem; - assert(is_Block(block)); + assert(is_Block(block)); #ifdef INTERPROCEDURAL_VIEW - rem = get_interprocedural_view(); - set_interprocedural_view(1); - clear_backedges(block); - set_interprocedural_view(0); - clear_backedges(block); - set_interprocedural_view(rem); + rem = get_interprocedural_view(); + set_interprocedural_view(1); + clear_backedges(block); + set_interprocedural_view(0); + clear_backedges(block); + set_interprocedural_view(rem); #else - (void) rem; - clear_backedges(block); + (void) rem; + clear_backedges(block); #endif } @@ -799,36 +804,38 @@ static void reset_backedges(ir_node *block) { * Recurse into all nested loops. */ static void loop_reset_backedges(ir_loop *l) { - int i; - reset_backedges(get_loop_node(l, 0)); - for (i = 0; i < get_loop_n_nodes(l); ++i) - set_irn_loop(get_loop_node(l, i), NULL); - for (i = 0; i < get_loop_n_sons(l); ++i) { - loop_reset_backedges(get_loop_son(l, i)); - } + int i; + reset_backedges(get_loop_node(l, 0)); + for (i = 0; i < get_loop_n_nodes(l); ++i) + set_irn_loop(get_loop_node(l, i), NULL); + for (i = 0; i < get_loop_n_sons(l); ++i) { + loop_reset_backedges(get_loop_son(l, i)); + } } /* Removes all cfloop information. Resets all backedges */ void free_cfloop_information(ir_graph *irg) { - if (get_irg_loop(irg)) - loop_reset_backedges(get_irg_loop(irg)); - set_irg_loop(irg, NULL); - set_irg_loopinfo_state(irg, loopinfo_none); - /* We cannot free the cfloop nodes, they are on the obstack. */ + ir_loop *loop = get_irg_loop(irg); + if (loop != NULL) { + loop_reset_backedges(loop); + set_irg_loop(irg, NULL); + } + set_irg_loopinfo_state(irg, loopinfo_none); + /* We cannot free the cfloop nodes, they are on the obstack. */ } -void free_all_cfloop_information (void) { - int i; +void free_all_cfloop_information(void) { + int i; #ifdef INTERPROCEDURAL_VIEW - int rem = get_interprocedural_view(); - set_interprocedural_view(1); /* To visit all filter nodes */ + int rem = get_interprocedural_view(); + set_interprocedural_view(1); /* To visit all filter nodes */ #endif - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - free_cfloop_information(get_irp_irg(i)); - } + for (i = get_irp_n_irgs() - 1; i >= 0; --i) { + free_cfloop_information(get_irp_irg(i)); + } #ifdef INTERPROCEDURAL_VIEW - set_interprocedural_view(rem); + set_interprocedural_view(rem); #endif } -- 2.20.1