Commit 8964dc61 authored by Michael Beck's avatar Michael Beck
Browse files

- implemented irg_walk_blkwise_dom_graph()

[r22541]
parent 8c4e0e22
......@@ -47,10 +47,10 @@
* The void* env can be used to pass status information between the
* pre and post functions. Does not use the link fields.
*
* @param node - the start node
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param node the start node
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
*/
void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env);
......@@ -58,10 +58,10 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
/**
* Walks over all reachable nodes in the ir graph.
*
* @param irg - the irg graph
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param irg the irg graph
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
* Like irg_walk(), but walks over all reachable nodes in the ir
* graph, starting at the end operation. During the walk current_ir_graph
......@@ -83,10 +83,10 @@ void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void
* pre and post functions. Does not use the link fields.
* This walker also follows additional dependency egdes.
*
* @param node - the start node
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param node the start node
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
*/
void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env);
......@@ -94,10 +94,10 @@ void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
/**
* Walks over all reachable nodes in the ir graph.
*
* @param irg - the irg graph
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param irg the irg graph
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
* Like irg_walk(), but walks over all reachable nodes in the ir
* graph, starting at the end operation. During the walk current_ir_graph
......@@ -110,9 +110,9 @@ void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *
/**
* Executes irg_walk(end, pre, post, env) for all irgraphs in irprog.
*
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
* This function executes irg_walk(end, pre, post, env) for all irgraphs in irprog.
* Sets current_ir_graph properly for each walk. Conserves current
......@@ -125,9 +125,9 @@ void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env);
/**
* Walks all irgs in interprocedural view.
*
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
* This function walks all irgs in interprocedural view.
* Visits each node only once. Sets current_ir_graph properly. Does not use the link field.
......@@ -137,10 +137,10 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env);
/** Walks only over Block nodes in the graph.
*
* @param node - the start node
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param node the start node
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
* This function Walks only over Block nodes in the graph. Has it's own visited
* flag, so that it can be interleaved with the other walker.
......@@ -152,10 +152,10 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
/**
* Walks only over reachable Block nodes in the graph.
*
* @param irg - the irg graph
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param irg the irg graph
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
* Like irg_block_walk(), but walks over all reachable blocks in the
* ir graph, starting at the end block. Does not use the link field.
......@@ -165,9 +165,9 @@ void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post
/**
* Walks over all code in const_code_irg.
*
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*
* This function walks over all code in const_code_irg.
* Uses visited flag in const_code_irg. Does not use the link field.
......@@ -175,8 +175,8 @@ void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post
void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env);
/**
* Walks over reachable nodes in block-wise order, i.e. visit all nodes in a block
* before going to another block, starting at the end operation.
* Walks over reachable nodes in block-wise topological order, i.e. visit
* all nodes in a block before going to another block, starting at the end operation.
* Executes pre before visiting the predecessor of a node, post after.
* irg_walk_blkwise_graph() uses the visited flag in irg and the nodes to
* determine visited nodes.
......@@ -186,16 +186,16 @@ void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env);
* pre and post functions. Does not use the link fields.
* Walks only intraprocedural, even in interprocedural view.
*
* @param irg - the irg graph
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param irg the irg graph
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*/
void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env);
/**
* Walks over reachable nodes in block-wise order, i.e. visit all nodes in a block
* before going to another block, starting at the end operation.
* Walks over reachable nodes in block-wise topological order, i.e. visit
* all nodes in a block before going to another block, starting at the end operation.
* Executes pre before visiting the predecessor of a node, post after.
* irg_walk_blkwise_graph() uses the visited flag in irg and the nodes to
* determine visited nodes.
......@@ -206,22 +206,42 @@ void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *po
* Walks only intraprocedural, even in interprocedural view.
* This walker also follows dependency edges.
*
* @param irg - the irg graph
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param irg the irg graph
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*/
void irg_walk_in_or_dep_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env);
/**
* Walks over reachable nodes in block-wise topological order, i.e. visit
* all nodes in a block before going to another block, starting at the end operation.
* Visit the blocks in dominator tree order.
* Executes pre before visiting the predecessor of a node, post after.
* irg_walk_blkwise_graph() uses the visited flag in irg and the nodes to
* determine visited nodes.
* It executes inc_irg_visited(current_ir_graph) to generate a new
* flag. It marks the node as visited before executing pre.
* The void *env can be used to pass status information between the
* pre and post functions. Does not use the link fields.
* Walks only intraprocedural, even in interprocedural view.
*
* @param irg the irg graph
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*/
void irg_walk_blkwise_dom_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env);
/**
* Additionally walk over all anchors. Do NOT increase the visit flag.
* This function visits all anchor nodes that otherwise might not been visited in a
* walk, for instance the Bad() node.
*
* @param irg - the irg graph
* @param pre - walker function, executed before the predecessor of a node are visited
* @param post - walker function, executed after the predecessor of a node are visited
* @param env - environment, passed to pre and post
* @param irg the irg graph
* @param pre walker function, executed before the predecessor of a node are visited
* @param post walker function, executed after the predecessor of a node are visited
* @param env environment, passed to pre and post
*/
void irg_walk_anchors(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env);
......
......@@ -95,33 +95,65 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
return pset_insert(ctx->blk_map, elem, HASH_PTR(block));
}
/**
* Traverse a block in pre order.
*/
static void traverse_block_pre(ir_node *block, block_entry_t *entry, irg_walk_func *pre, void *env) {
int j;
for (j = ARR_LEN(entry->cf_list) - 1; j >= 0; --j) {
ir_node *node = entry->cf_list[j];
pre(node, env);
}
for (j = ARR_LEN(entry->df_list) - 1; j >= 0; --j) {
ir_node *node = entry->df_list[j];
pre(node, env);
}
for (j = ARR_LEN(entry->phi_list) - 1; j >= 0; --j) {
ir_node *node = entry->phi_list[j];
pre(node, env);
}
pre(block, env);
}
/**
* Traverse a block in post order.
*/
void traverse_block_post(ir_node *block, block_entry_t *entry, irg_walk_func *post, void *env) {
int j, n;
post(block, env);
for (j = 0, n = ARR_LEN(entry->phi_list); j < n; ++j) {
ir_node *node = entry->phi_list[j];
post(node, env);
}
for (j = 0, n = ARR_LEN(entry->df_list); j < n; ++j) {
ir_node *node = entry->df_list[j];
post(node, env);
}
for (j = 0, n = ARR_LEN(entry->cf_list); j < n; ++j) {
ir_node *node = entry->cf_list[j];
post(node, env);
}
}
/**
* traverse the pre order only, from End to Start
*/
static void traverse_pre(blk_collect_data_t* blks, irg_walk_func *pre, void *env)
{
int i, j;
static void traverse_pre(blk_collect_data_t *blks, irg_walk_func *pre, void *env) {
int i;
for (i = ARR_LEN(blks->blk_list) - 1; i >= 0; --i) {
ir_node *block = blks->blk_list[i];
block_entry_t *entry = block_find_entry(block, blks);
for (j = ARR_LEN(entry->cf_list) - 1; j >= 0; --j) {
ir_node *node = entry->cf_list[j];
pre(node, env);
}
for (j = ARR_LEN(entry->df_list) - 1; j >= 0; --j) {
ir_node *node = entry->df_list[j];
pre(node, env);
}
for (j = ARR_LEN(entry->phi_list) - 1; j >= 0; --j) {
ir_node *node = entry->phi_list[j];
pre(node, env);
}
pre(block, env);
traverse_block_pre(block, entry, pre, env);
DEL_ARR_F(entry->entry_list);
DEL_ARR_F(entry->phi_list);
......@@ -133,30 +165,14 @@ static void traverse_pre(blk_collect_data_t* blks, irg_walk_func *pre, void *env
/**
* traverse the post order only, from Start to End
*/
static void traverse_post(blk_collect_data_t* blks, irg_walk_func *post, void *env)
{
int i, j;
static void traverse_post(blk_collect_data_t *blks, irg_walk_func *post, void *env) {
int i, k;
for (i = 0; i < ARR_LEN(blks->blk_list); ++i) {
for (i = 0, k = ARR_LEN(blks->blk_list); i < k; ++i) {
ir_node *block = blks->blk_list[i];
block_entry_t *entry = block_find_entry(block, blks);
post(block, env);
for (j = 0; j < ARR_LEN(entry->phi_list); ++j) {
ir_node *node = entry->phi_list[j];
post(node, env);
}
for (j = 0; j < ARR_LEN(entry->df_list); ++j) {
ir_node *node = entry->df_list[j];
post(node, env);
}
for (j = 0; j < ARR_LEN(entry->cf_list); ++j) {
ir_node *node = entry->cf_list[j];
post(node, env);
}
traverse_block_post(block, entry, post, env);
DEL_ARR_F(entry->entry_list);
DEL_ARR_F(entry->phi_list);
......@@ -168,30 +184,15 @@ static void traverse_post(blk_collect_data_t* blks, irg_walk_func *post, void *e
/**
* traverse both
*/
static void traverse_both(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk_func *post, void *env)
static void traverse_both(blk_collect_data_t *blks, irg_walk_func *pre, irg_walk_func *post, void *env)
{
int i, j;
int i;
for (i = ARR_LEN(blks->blk_list) - 1; i >= 0; --i) {
ir_node *block = blks->blk_list[i];
block_entry_t *entry = block_find_entry(block, blks);
for (j = ARR_LEN(entry->cf_list) - 1; j >= 0; --j) {
ir_node *node = entry->cf_list[j];
pre(node, env);
}
for (j = ARR_LEN(entry->df_list) - 1; j >= 0; --j) {
ir_node *node = entry->df_list[j];
pre(node, env);
}
for (j = ARR_LEN(entry->phi_list) - 1; j >= 0; --j) {
ir_node *node = entry->phi_list[j];
pre(node, env);
}
pre(block, env);
traverse_block_pre(block, entry, pre, env);
}
/* second step */
......@@ -199,15 +200,58 @@ static void traverse_both(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk
}
/**
* Do the traversal
* Do the traversal.
*/
static void traverse(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk_func *post, void *env)
{
static void traverse_blocks(blk_collect_data_t *blks, irg_walk_func *pre, irg_walk_func *post, void *env) {
if (!post) traverse_pre (blks, pre, env);
else if (!pre) traverse_post(blks, post, env);
else traverse_both(blks, pre, post, env);
}
typedef struct dom_traversal_t {
blk_collect_data_t *blks;
irg_walk_func *pre;
irg_walk_func *post;
void *env;
} dom_traversal_t;
/**
* Dom block pre walker.
*/
static void pre_block_visit(ir_node *block, void *env) {
dom_traversal_t *ctx = env;
block_entry_t *entry = block_find_entry(block, ctx->blks);
traverse_block_pre(block, entry, ctx->pre, ctx->env);
}
/**
* Dom block post walker.
*/
static void post_block_visit(ir_node *block, void *env) {
dom_traversal_t *ctx = env;
block_entry_t *entry = block_find_entry(block, ctx->blks);
traverse_block_post(block, entry, ctx->post, ctx->env);
}
/**
* Do the traversal in the dominator tree.
*/
static void traverse_dom_blocks(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk_func *post, void *env) {
dom_traversal_t ctx;
ctx.blks = blks;
ctx.pre = pre;
ctx.post = post;
ctx.env = env;
dom_tree_walk_irg(current_ir_graph,
pre != NULL ? pre_block_visit : NULL,
post != NULL ? post_block_visit : NULL,
&ctx);
}
/**
* walks over the graph and collects all blocks and all block entries
*/
......@@ -347,7 +391,8 @@ static void collect_lists(blk_collect_data_t *env)
* Intraprozedural graph walker over blocks.
*/
static void
do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env, unsigned follow_deps)
do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env, unsigned follow_deps,
void (*traverse)(blk_collect_data_t* blks, irg_walk_func *pre, irg_walk_func *post, void *env))
{
ir_node *end_node = get_irg_end(irg);
ir_node *end_blk = get_irg_end_block(irg);
......@@ -397,16 +442,24 @@ void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *po
hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
current_ir_graph = irg;
do_irg_walk_blk(irg, pre, post, env, 0);
do_irg_walk_blk(irg, pre, post, env, 0, traverse_blocks);
current_ir_graph = rem;
}
void irg_walk_in_or_dep_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
ir_graph * rem = current_ir_graph;
hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
current_ir_graph = irg;
do_irg_walk_blk(irg, pre, post, env, 1);
do_irg_walk_blk(irg, pre, post, env, 1, traverse_blocks);
current_ir_graph = rem;
}
void irg_walk_blkwise_dom_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
ir_graph * rem = current_ir_graph;
hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
current_ir_graph = irg;
do_irg_walk_blk(irg, pre, post, env, 0, traverse_dom_blocks);
current_ir_graph = rem;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment