X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=cb8f22a9f4a08b624521461ae0542eac2b92ec5a;hb=3c0e9566e2d8d292549d239f22e95b4092452c25;hp=86f2308d3953b2df921557f3775fe77a5f01ac8c;hpb=a1cf7cc9742645630a1bf5c56c72f542d975645f;p=libfirm diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c index 86f2308d3..cb8f22a9f 100644 --- a/ir/be/bechordal.c +++ b/ir/be/bechordal.c @@ -3,6 +3,9 @@ * @author Sebastian Hack * @date 8.12.2004 */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include @@ -27,8 +30,19 @@ #include "besched_t.h" #include "belive_t.h" + + #undef DUMP_INTERVALS -#define DUMP_PRESSURE +#undef DUMP_PRESSURE +#define DUMP_IFG + +#define BUILD_GRAPH + +#ifdef USE_OLD_PHI_INTERFERENCE +#undef BUILD_GRAPH +#define BUILD_GRAPH +#endif + #define TEST_COLORS 2048 @@ -42,26 +56,13 @@ typedef struct _border_t { unsigned is_def : 1; /**< Does this border denote a use or a def. */ } border_t; -typedef struct _if_edge_t { - int src, tgt; -} if_edge_t; - -#define IF_EDGE_HASH(e) ((e)->src) - -static int if_edge_cmp(const void *p1, const void *p2, size_t size) -{ - const if_edge_t *e1 = p1; - const if_edge_t *e2 = p2; - - return !(e1->src == e2->src && e1->tgt == e2->tgt); -} - typedef struct _env_t { struct obstack obst; /**< An obstack for temporary storage. */ - set *phi_if; /**< The phi interference map. */ + set *graph; /**< The interference graph. */ bitset_t *live; /**< A live bitset to use in every block. */ bitset_t *processed; /**< A set marking processed blocks. */ bitset_t *colors; /**< The color mask. */ + bitset_t *in_colors; /**< Colors used by live in values. */ int colors_n; /**< The number of colors. */ } env_t; @@ -131,11 +132,11 @@ static void draw_interval_graphs(ir_node *block, int pos = last_pos - seen[nr]; int end_pos = last_pos - b->step; int live_in = is_live_in(block, irn); - int live_out = is_live_out(block, irn); + int live_end = is_live_end(block, irn); int y_val = y_dist * col; int red = 0; - int green = live_out; + int green = live_end; int blue = live_in; fprintf(f, "0 0 0 setrgbcolor\n"); @@ -153,6 +154,22 @@ static void draw_interval_graphs(ir_node *block, } } +#ifdef BUILD_GRAPH + +typedef struct _if_edge_t { + int src, tgt; +} if_edge_t; + +#define IF_EDGE_HASH(e) ((e)->src) + +static int if_edge_cmp(const void *p1, const void *p2, size_t size) +{ + const if_edge_t *e1 = p1; + const if_edge_t *e2 = p2; + + return !(e1->src == e2->src && e1->tgt == e2->tgt); +} + static INLINE if_edge_t *edge_init(if_edge_t *edge, int src, int tgt) { /* Bring the smaller entry to src. */ @@ -171,17 +188,36 @@ static INLINE void add_if(const env_t *env, int src, int tgt) { if_edge_t edge; edge_init(&edge, src, tgt); - set_insert(env->phi_if, &edge, sizeof(edge), IF_EDGE_HASH(&edge)); + set_insert(env->graph, &edge, sizeof(edge), IF_EDGE_HASH(&edge)); } static INLINE int are_connected(const env_t *env, int src, int tgt) { if_edge_t edge; edge_init(&edge, src, tgt); - return set_find(env->phi_if, &edge, sizeof(edge), IF_EDGE_HASH(&edge)) != NULL; + return set_find(env->graph, &edge, sizeof(edge), IF_EDGE_HASH(&edge)) != NULL; } +static void dump_ifg(set *edges, const char *filename) +{ + FILE *f; + + if((f = fopen(filename, "wt")) != NULL) { + if_edge_t *edge; + + fprintf(f, "graph G {\n"); + + for(edge = set_first(edges); edge; edge = set_next(edges)) { + fprintf(f, "i\tn%d -- n%d\n", edge->src, edge->tgt); + } + + fprintf(f, "}\n"); + fclose(f); + } + +} +#endif /* USE_OLD_PHI_INTERFERENCE || BUILD_GRAPH */ static INLINE border_t *border_add(env_t *env, struct list_head *head, const ir_node *irn, int step, int is_def) @@ -201,7 +237,9 @@ static void block_alloc(ir_node *block, void *env_ptr) void *obstack_level = obstack_base(obst); bitset_t *live = env->live; bitset_t *colors = env->colors; + bitset_t *in_colors = env->in_colors; bitset_t *used_colors = bitset_malloc(env->colors_n); + bitset_t *tmp_colors = bitset_obstack_alloc(obst, env->colors_n); ir_graph *irg = get_irn_irg(block); int i, n; @@ -211,7 +249,7 @@ static void block_alloc(ir_node *block, void *env_ptr) border_t *b; struct list_head head; pset *live_in = get_live_in(block); - pset *live_out = get_live_out(block); + pset *live_end = get_live_end(block); ir_node *idom = get_Block_idom(block); /* @@ -233,6 +271,7 @@ static void block_alloc(ir_node *block, void *env_ptr) /* Clear the live and allocate the color bitset. */ bitset_clear_all(live); bitset_clear_all(colors); + bitset_clear_all(in_colors); INIT_LIST_HEAD(&head); @@ -240,7 +279,7 @@ static void block_alloc(ir_node *block, void *env_ptr) * Make final uses of all values live out of the block. * They are neccessary to build up real intervals. */ - for(irn = pset_first(live_out); irn; irn = pset_next(live_out)) { + for(irn = pset_first(live_end); irn; irn = pset_next(live_end)) { DBG((dbg, LEVEL_3, "Making live: %n/%d\n", irn, get_irn_graph_nr(irn))); bitset_set(live, get_irn_graph_nr(irn)); if(!is_Phi(irn) && is_allocatable_irn(irn)) @@ -269,17 +308,18 @@ static void block_alloc(ir_node *block, void *env_ptr) bitset_clear(live, nr); border_add(env, &head, irn, step, 1); - if(is_phi_operand(irn)) { +#ifdef BUILD_GRAPH + { unsigned long elm; bitset_foreach(live, elm) { int live_nr = (int) elm; ir_node *live_irn = get_irn_for_graph_nr(irg, live_nr); if(is_phi_operand(live_irn)) { - DBG((dbg, LEVEL_3, "\t\tinterfering phi operands: %n, %n\n", irn, live_irn)); add_if(env, nr, live_nr); } } } +#endif } /* @@ -319,6 +359,7 @@ static void block_alloc(ir_node *block, void *env_ptr) /* Mark the color of the live in value as used. */ assert(is_color(col) && "Node must have been assigned a color."); bitset_set(colors, col); + bitset_set(in_colors, col); bitset_set(used_colors, col); /* Mark the value live in. */ @@ -349,7 +390,24 @@ static void block_alloc(ir_node *block, void *env_ptr) */ if(b->is_def && !is_live_in(block, irn)) { ra_node_info_t *ri = get_ra_node_info(irn); - int col = bitset_next_clear(colors, 0); + int col = NO_COLOR; + + DBG((dbg, LEVEL_4, "colors in use: %b\n", colors)); + + /* + * Try to assign live out values colors which are not used by live + * in values. + */ + if(is_live_out(block, irn)) { + bitset_copy(tmp_colors, colors); + bitset_or(tmp_colors, in_colors); + col = bitset_next_clear(tmp_colors, 0); + DBG((dbg, LEVEL_5, "next clear in only outs %b: %d\n", tmp_colors, col)); + } + + /* If a color is not yet assigned, do it now. */ + if(!is_color(col)) + col = bitset_next_clear(colors, 0); assert(!is_color(get_irn_color(irn)) && "Color must not have assigned"); assert(!bitset_is_set(live, nr) && "Value def must not have been encountered"); @@ -400,6 +458,7 @@ static void block_alloc(ir_node *block, void *env_ptr) } #endif + /* * Allocate the used colors array in the blocks ra info structure and * fill it. @@ -416,7 +475,7 @@ static void block_alloc(ir_node *block, void *env_ptr) void be_ra_chordal_init(void) { dbg = firm_dbg_register(DBG_BERA); - /* firm_dbg_set_mask(dbg, -1); */ + firm_dbg_set_mask(dbg, -1); } void be_ra_chordal(ir_graph *irg) @@ -428,31 +487,52 @@ void be_ra_chordal(ir_graph *irg) compute_doms(irg); obstack_init(&env->obst); - env->phi_if = new_set(if_edge_cmp, node_count); + +#ifdef BUILD_GRAPH + env->graph = new_set(if_edge_cmp, node_count); +#endif + env->live = bitset_obstack_alloc(&env->obst, node_count); env->processed = bitset_obstack_alloc(&env->obst, get_graph_block_count(irg)); env->colors = bitset_obstack_alloc(&env->obst, TEST_COLORS); + env->in_colors = bitset_obstack_alloc(&env->obst, TEST_COLORS); env->colors_n = TEST_COLORS; irg_block_walk_graph(irg, block_alloc, NULL, env); obstack_free(&env->obst, NULL); +#ifdef DUMP_IFG + { + char buf[128]; + + ir_snprintf(buf, sizeof(buf), "ifg_%s.dot", get_entity_name(get_irg_entity(irg))); + dump_ifg(env->graph, buf); + } +#endif + set_irg_ra_link(irg, env); } void be_ra_chordal_done(ir_graph *irg) { env_t *env = get_irg_ra_link(irg); - free(env->phi_if); + +#ifdef BUILD_GRAPH + free(env->graph); +#endif free(env); } int phi_ops_interfere(const ir_node *a, const ir_node *b) { +#ifdef USE_OLD_PHI_INTERFERENCE ir_graph *irg = get_irn_irg(a); env_t *env = get_irg_ra_link(irg); assert(irg == get_irn_irg(b) && "Both nodes must be in the same graph"); return are_connected(env, get_irn_graph_nr(a), get_irn_graph_nr(b)); +#else + return values_interfere(a, b); +#endif /* USE_OLD_PHI_INTERFERENCE */ }