X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=2fcb990d5cba1c3cf21446da243f532866278de8;hb=3a2cc1d47466d98f2f09a22425d122051a37a5e7;hp=cadaf20bf75eb8caf4e93e6eaa8712312431b43d;hpb=83c9157ff224552a9b16a73fe4a16451f4963831;p=libfirm diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c index cadaf20bf..2fcb990d5 100644 --- a/ir/be/bechordal.c +++ b/ir/be/bechordal.c @@ -14,6 +14,7 @@ #include #include "obst.h" +#include "pset.h" #include "list.h" #include "bitset.h" #include "iterator.h" @@ -29,211 +30,33 @@ #include "beutil.h" #include "besched.h" -#include "bera_t.h" #include "benumb_t.h" #include "besched_t.h" #include "belive_t.h" -#include "bechordal_t.h" #include "bearch.h" -#define BUILD_GRAPH +#include "bechordal_t.h" +#include "bechordal_draw.h" + +#define DBG_LEVEL 0 +#define NO_COLOR (-1) + #undef DUMP_INTERVALS #undef DUMP_PRESSURE #undef DUMP_IFG #if defined(DUMP_IFG) && !defined(BUILD_GRAPH) -#define BUILD_GRAPH +#error Must define BUILD_GRAPH to be able to dump it. #endif -#ifdef DEBUG_libfirm #include "fourcc.h" /* Make a fourcc for border checking. */ #define BORDER_FOURCC FOURCC('B', 'O', 'R', 'D') -#endif /* DEBUG_libfirm */ - -#define TEST_COLORS 2048 - static firm_dbg_module_t *dbg; -/** - * Environment for each of the chordal register allocator phases - */ -typedef struct _env_t { - struct obstack obst; /**< An obstack for temporary storage. */ - ir_graph *irg; /**< The graph the reg alloc is running on. */ -#ifdef BUILD_GRAPH - set *nodes; /**< The interference graph nodes. */ - set *edges; /**< The interference graph edges. */ -#endif - - bitset_t *live; /**< A liveness bitset. */ - bitset_t *colors; /**< The color mask. */ - bitset_t *in_colors; /**< Colors used by live in values. */ - int colors_n; /**< The number of colors. */ - const arch_env_t *arch_env; /**< The arch interface environment. */ - const arch_register_class_t *cls; /**< The current register class. */ - void *data; /**< Some pointer, to which different - phases can attach data to. */ -} env_t; - - -typedef struct _be_chordal_dump_params_t { - int x_dist; - int y_dist; - double font_scale; -} be_chordal_dump_params_t; - -static const be_chordal_dump_params_t dump_params = { - 10, - 10, - 4 -}; - -#ifdef DUMP_INTERVALS - -static INLINE void intv_filename(char *s, size_t n, - const env_t *env, ir_node *block) -{ - ir_snprintf(s, n, "intv_%F_%s_bl%N.eps", - env->irg, env->cls->name, block); -} - -static void draw_interval_graph(const env_t *env, - ir_node *block, const be_chordal_dump_params_t *params) -{ - int i; - int x_dist = params->x_dist; - int y_dist = params->y_dist; - ir_graph *irg = env->irg; - struct list_head *border_head = get_block_border_head(block); - - FILE *f; - char buf[1024]; - - intv_filename(buf, sizeof(buf), env, block); - - if((f = fopen(buf, "wt")) != NULL) { - border_t *b; - int *seen = xcalloc(get_graph_node_count(irg), sizeof(seen[0])); - int last_pos = list_empty(border_head) ? 0 : list_entry(border_head->prev, border_t, list)->step; - int max_col = 0; - - list_for_each_entry_reverse(border_t, b, border_head, list) { - const ir_node *irn = b->irn; - int col = get_irn_color(irn); - max_col = max_col > col ? max_col : col; - } - - fprintf(f, "%%!PS-Adobe-2.0\n"); - fprintf(f, "%%%%BoundingBox: -10 -10 %d %d\n", - x_dist * last_pos + x_dist, y_dist * max_col + y_dist); - fprintf(f, "/mainfont /Courier findfont %f scalefont def\n", params->font_scale); - fprintf(f, "mainfont setfont\n"); - fprintf(f, "0.2 setlinewidth\n"); - - for(i = 0; i <= last_pos; ++i) { - fprintf(f, "0 0 0 setrgbcolor\n"); - fprintf(f, "%d %d moveto\n", i * x_dist, -2); - fprintf(f, "%d %d lineto\n", i * x_dist, max_col * y_dist + 2); - fprintf(f, "stroke\n"); - } - fprintf(f, "0.5 setlinewidth\n"); - - list_for_each_entry_reverse(border_t, b, border_head, list) { - const ir_node *irn = b->irn; - int nr = get_irn_graph_nr(irn); - - if(b->is_def) - seen[nr] = b->step; - else { - int col = get_irn_color(irn); - - int pos = last_pos - seen[nr]; - int end_pos = last_pos - b->step; - int live_in = is_live_in(block, irn); - int live_end = is_live_end(block, irn); - int y_val = y_dist * col; - - int red = 0; - int green = live_end; - int blue = live_in; - - fprintf(f, "0 0 0 setrgbcolor\n"); - fprintf(f, "%d %d moveto\n", x_dist * pos + 2, y_val + 2); - ir_fprintf(f, "(%n/%d%s) show\n", irn, nr, is_phi_operand(irn) ? "*" : ""); - fprintf(f, "%d %d %d setrgbcolor\n", red, green, blue); - fprintf(f, "%d %d moveto\n", x_dist * pos, y_val); - fprintf(f, "%d %d lineto\n", (x_dist * end_pos) - 5, y_val); - fprintf(f, "stroke\n"); - } - } - - free(seen); - fclose(f); - } -} - -static void dump_block(ir_node *bl, void *data) -{ - const env_t *env = data; - FILE *f = env->data; - char buf[128]; - - draw_interval_graph(env, bl, &dump_params); - - intv_filename(buf, sizeof(buf), env, bl); - ir_fprintf(f, "\tb%N [shape=\"epsf\" shapefile=\"%s\"];\n", bl, buf); -} - -static void dump_edges(ir_node *bl, void *data) -{ - const env_t *env = data; - FILE *f = env->data; - int i, n; - ir_node *dom; - -#if 0 - for(i = 0, n = get_irn_arity(bl); i < n; ++i) { - ir_node *pred = get_irn_n(bl, i); - ir_fprintf(f, "\tb%N -> b%N;\n", get_nodes_block(pred), bl); - } -#endif - - for(dom = get_Block_dominated_first(bl); dom; - dom = get_Block_dominated_next(dom)) { - - ir_fprintf(f, "\tb%N -> b%N;\n", dom, bl); - } -} - -static void dump_intv_cfg(env_t *env) -{ - FILE *f; - char buf[128]; - - ir_snprintf(buf, sizeof(buf), "intv_cfg_%s_%F.dot", - env->cls->name, env->irg); - - if((f = fopen(buf, "wt")) != NULL) { - void *old_data = env->data; - - env->data = f; - ir_fprintf(f, "digraph G {\n"); - ir_fprintf(f, "\tgraph [rankdir=\"LR\", ordering=\"out\"];\n"); - dom_tree_walk_irg(env->irg, dump_block, dump_edges, env); - // irg_block_walk_graph(env->irg, dump_block, dump_edges, env); - ir_fprintf(f, "}\n"); - fclose(f); - - env->data = old_data; - } -} - -#endif - #ifdef BUILD_GRAPH #define IF_EDGE_HASH(e) ((e)->src) @@ -269,7 +92,7 @@ static INLINE if_edge_t *edge_init(if_edge_t *edge, int src, int tgt) return edge; } -static INLINE void add_if(const env_t *env, int src, int tgt) +static INLINE void add_if(const be_chordal_env_t *env, int src, int tgt) { if_edge_t edge; if_node_t node, *src_node, *tgt_node; @@ -290,102 +113,27 @@ static INLINE void add_if(const env_t *env, int src, int tgt) pset_insert_ptr(tgt_node->neighb, src_node); } -static INLINE int are_connected(const env_t *env, int src, int tgt) +static INLINE int are_connected(const be_chordal_env_t *env, int src, int tgt) { if_edge_t edge; edge_init(&edge, src, tgt); return set_find(env->edges, &edge, sizeof(edge), IF_EDGE_HASH(&edge)) != NULL; } -int ifg_has_edge(const ir_graph *irg, if_node_t *n1, if_node_t* n2) { - return are_connected(get_irg_ra_link(irg), n1->nnr, n2->nnr); +int ifg_has_edge(const be_chordal_env_t *env, const if_node_t *n1, const if_node_t* n2) { + return are_connected(env, n1->nnr, n2->nnr); } -static void dump_ifg(ir_graph *irg, set *edges, const char *filename) -{ - static const char *colors[] = { - "coral", - "azure", - "bisque", - "aliceblue", - "blanchedalmond", - "deeppink", - "cornsilk", - "blueviolet", - "floralwhite", - "hotpink", - "gainsboro", - "indianred", - "cornflowerblue", - "ghostwhite", - "lightpink", - "palegoldenrod", - "darkslateblue", - "honeydew", - "ivory", - "lavender", - "mediumvioletred", - "indigo", - "lavenderblush", - "lemonchiffon", - "linen", - "pink", - "mintcream", - "red", - "mediumblue", - "mistyrose", - "mediumslateblue", - "moccasin", - "tomato", - "forestgreen", - "midnightblue", - "navajowhite", - "navy", - "oldlace", - "greenyellow", - "navyblue", - "papayawhip", - "lawngreen", - "powderblue", - "peachpuff", - "seashell", - "snow", - "thistle", - "wheat", - "darkkhaki", - "mintcream", - "khaki", - "Magentas", - "whitesmoke", - "peru", - "palegreen", - "blueviolet", - "rosybrown", - "saddlebrown", - "springgreen", - "darkviolet", - "darkslategray", - "dimgray", - "sienna", - "gray", - "tan", - "gray", - "mediumvioletred", - "lightgray", - "Oranges", - "cyan", - "lightslategray", - "darkorange", - "slategray", - "orangered", - "mediumturquoise", - "violet", - "paleturquoise" - }; - - static const int n_colors = sizeof(colors) / sizeof(colors[0]); +#ifdef DUMP_IFG +static void dump_ifg(const be_chordal_env_t *env) +{ FILE *f; + set *edges = env->edges; + ir_graph *irg = env->irg; + char filename[128]; + + ir_snprintf(filename, sizeof(filename), "ifg_%s_%F.dot", env->cls->name, irg); if((f = fopen(filename, "wt")) != NULL) { bitset_pos_t pos; @@ -407,10 +155,8 @@ static void dump_ifg(ir_graph *irg, set *edges, const char *filename) bitset_foreach(bs, pos) { int nr = (int) pos; ir_node *irn = get_irn_for_graph_nr(irg, nr); - int color = get_irn_color(irn); - ir_fprintf(f, "\tn%d [label=\"%n\",color=\"%s\"]\n", nr, irn, - color >= 0 && color < n_colors ? colors[color] : "black"); + ir_fprintf(f, "\tn%d [label=\"%+F\"]\n", nr, irn); } for(edge = set_first(edges); edge; edge = set_next(edges)) { @@ -425,8 +171,27 @@ static void dump_ifg(ir_graph *irg, set *edges, const char *filename) } +#endif /* DUMP_IFG */ + #endif /* BUILD_GRAPH */ +static void check_border_list(struct list_head *head) +{ + border_t *x; + list_for_each_entry(border_t, x, head, list) { + assert(x->magic == BORDER_FOURCC); + } +} + +static void check_heads(be_chordal_env_t *env) +{ + pmap_entry *ent; + for(ent = pmap_first(env->border_heads); ent; ent = pmap_next(env->border_heads)) { + /* ir_printf("checking border list of block %+F\n", ent->key); */ + check_border_list(ent->value); + } +} + /** * Add an interval border to the list of a block's list @@ -440,7 +205,7 @@ static void dump_ifg(ir_graph *irg, set *edges, const char *filename) * @param is_def Is the border a use or a def. * @return The created border. */ -static INLINE border_t *border_add(env_t *env, struct list_head *head, +static INLINE border_t *border_add(be_chordal_env_t *env, struct list_head *head, ir_node *irn, unsigned step, unsigned pressure, unsigned is_def, unsigned is_real) { @@ -453,6 +218,7 @@ static INLINE border_t *border_add(env_t *env, struct list_head *head, /* also allocate the def and tie it to the use. */ def = obstack_alloc(&env->obst, sizeof(*def)); + memset(def, 0, sizeof(*def)); b->other_end = def; def->other_end = b; @@ -463,10 +229,8 @@ static INLINE border_t *border_add(env_t *env, struct list_head *head, */ set_irn_link(irn, def); -#ifdef DEBUG_libfirm b->magic = BORDER_FOURCC; def->magic = BORDER_FOURCC; -#endif } /* @@ -477,9 +241,7 @@ static INLINE border_t *border_add(env_t *env, struct list_head *head, else { b = get_irn_link(irn); -#ifdef DEBUG_libfirm assert(b && b->magic == BORDER_FOURCC && "Illegal border encountered"); -#endif } b->pressure = pressure; @@ -487,13 +249,21 @@ static INLINE border_t *border_add(env_t *env, struct list_head *head, b->is_real = is_real; b->irn = irn; b->step = step; + check_heads(env); list_add_tail(&b->list, head); - DBG((dbg, LEVEL_5, "\t\t%s adding %n, step: %d\n", + check_heads(env); + DBG((dbg, LEVEL_5, "\t\t%s adding %+F, step: %d\n", is_def ? "def" : "use", irn, step)); + return b; } +static INLINE int has_reg_class(const be_chordal_env_t *env, const ir_node *irn) +{ + return arch_irn_has_reg_class(env->arch_env, irn, arch_pos_make_out(0), env->cls); +} + /** * Annotate the register pressure to the nodes and compute * the liveness intervals. @@ -510,7 +280,7 @@ static void pressure(ir_node *block, void *env_ptr) #define border_use(irn, step, real) \ border_add(env, head, irn, step, ++pressure, 0, real) - env_t *env = env_ptr; + be_chordal_env_t *env = env_ptr; bitset_t *live = env->live; ir_node *irn; @@ -518,28 +288,29 @@ static void pressure(ir_node *block, void *env_ptr) unsigned step = 0; unsigned pressure = 0; struct list_head *head; - pset *live_in = get_live_in(block); - pset *live_end = get_live_end(block); - const arch_register_class_t *cls = env->cls; + pset *live_in = put_live_in(block, pset_new_ptr_default()); + pset *live_end = put_live_end(block, pset_new_ptr_default()); + const arch_register_class_t *cls = env->cls; - DBG((dbg, LEVEL_1, "Computing pressure in block %n\n", block)); + DBG((dbg, LEVEL_1, "Computing pressure in block %+F\n", block)); bitset_clear_all(live); /* Set up the border list in the block info */ - head = &get_ra_block_info(block)->border_head; + head = obstack_alloc(&env->obst, sizeof(*head)); INIT_LIST_HEAD(head); + assert(pmap_get(env->border_heads, block) == NULL); + pmap_insert(env->border_heads, block, head); /* * Make final uses of all values live out of the block. - * They are neccessary to build up real intervals. + * They are necessary to build up real intervals. */ for(irn = pset_first(live_end); irn; irn = pset_next(live_end)) { - DBG((dbg, LEVEL_3, "\tMaking live: %n/%d\n", irn, get_irn_graph_nr(irn))); + DBG((dbg, LEVEL_3, "\tMaking live: %+F/%d\n", irn, get_irn_graph_nr(irn))); bitset_set(live, get_irn_graph_nr(irn)); - if(arch_irn_has_reg_class(env->arch_env, irn, 0, cls)) - border_use(irn, step, 0); + if(has_reg_class(env, irn)) + border_use(irn, step, 0); } - ++step; /* @@ -547,26 +318,23 @@ static void pressure(ir_node *block, void *env_ptr) * relevant for the interval borders. */ sched_foreach_reverse(block, irn) { - DBG((dbg, LEVEL_1, "\tinsn: %n, pressure: %d\n", irn, pressure)); + DBG((dbg, LEVEL_1, "\tinsn: %+F, pressure: %d\n", irn, pressure)); DBG((dbg, LEVEL_2, "\tlive: %b\n", live)); - /* Erase the color of each node encountered. */ - set_irn_color(irn, NO_COLOR); - - /* - * If the node defines some value, which can put into a - * register of the current class, make a border for it. - */ - if(arch_irn_has_reg_class(env->arch_env, irn, 0, cls)) { - bitset_pos_t elm; + /* + * If the node defines some value, which can put into a + * register of the current class, make a border for it. + */ + if(has_reg_class(env, irn)) { + bitset_pos_t elm; int nr = get_irn_graph_nr(irn); bitset_clear(live, nr); border_def(irn, step, 1); #ifdef BUILD_GRAPH - bitset_foreach(live, elm) - add_if(env, nr, (int) elm); + bitset_foreach(live, elm) + add_if(env, nr, (int) elm); #endif } @@ -577,10 +345,10 @@ static void pressure(ir_node *block, void *env_ptr) for(i = 0, n = get_irn_arity(irn); i < n; ++i) { ir_node *op = get_irn_n(irn, i); - if(arch_irn_has_reg_class(env->arch_env, op, 0, cls)) { + if(has_reg_class(env, op)) { int nr = get_irn_graph_nr(op); - DBG((dbg, LEVEL_4, "\t\tpos: %d, use: %n\n", i, op)); + DBG((dbg, LEVEL_4, "\t\tpos: %d, use: %+F\n", i, op)); if(!bitset_is_set(live, nr)) { border_use(op, step, 1); @@ -589,7 +357,6 @@ static void pressure(ir_node *block, void *env_ptr) } } } - ++step; } @@ -597,7 +364,7 @@ static void pressure(ir_node *block, void *env_ptr) * Add initial defs for all values live in. */ for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) { - if(arch_irn_has_reg_class(env->arch_env, irn, 0, cls)) { + if(has_reg_class(env, irn)) { /* Mark the value live in. */ bitset_set(live, get_irn_graph_nr(irn)); @@ -606,16 +373,21 @@ static void pressure(ir_node *block, void *env_ptr) border_def(irn, step, 0); } } + + check_heads(env); + + del_pset(live_in); + del_pset(live_end); } static void assign(ir_node *block, void *env_ptr) { - env_t *env = env_ptr; + be_chordal_env_t *env = env_ptr; struct obstack *obst = &env->obst; bitset_t *live = env->live; bitset_t *colors = env->colors; bitset_t *in_colors = env->in_colors; - const arch_register_class_t *cls = env->cls; + const arch_register_class_t *cls = env->cls; /* Mark the obstack level and allocate the temporary tmp_colors */ void *obstack_level = obstack_base(obst); @@ -623,17 +395,20 @@ static void assign(ir_node *block, void *env_ptr) const ir_node *irn; border_t *b; - struct list_head *head = &get_ra_block_info(block)->border_head; - pset *live_in = get_live_in(block); + struct list_head *head = get_block_border_head(env, block); + pset *live_in = put_live_in(block, pset_new_ptr_default()); + + check_heads(env); + bitset_clear_all(live); bitset_clear_all(colors); bitset_clear_all(in_colors); - DBG((dbg, LEVEL_4, "Assigning colors for block %n\n", block)); + DBG((dbg, LEVEL_4, "Assigning colors for block %+F\n", block)); DBG((dbg, LEVEL_4, "\tusedef chain for block\n")); list_for_each_entry(border_t, b, head, list) { - DBG((dbg, LEVEL_4, "\t%s %n/%d\n", b->is_def ? "def" : "use", + DBG((dbg, LEVEL_4, "\t%s %+F/%d\n", b->is_def ? "def" : "use", b->irn, get_irn_graph_nr(b->irn))); } @@ -643,11 +418,11 @@ static void assign(ir_node *block, void *env_ptr) * allocated before), we have to mark their colors as used also. */ for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) { - if(arch_irn_has_reg_class(env->arch_env, irn, 0, cls)) { + if(has_reg_class(env, irn)) { const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn, 0); int col; - assert(reg && "Nodfe must have been assigned a register"); + assert(reg && "Node must have been assigned a register"); col = arch_register_get_index(reg); /* Mark the color of the live in value as used. */ @@ -689,7 +464,7 @@ static void assign(ir_node *block, void *env_ptr) bitset_set(live, nr); arch_set_irn_register(env->arch_env, irn, 0, reg); - DBG((dbg, LEVEL_1, "\tassigning register %s(%d) to %n\n", + DBG((dbg, LEVEL_1, "\tassigning register %s(%d) to %+F\n", arch_register_get_name(reg), col, irn)); } @@ -710,21 +485,23 @@ static void assign(ir_node *block, void *env_ptr) /* Free the auxillary data on the obstack. */ obstack_free(obst, obstack_level); + + del_pset(live_in); } void be_ra_chordal_init(void) { - dbg = firm_dbg_register(DBG_BERA); - firm_dbg_set_mask(dbg, 0); + dbg = firm_dbg_register(DBG_CHORDAL); + firm_dbg_set_mask(dbg, DBG_LEVEL); } -void be_ra_chordal(ir_graph *irg, +be_chordal_env_t *be_ra_chordal(ir_graph *irg, const arch_env_t *arch_env, const arch_register_class_t *cls) { int node_count = get_graph_node_count(irg); - int colors_n = arch_register_class_n_regs(cls); - env_t *env = malloc(sizeof(*env)); + int colors_n = arch_register_class_n_regs(cls); + be_chordal_env_t *env = malloc(sizeof(*env)); if(get_irg_dom_state(irg) != dom_consistent) compute_doms(irg); @@ -740,39 +517,85 @@ void be_ra_chordal(ir_graph *irg, env->colors = bitset_obstack_alloc(&env->obst, colors_n); env->in_colors = bitset_obstack_alloc(&env->obst, colors_n); env->colors_n = colors_n; - env->cls = cls; - env->arch_env = arch_env; - env->irg = irg; + env->cls = cls; + env->arch_env = arch_env; + env->irg = irg; + env->border_heads = pmap_create(); /* First, determine the pressure */ dom_tree_walk_irg(irg, pressure, NULL, env); /* Insert probable spills */ - be_ra_chordal_spill(irg); + be_ra_chordal_spill(env); /* Assign the colors */ dom_tree_walk_irg(irg, assign, NULL, env); #ifdef DUMP_IFG + dump_ifg(env); +#endif + +#ifdef DUMP_INTERVALS { char buf[128]; + plotter_t *plotter; - ir_snprintf(buf, sizeof(buf), "ifg_%F.dot", irg); - dump_ifg(irg, env->edges, buf); + ir_snprintf(buf, sizeof(buf), "ifg_%s_%F.eps", cls->name, irg); + plotter = new_plotter_ps(buf); + + draw_interval_tree(&draw_chordal_def_opts, env, plotter, arch_env, cls); + plotter_free(plotter); } #endif + return env; +} -#ifdef DUMP_INTERVALS - dump_intv_cfg(env); -#endif +void be_ra_chordal_check(be_chordal_env_t *chordal_env) { + const arch_env_t *arch_env; + struct obstack ob; + pmap_entry *pme; + ir_node **nodes, *n1, *n2; + int i, o; + + arch_env = chordal_env->arch_env; + + /* Collect all irns */ + obstack_init(&ob); + pmap_foreach(chordal_env->border_heads, pme) { + border_t *curr; + struct list_head *head = pme->value; + list_for_each_entry(border_t, curr, head, list) + if (curr->is_def && curr->is_real) + if (arch_get_irn_reg_class(arch_env, curr->irn, arch_pos_make_out(0)) == chordal_env->cls) + obstack_ptr_grow(&ob, curr->irn); + } + obstack_ptr_grow(&ob, NULL); + nodes = (ir_node **) obstack_finish(&ob); - set_irg_ra_link(irg, env); + /* Check them */ + for (i = 0, n1 = nodes[i]; n1; n1 = nodes[++i]) { + const arch_register_t *n1_reg, *n2_reg; + + n1_reg = arch_get_irn_register(arch_env, n1, 0); + if (!arch_reg_is_allocatable(arch_env, n1, arch_pos_make_out(0), n1_reg)) { + DBG((dbg, 0, "Register assigned to %+F is not allowed\n", n1)); + assert(0 && "Register constraint does not hold"); + } + for (o = i+1, n2 = nodes[o]; n2; n2 = nodes[++o]) { + n2_reg = arch_get_irn_register(arch_env, n2, 0); + if (nodes_interfere(chordal_env, n1, n2) && n1_reg == n2_reg) { + DBG((dbg, 0, "Values %+F and %+F interfere and have the same regiseter assigned\n", n1, n2)); + assert(0 && "Interfering values have the same color!"); + } + } + } + obstack_free(&ob, NULL); } -void be_ra_chordal_done(ir_graph *irg) -{ - env_t *env = get_irg_ra_link(irg); +/* BETTER #ifdef BUILD_GRAPH --> faster version of checker with edges */ +void be_ra_chordal_done(be_chordal_env_t *env) +{ #ifdef BUILD_GRAPH { if_node_t *ifn; @@ -783,18 +606,16 @@ void be_ra_chordal_done(ir_graph *irg) } #endif + pmap_destroy(env->border_heads); obstack_free(&env->obst, NULL); free(env); } -int phi_ops_interfere(const ir_node *a, const ir_node *b) -{ -#ifdef BUILD_GRAPH - 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"); +int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node *b) +{ +#ifdef BUILD_GRAPH return are_connected(env, get_irn_graph_nr(a), get_irn_graph_nr(b)); #else return values_interfere(a, b); @@ -802,19 +623,13 @@ int phi_ops_interfere(const ir_node *a, const ir_node *b) } #ifdef BUILD_GRAPH -/** TODO remove this - * Deprecated. Use be_ra_get_ifg_edges instead. - */ -set *be_ra_get_ifg(ir_graph *irg) { - return ((env_t *)get_irg_ra_link(irg))->edges; -} -set *be_ra_get_ifg_edges(ir_graph *irg) { - return ((env_t *)get_irg_ra_link(irg))->edges; +set *be_ra_get_ifg_edges(const be_chordal_env_t *env) { + return env->edges; } -set *be_ra_get_ifg_nodes(ir_graph *irg) { - return ((env_t *)get_irg_ra_link(irg))->nodes; +set *be_ra_get_ifg_nodes(const be_chordal_env_t *env) { + return env->nodes; } #endif