#include <string.h>
#include "irloop_t.h"
-#include "irnode.h"
+#include "irnode_t.h"
#include "irgraph_t.h"
#include "array.h"
#include "pmap.h"
#include "irgwalk.h"
#include "irprog_t.h"
+#include "irdump.h"
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. */
/**********************************************************************/
/* Node attributes **/
bool in_stack; /* Marks whether node is on the stack. */
int dfn; /* Depth first search number. */
int uplink; /* dfn number of ancestor. */
- // ir_loop *loop; /* Refers to the containing loop. */
+ /* ir_loop *loop; *//* Refers to the containing loop. */
/*
struct section *section;
xset def;
static INLINE void
mark_irn_in_stack (ir_node *n) {
assert(get_irn_link(n));
- ((scc_info *)get_irn_link(n))->in_stack = true;
+ /* to slow */
+ /* ((scc_info *)get_irn_link(n))->in_stack = true; */
+ ((scc_info *)n->link)->in_stack = true;
}
static INLINE void
mark_irn_not_in_stack (ir_node *n) {
assert(get_irn_link(n));
- ((scc_info *)get_irn_link(n))->in_stack = false;
+ /* to slow */
+ /* ((scc_info *)get_irn_link(n))->in_stack = false; */
+ ((scc_info *)n->link)->in_stack = false;
}
static INLINE bool
irn_is_in_stack (ir_node *n) {
assert(get_irn_link(n));
- return ((scc_info *)get_irn_link(n))->in_stack;
+ /* to slow */
+ /* return ((scc_info *)get_irn_link(n))->in_stack; */
+ return ((scc_info *)n->link)->in_stack;
}
static INLINE void
set_irn_uplink (ir_node *n, int uplink) {
assert(get_irn_link(n));
- ((scc_info *)get_irn_link(n))->uplink = uplink;
+ /* to slow */
+ /* ((scc_info *)get_irn_link(n))->uplink = uplink; */
+ ((scc_info *)n->link)->uplink = uplink;
}
static INLINE int
get_irn_uplink (ir_node *n) {
assert(get_irn_link(n));
- return ((scc_info *)get_irn_link(n))->uplink;
+ /* from fast to slow */
+ /* return ((scc_info *)get_irn_link(n))->uplink; */
+ return ((scc_info *)n->link)->uplink;
}
static INLINE void
set_irn_dfn (ir_node *n, int dfn) {
- if (! get_irn_link(n)) { DDMN(n); DDME(get_irg_ent(current_ir_graph));}
assert(get_irn_link(n));
- ((scc_info *)get_irn_link(n))->dfn = dfn;
+ /* to slow */
+ /* ((scc_info *)get_irn_link(n))->dfn = dfn; */
+ ((scc_info *)n->link)->dfn = dfn;
}
static INLINE int
get_irn_dfn (ir_node *n) {
assert(get_irn_link(n));
- return ((scc_info *)get_irn_link(n))->dfn;
+ /* to slow */
+ /* return ((scc_info *)get_irn_link(n))->dfn; */
+ return ((scc_info *)n->link)->dfn;
}
+#if 0
+/* Replaced node loop map by real field as hash access dominates runtime
+ * of the algorithm. ! */
/* Uses temporary information to set the loop */
static INLINE void
set_irn_loop (ir_node *n, ir_loop* loop) {
- //assert(get_irn_link(n));
- //((scc_info *)get_irn_link(n))->loop = loop;
assert(node_loop_map && "not initialized!");
pmap_insert(node_loop_map, (void *)n, (void *)loop);
}
INLINE ir_loop *
get_irn_loop (ir_node *n) {
ir_loop *res = NULL;
- //assert(get_irn_link(n));
- //return ((scc_info *)get_irn_link(n))->loop;
- assert(node_loop_map && "not initialized!");
+ if (!node_loop_map) return NULL;
if (pmap_contains(node_loop_map, (void *)n))
res = (ir_loop *) pmap_get(node_loop_map, (void *)n);
return res;
}
+#else
+static INLINE void
+set_irn_loop (ir_node *n, ir_loop* loop) {
+ n->loop = loop;
+}
+
+/* Uses temporary information to get the loop */
+INLINE ir_loop *
+get_irn_loop (ir_node *n) {
+ return n->loop;
+}
+#endif
+
#if 0
static ir_loop *find_nodes_loop (ir_node *n, ir_loop *l) {
} while(m != n);
if(i > 1)
- printf("Mehr als eine Iteration!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+ printf("Mehr als eine Iteration!!!!!!!!!!!!!!!!!!!!!!!!!!!!11111\n");
}
/* GL ??? my last son is my grandson??? Removes loops with no
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;
+ gson -> outer_loop = l;
new_last_son.son = gson;
- l -> children[last] = new_last_son;
- }
+ l -> children[last] = new_last_son;
+ }
}
current_loop = l;
if(node_nr == pos)
return(loop -> children[child_nr].node);
}
+ DDML(loop);
+ printf("pos: %d\n", pos);
assert(0 && "no child at pos found");
return NULL;
}
static INLINE void
add_loop_node(ir_loop *loop, ir_node *n) {
loop_element ln;
- ln.node=n;
+ ln.node = n;
assert(loop && loop->kind == k_ir_loop);
assert(get_kind(n) == k_ir_node);
ARR_APP1 (loop_element, loop->children, ln);
}
int get_loop_element_pos(ir_loop *loop, void *le) {
- assert(loop && loop->kind == k_ir_loop);
int i;
+ assert(loop && loop->kind == k_ir_loop);
for (i = 0; i < get_loop_n_elements(loop); i++)
if (get_loop_element(loop, i).node == le) return i;
/* Also init nodes not visible in intraproc_view. */
/* @@@ init_node is called for too many nodes -- this wastes memory!.
The mem is not lost as its on the obstack. */
- if (get_irn_op(n) == op_Filter) {
+ if (intern_get_irn_op(n) == op_Filter) {
for (i = 0; i < get_Filter_n_cg_preds(n); i++)
init_node(get_Filter_cg_pred(n, i), NULL);
}
- if (get_irn_op(n) == op_Block) {
+ if (intern_get_irn_op(n) == op_Block) {
for (i = 0; i < get_Block_cg_n_cfgpreds(n); i++) {
init_node(get_Block_cg_cfgpred(n, i), NULL);
}
}
/* The following pattern matches only after a call from above pattern. */
- if ((get_irn_op(n) == op_Proj) /*&& (get_Proj_proj(n) == 0)*/) {
+ if ((intern_get_irn_op(n) == op_Proj) /*&& (get_Proj_proj(n) == 0)*/) {
/* @@@ init_node is called for every proj -- this wastes memory!.
The mem is not lost as its on the obstack. */
ir_node *cb = get_Proj_pred(n);
- if ((get_irn_op(cb) == op_CallBegin) ||
- (get_irn_op(cb) == op_EndReg) ||
- (get_irn_op(cb) == op_EndExcept)) {
+ if ((intern_get_irn_op(cb) == op_CallBegin) ||
+ (intern_get_irn_op(cb) == op_EndReg) ||
+ (intern_get_irn_op(cb) == op_EndExcept)) {
init_node(cb, NULL);
init_node(get_nodes_Block(cb), NULL);
}
static bool is_outermost_Start(ir_node *n) {
/* Test whether this is the outermost Start node. If so
recursion must end. */
- if ((get_irn_op(n) == op_Block) &&
+ if ((intern_get_irn_op(n) == op_Block) &&
(get_Block_n_cfgpreds(n) == 1) &&
- (get_irn_op(skip_Proj(get_Block_cfgpred(n, 0))) == op_Start) &&
+ (intern_get_irn_op(skip_Proj(get_Block_cfgpred(n, 0))) == op_Start) &&
(get_nodes_Block(skip_Proj(get_Block_cfgpred(n, 0))) == n)) {
return true;
}
not possible in interprocedural view as outermost_graph is
not necessarily the only with a dead-end start block.
Besides current_ir_graph is not set properly. */
- if ((get_irn_op(n) == op_Block) &&
+ if ((intern_get_irn_op(n) == op_Block) &&
(n == get_irg_start_block(current_ir_graph))) {
if ((!interprocedural_view) ||
- (current_ir_graph == outermost_ir_graph))
+ (current_ir_graph == outermost_ir_graph))
return true;
}
#endif
/* Don't walk from nodes to blocks except for Control flow operations. */
static INLINE int
get_start_index(ir_node *n) {
- if (is_cfop(n) || is_fragile_op(n) || get_irn_op(n) == op_Start)
+ /* if (is_cfop(n) || is_fragile_op(n) || intern_get_irn_op(n) == op_Start)
+ // this should be sufficient.
return -1;
else
return 0;
+ */
+ if (intern_get_irn_op(n) == op_Phi ||
+ intern_get_irn_op(n) == op_Block ||
+ (intern_get_irn_op(n) == op_Filter && interprocedural_view))
+ // Here we could test for backedge at -1 which is illegal
+ return 0;
+ else
+ return -1;
}
-
+#if 0
/* Returns current_ir_graph and set it to the irg of predecessor index
of node n. */
static INLINE ir_graph *
if (interprocedural_view) {
/* Only Filter and Block nodes can have predecessors in other graphs. */
- if (get_irn_op(n) == op_Filter)
+ if (intern_get_irn_op(n) == op_Filter)
n = get_nodes_Block(n);
- if (get_irn_op(n) == op_Block) {
+ if (intern_get_irn_op(n) == op_Block) {
ir_node *cfop = skip_Proj(get_Block_cfgpred(n, index));
if (is_ip_cfop(cfop)) {
- current_ir_graph = get_irn_irg(cfop);
- set_irg_visited(current_ir_graph, get_max_irg_visited());
+ current_ir_graph = get_irn_irg(cfop);
+ set_irg_visited(current_ir_graph, get_max_irg_visited());
}
}
}
return old_current;
}
-#if 0
/* Walks up the stack passing n and then finding the node
where we walked into the irg n is contained in.
Here we switch the irg. */
m = stack[i];
/*printf(" Visiting %d ", i); DDMN(m);*/
if (is_ip_cfop(m)) {
- current_ir_graph = get_irn_irg(m);
- break;
+ current_ir_graph = get_irn_irg(m);
+ break;
}
- if (get_irn_op(m) == op_Filter) {
- /* Find the corresponding ip_cfop */
- ir_node *pred = stack[i+1];
- int j;
- for (j = 0; j < get_Filter_n_cg_preds(m); j++)
- if (get_Filter_cg_pred(m, j) == pred) break;
- if (j >= get_Filter_n_cg_preds(m))
- /* It is a filter we didn't pass as the predecessors are marked. */
- continue;
- assert(get_Filter_cg_pred(m, j) == pred);
- switch_irg(m, j);
- break;
+ if (intern_get_irn_op(m) == op_Filter) {
+ /* Find the corresponding ip_cfop */
+ ir_node *pred = stack[i+1];
+ int j;
+ for (j = 0; j < get_Filter_n_cg_preds(m); j++)
+ if (get_Filter_cg_pred(m, j) == pred) break;
+ if (j >= get_Filter_n_cg_preds(m))
+ /* It is a filter we didn't pass as the predecessors are marked. */
+ continue;
+ assert(get_Filter_cg_pred(m, j) == pred);
+ switch_irg(m, j);
+ break;
}
}
}
/* Test for legal loop header: Block, Phi, ... */
INLINE static bool is_possible_loop_head(ir_node *n) {
- return ((get_irn_op(n) == op_Block) ||
- (get_irn_op(n) == op_Phi) ||
- ((get_irn_op(n) == op_Filter) && interprocedural_view));
+ ir_op *op = intern_get_irn_op(n);
+ return ((op == op_Block) ||
+ (op == op_Phi) ||
+ ((op == op_Filter) && interprocedural_view));
}
/* Returns true if n is a loop header, i.e., it is a Block, Phi
static bool
is_head (ir_node *n, ir_node *root)
{
- int i;
+ int i, arity;
int some_outof_loop = 0, some_in_loop = 0;
/* Test for legal loop header: Block, Phi, ... */
return false;
if (!is_outermost_Start(n)) {
- for (i = get_start_index(n); i < get_irn_arity(n); i++) {
- ir_node *pred = get_irn_n(n, i);
+ arity = intern_get_irn_arity(n);
+ for (i = get_start_index(n); i < arity; i++) {
+ ir_node *pred = intern_get_irn_n(n, i);
assert(pred);
if (is_backedge(n, i)) continue;
if (!irn_is_in_stack(pred)) {
- some_outof_loop = 1;
+ some_outof_loop = 1;
} else {
- assert(get_irn_uplink(pred) >= get_irn_uplink(root));
- some_in_loop = 1;
+ assert(get_irn_uplink(pred) >= get_irn_uplink(root));
+ some_in_loop = 1;
}
}
}
int i, index = -2, min = -1;
if (!is_outermost_Start(n)) {
- for (i = get_start_index(n); i < get_irn_arity(n); i++) {
- ir_node *pred = get_irn_n(n, i);
+ int arity = intern_get_irn_arity(n);
+ for (i = get_start_index(n); i < arity; i++) {
+ ir_node *pred = intern_get_irn_n(n, i);
assert(pred);
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);
+ index = i;
+ min = get_irn_dfn(pred);
}
}
}
int i, index = -2, max = -1;
if (!is_outermost_Start(n)) {
- for (i = get_start_index(n); i < get_irn_arity(n); i++) {
- ir_node *pred = get_irn_n(n, i);
+ int arity = intern_get_irn_arity(n);
+ for (i = get_start_index(n); i < arity; i++) {
+ ir_node *pred = intern_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);
+ index = i;
+ max = get_irn_dfn(pred);
}
}
}
if (is_head (m, n)) {
res_index = smallest_dfn_pred(m, 0);
if ((res_index == -2) && /* no smallest dfn pred found. */
- (n == m))
+ (n == m))
return NULL;
} else {
if (m == n) return NULL;
for (i = tos-2; ; --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);
- break;
+ 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;
}
}
}
assert (res_index > -2);
set_backedge (m, res_index);
- return is_outermost_Start(n) ? NULL : get_irn_n(m, res_index);
+ return is_outermost_Start(n) ? NULL : intern_get_irn_n(m, res_index);
}
static void scc (ir_node *n) {
int i;
- // GL @@@ remove experimental stuff ir_graph *rem;
-
if (irn_visited(n)) return;
mark_irn_visited(n);
set_irn_uplink(n, current_dfn); /* ... is default uplink. */
set_irn_loop(n, NULL);
current_dfn ++;
-
- /* What's this good for?
- n->ana.scc.section = NULL;
- */
-
push(n);
/* AS: get_start_index might return -1 for Control Flow Nodes, and thus a negative
so is_backedge does not access array[-1] but correctly returns false! */
if (!is_outermost_Start(n)) {
- for (i = get_start_index(n); i < get_irn_arity(n); i++) {
+ int arity = intern_get_irn_arity(n);
+ for (i = get_start_index(n); i < arity; i++) {
ir_node *m;
if (is_backedge(n, i)) continue;
- m = get_irn_n(n, i); /*get_irn_ip_pred(n, i);*/
- assert(m);
- //if ((!m) || (get_irn_op(m) == op_Unknown)) continue;
+ m = intern_get_irn_n(n, i); /* get_irn_ip_pred(n, i); */
+ /* if ((!m) || (intern_get_irn_op(m) == op_Unknown)) continue; */
scc (m);
- // GL @@@ remove experimental stuff /*return_recur(n, i);*/
-
if (irn_is_in_stack(m)) {
- /* Uplink of m is smaller if n->m is a backedge.
- Propagate the uplink to mark the loop. */
- if (get_irn_uplink(m) < get_irn_uplink(n))
- set_irn_uplink(n, get_irn_uplink(m));
+ /* Uplink of m is smaller if n->m is a backedge.
+ Propagate the uplink to mark the loop. */
+ if (get_irn_uplink(m) < get_irn_uplink(n))
+ set_irn_uplink(n, get_irn_uplink(m));
}
}
}
ir_loop *l;
int close;
if (get_loop_n_elements(current_loop) > 0) {
- l = new_loop();
- close = 1;
+ l = new_loop();
+ close = 1;
} else {
- l = current_loop;
- close = 0;
+ l = current_loop;
+ close = 0;
}
#else
ir_loop *l = new_loop();
/* Remove the loop from the stack ... */
pop_scc_unmark_visit (n);
/* and recompute it in a better order; and so that it goes into
- the new loop. */
- // GL @@@ remove experimental stuff rem = find_irg_on_stack(tail);
+ the new loop. */
+ /* GL @@@ remove experimental stuff rem = find_irg_on_stack(tail); */
scc (tail);
- // GL @@@ remove experimental stuff current_ir_graph = rem;
+ /* GL @@@ remove experimental stuff current_ir_graph = rem; */
assert (irn_visited(n));
#if NO_LOOPS_WITHOUT_HEAD
close_loop(l);
} else {
/* AS: No inner loop was found. Pop all nodes from the stack
- to the current loop. */
+ to the current loop. */
pop_scc_to_loop(n);
}
}
ir_loop *head_rem;
assert(!interprocedural_view &&
- "not implemented, use construct_ip_backedges");
+ "not implemented, use construct_ip_backedges");
current_ir_graph = irg;
outermost_ir_graph = irg;
assert(head_rem == current_loop);
set_irg_loop(current_ir_graph, current_loop);
+ set_irg_loopinfo_state(current_ir_graph, loopinfo_consistent);
assert(get_irg_loop(current_ir_graph)->kind == k_ir_loop);
/*
irg->loops = current_loop;
/* 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;
+ (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());
}
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;
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;
+ (get_nodes_block(get_Block_cfgpred(sb, 0)) != sb)) continue;
scc(get_irg_end(current_ir_graph));
}
}
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;
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));
}
if (get_irg_loop(irg))
loop_reset_backedges(get_irg_loop(irg));
set_irg_loop(irg, NULL);
+ set_irg_loopinfo_state(current_ir_graph, loopinfo_none);
/* We cannot free the loop nodes, they are on the obstack. */
}
static int test_loop_node(ir_loop *l) {
int i, has_node = 0, found_problem = 0;
loop_element le;
+
assert(l && l->kind == k_ir_loop);
if (get_loop_n_elements(l) == 0) {
projects / libfirm / blobdiff