X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbeuses.c;h=5b9375f09140417d92c3b66587152e4f828aadda;hb=1feecdf96eadc9bfd6e94b245eb38e0009a80c02;hp=defe30878a9536607f0c112e398c4717f08f6d4a;hpb=bf3c9c635dbb99589a219bdcd17878fe86193c04;p=libfirm diff --git a/ir/be/beuses.c b/ir/be/beuses.c index defe30878..5b9375f09 100644 --- a/ir/be/beuses.c +++ b/ir/be/beuses.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -24,9 +24,7 @@ * @date 27.06.2005 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include @@ -46,12 +44,11 @@ #include "be_t.h" #include "beutil.h" #include "belive_t.h" -#include "benode_t.h" -#include "besched_t.h" +#include "benode.h" +#include "besched.h" #include "beirgmod.h" -#include "bearch_t.h" +#include "bearch.h" #include "beuses.h" -#include "benodesets.h" #define SCAN_INTERBLOCK_USES @@ -75,6 +72,8 @@ static int cmp_use(const void *a, const void *b, size_t n) { const be_use_t *p = a; const be_use_t *q = b; + (void) n; + return !(p->block == q->block && p->node == q->node); } @@ -86,7 +85,7 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env, const ir_node *block, const ir_node *def) { - unsigned hash = HASH_COMBINE(nodeset_hash(block), nodeset_hash(def)); + unsigned hash = HASH_COMBINE(hash_irn(block), hash_irn(def)); be_use_t temp; be_use_t* result; @@ -94,7 +93,7 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env, temp.node = def; result = set_find(env->uses, &temp, sizeof(temp), hash); - if(result == NULL) { + if (result == NULL) { // insert templ first as we might end in a loop in the get_next_use // call otherwise temp.next_use = USES_INFINITY; @@ -103,12 +102,12 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env, result = set_insert(env->uses, &temp, sizeof(temp), hash); } - if(result->outermost_loop < 0 && result->visited < env->visited_counter) { + if (result->outermost_loop < 0 && result->visited < env->visited_counter) { be_next_use_t next_use; result->visited = env->visited_counter; next_use = get_next_use(env, sched_first(block), 0, def, 0); - if(next_use.outermost_loop >= 0) { + if (next_use.outermost_loop >= 0) { result->next_use = next_use.time; result->outermost_loop = next_use.outermost_loop; DBG((env->dbg, LEVEL_5, "Setting nextuse of %+F in block %+F to %u (outermostloop %d)\n", def, block, result->next_use, result->outermost_loop)); @@ -118,29 +117,27 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env, return result; } -static int be_is_phi_argument(const be_lv_t *lv, const ir_node *block, const ir_node *def) +static int be_is_phi_argument(const ir_node *block, const ir_node *def) { ir_node *node; ir_node *succ_block = NULL; - const ir_edge_t *edge; int arity, i; -#if 0 - if(get_irn_n_edges_kind(block, EDGE_KIND_BLOCK) > 1) - return 0; +#if 1 + if (get_irn_n_edges_kind(block, EDGE_KIND_BLOCK) < 1) +#else + if (get_irn_n_edges_kind(block, EDGE_KIND_BLOCK) != 1) #endif + return 0; - foreach_block_succ(block, edge) { - succ_block = get_edge_src_irn(edge); - break; - } + succ_block = get_first_block_succ(block); arity = get_Block_n_cfgpreds(succ_block); - if(arity <= 1) + if (arity <= 1) return 0; - for(i = 0; i < arity; ++i) { - if(get_Block_cfgpred_block(succ_block, i) == block) + for (i = 0; i < arity; ++i) { + if (get_Block_cfgpred_block(succ_block, i) == block) break; } assert(i < arity); @@ -148,19 +145,18 @@ static int be_is_phi_argument(const be_lv_t *lv, const ir_node *block, const ir_ sched_foreach(succ_block, node) { ir_node *arg; - if(!is_Phi(node)) + if (!is_Phi(node)) break; arg = get_irn_n(node, i); - if(arg == def) + if (arg == def) return 1; } return 0; } -static INLINE -unsigned get_step(const ir_node *node) +static inline unsigned get_step(const ir_node *node) { return PTR_TO_INT(get_irn_link(node)); } @@ -169,7 +165,7 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, unsigned from_step, const ir_node *def, int skip_from_uses) { - unsigned step = from_step; + unsigned step = from_step; ir_node *block = get_nodes_block(from); ir_node *next_use; ir_node *node; @@ -179,7 +175,7 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, #if 1 assert(skip_from_uses == 0 || skip_from_uses == 1); - if(skip_from_uses) { + if (skip_from_uses) { from = sched_next(from); } @@ -190,24 +186,27 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, ir_node *node = get_edge_src_irn(edge); unsigned node_step; - if(get_nodes_block(node) != block) + if (is_Anchor(node)) continue; - if(is_Phi(node)) + if (get_nodes_block(node) != block) + continue; + if (is_Phi(node)) continue; node_step = get_step(node); - if(node_step < timestep) + if (node_step < timestep) continue; - if(node_step < next_use_step) { + if (node_step < next_use_step) { next_use = node; next_use_step = node_step; } } - if(next_use != NULL) { + if (next_use != NULL) { be_next_use_t result; result.time = next_use_step - timestep + skip_from_uses; result.outermost_loop = get_loop_depth(get_irn_loop(block)); + result.before = next_use; return result; } @@ -215,7 +214,7 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, step = get_step(node) + 1 + timestep + skip_from_uses; #else - if(skip_from_uses) { + if (skip_from_uses) { from = sched_next(from); ++step; } @@ -223,7 +222,7 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, sched_foreach_from(from, node) { int i, arity; - if(is_Phi(node)) { + if (is_Phi(node)) { step++; continue; } @@ -245,8 +244,9 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, return be_get_next_use(env, node, step, node, 1); } - result.time = step; + result.time = step; result.outermost_loop = get_loop_depth(get_irn_loop(block)); + result.before = node; return result; } } @@ -255,7 +255,7 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, } #endif - if(be_is_phi_argument(env->lv, block, def)) { + if (be_is_phi_argument(block, def)) { // TODO we really should continue searching the uses of the phi, // as a phi isn't a real use that implies a reload (because we could // easily spill the whole phi) @@ -263,6 +263,7 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, be_next_use_t result; result.time = step; result.outermost_loop = get_loop_depth(get_irn_loop(block)); + result.before = block; return result; } @@ -278,6 +279,7 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, ir_graph *irg = get_irn_irg(block); ir_node *startblock = get_irg_start_block(irg); + result.before = NULL; outermost_loop = loopdepth; foreach_block_succ(block, edge) { const be_use_t *use; @@ -285,11 +287,11 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, ir_loop *succ_loop; unsigned use_dist; - if(succ_block == startblock) + if (succ_block == startblock) continue; DBG((env->dbg, LEVEL_5, "Checking succ of block %+F: %+F (for use of %+F)\n", block, succ_block, def)); - if(!be_is_live_in(env->lv, succ_block, def)) { + if (!be_is_live_in(env->lv, succ_block, def)) { //next_use = USES_INFINITY; DBG((env->dbg, LEVEL_5, " not live in\n")); continue; @@ -298,8 +300,8 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, use = get_or_set_use_block(env, succ_block, def); DBG((env->dbg, LEVEL_5, "Found %u (loopdepth %d) (we're in block %+F)\n", use->next_use, use->outermost_loop, block)); - if(USES_IS_INFINITE(use->next_use)) { - if(use->outermost_loop < 0) { + if (USES_IS_INFINITE(use->next_use)) { + if (use->outermost_loop < 0) { found_visited = 1; } continue; @@ -309,26 +311,27 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, use_dist = use->next_use; succ_loop = get_irn_loop(succ_block); - if(get_loop_depth(succ_loop) < loopdepth) { + if (get_loop_depth(succ_loop) < loopdepth) { unsigned factor = (loopdepth - get_loop_depth(succ_loop)) * 5000; DBG((env->dbg, LEVEL_5, "Increase usestep because of loop out edge %d -> %d (%u)\n", factor)); // TODO we should use the number of nodes in the loop or so... use_dist += factor; } - if(use_dist < next_use) { - next_use = use_dist; + if (use_dist < next_use) { + next_use = use_dist; outermost_loop = use->outermost_loop; + result.before = use->node; } } - if(loopdepth < outermost_loop) + if (loopdepth < outermost_loop) outermost_loop = loopdepth; - result.time = next_use + step; + result.time = next_use + step; result.outermost_loop = outermost_loop; - if(!found_use && found_visited) { + if (!found_use && found_visited) { // the current result is correct for the current search, but isn't // generally correct, so mark it result.outermost_loop = -1; @@ -349,17 +352,15 @@ be_next_use_t be_get_next_use(be_uses_t *env, ir_node *from, return get_next_use(env, from, from_step, def, skip_from_uses); } -static -void set_sched_step_walker(ir_node *block, void *data) +static void set_sched_step_walker(ir_node *block, void *data) { ir_node *node; unsigned step = 0; + (void) data; sched_foreach(block, node) { set_irn_link(node, INT_TO_PTR(step)); - if(is_Phi(node)) - continue; - if(is_Proj(node)) + if (is_Phi(node)) continue; ++step; } @@ -367,7 +368,7 @@ void set_sched_step_walker(ir_node *block, void *data) be_uses_t *be_begin_uses(ir_graph *irg, const be_lv_t *lv) { - be_uses_t *env = xmalloc(sizeof(env[0])); + be_uses_t *env = XMALLOC(be_uses_t); edges_assure(irg);