X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeuses.c;h=b3261d3731f330677e8763870a746e39ff3a4d81;hb=b7936c30acf06e28df82497df4ff2779e6b84b4b;hp=f4d802c6d64d1ddd21ac3068d825a5e964903447;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm diff --git a/ir/be/beuses.c b/ir/be/beuses.c index f4d802c6d..b3261d373 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. * @@ -51,7 +51,6 @@ #include "beirgmod.h" #include "bearch_t.h" #include "beuses.h" -#include "benodesets.h" #define SCAN_INTERBLOCK_USES @@ -75,6 +74,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 +87,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; @@ -118,7 +119,7 @@ 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; @@ -159,18 +160,68 @@ static int be_is_phi_argument(const be_lv_t *lv, const ir_node *block, const ir_ return 0; } +static INLINE +unsigned get_step(const ir_node *node) +{ + return PTR_TO_INT(get_irn_link(node)); +} + 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; - ir_node *block = get_nodes_block(from); - ir_node *node; + unsigned step = from_step; + ir_node *block = get_nodes_block(from); + ir_node *next_use; + ir_node *node; + unsigned timestep; + unsigned next_use_step; const ir_edge_t *edge; +#if 1 + assert(skip_from_uses == 0 || skip_from_uses == 1); + if(skip_from_uses) { + from = sched_next(from); + } + + next_use = NULL; + next_use_step = INT_MAX; + timestep = get_step(from); + foreach_out_edge(def, edge) { + ir_node *node = get_edge_src_irn(edge); + unsigned node_step; + + if(is_Anchor(node)) + continue; + if(get_nodes_block(node) != block) + continue; + if(is_Phi(node)) + continue; + + node_step = get_step(node); + if(node_step < timestep) + continue; + if(node_step < next_use_step) { + next_use = node; + next_use_step = node_step; + } + } + + 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; + } + + node = sched_last(block); + step = get_step(node) + 1 + timestep + skip_from_uses; + +#else if(skip_from_uses) { - step++; from = sched_next(from); + ++step; } sched_foreach_from(from, node) { @@ -198,38 +249,42 @@ 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; } } step++; } +#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) be_next_use_t result; - result.time = step; + result.time = step; result.outermost_loop = get_loop_depth(get_irn_loop(block)); + result.before = block; return result; } #ifdef SCAN_INTERBLOCK_USES { - unsigned next_use = USES_INFINITY; + unsigned next_use = USES_INFINITY; int outermost_loop; be_next_use_t result; - ir_loop *loop = get_irn_loop(block); - int loopdepth = get_loop_depth(loop); - int found_visited = 0; - int found_use = 0; - ir_graph *irg = get_irn_irg(block); + ir_loop *loop = get_irn_loop(block); + int loopdepth = get_loop_depth(loop); + int found_visited = 0; + int found_use = 0; + 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; @@ -269,15 +324,16 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from, } if(use_dist < next_use) { - next_use = use_dist; + next_use = use_dist; outermost_loop = use->outermost_loop; + result.before = use->node; } } 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) { @@ -301,12 +357,34 @@ 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) +{ + 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)) + continue; + ++step; + } +} + be_uses_t *be_begin_uses(ir_graph *irg, const be_lv_t *lv) { be_uses_t *env = xmalloc(sizeof(env[0])); edges_assure(irg); + //set_using_irn_link(irg); + + /* precalculate sched steps */ + irg_block_walk_graph(irg, set_sched_step_walker, NULL, NULL); + env->uses = new_set(cmp_use, 512); env->irg = irg; env->lv = lv; @@ -318,6 +396,7 @@ be_uses_t *be_begin_uses(ir_graph *irg, const be_lv_t *lv) void be_end_uses(be_uses_t *env) { + //clear_using_irn_link(env->irg); del_set(env->uses); free(env); }