X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbepbqpcoloring.c;h=f9de569e8a10d3c23189449d05acff5265266151;hb=df2faee01a5832057bb3ca0ba5f67e979c916e19;hp=33e98543971b202f4070fa3d18367a93f8a69162;hpb=7af9389c7b0901e561e4bc1dee02f46876152893;p=libfirm diff --git a/ir/be/bepbqpcoloring.c b/ir/be/bepbqpcoloring.c index 33e985439..f9de569e8 100644 --- a/ir/be/bepbqpcoloring.c +++ b/ir/be/bepbqpcoloring.c @@ -22,14 +22,11 @@ * @brief PBQP based register allocation. * @author Thomas Bersch * @date 27.11.2009 - * @version $Id: bechordal.c 26750 2009-11-27 09:37:43Z bersch $ */ -/* miscellaneous includes */ +/* miscellaneous includes */ #include "config.h" -#ifdef FIRM_KAPS - #include "debug.h" #include "error.h" @@ -38,9 +35,9 @@ #include "iredges_t.h" #include "irprintf.h" #include "irgwalk.h" +#include "irtools.h" #include "time.h" - -/* libfirm/ir/adt includes */ +#include "execfreq_t.h" #include "bipartite.h" /* libfirm/ir/be includes */ @@ -73,54 +70,51 @@ #include "pbqp_node.h" #include "pbqp_edge_t.h" -#define TIMER 0 -#define PRINT_RPEO 0 -#define USE_BIPARTIT_MATCHING 0 -#define DO_USEFUL_OPT 1 +#define TIMER 0 +#define PRINT_RPEO 0 +#define USE_BIPARTIT_MATCHING 0 +#define DO_USEFUL_OPT 1 -static int use_exec_freq = true; -static int use_late_decision = false; +static int use_exec_freq = true; +static int use_late_decision = false; -typedef struct _be_pbqp_alloc_env_t { - pbqp *pbqp_inst; /**< PBQP instance for register allocation */ - ir_graph *irg; /**< The graph under examination. */ - const arch_register_class_t *cls; /**< Current processed register class */ +typedef struct be_pbqp_alloc_env_t { + pbqp_t *pbqp_inst; /**< PBQP instance for register allocation */ + ir_graph *irg; /**< The graph under examination. */ + const arch_register_class_t *cls; /**< Current processed register class */ be_lv_t *lv; - bitset_t *ignored_regs; - pbqp_matrix *ife_matrix_template; - pbqp_matrix *aff_matrix_template; - plist_t *rpeo; - unsigned *restr_nodes; - unsigned *ife_edge_num; - be_chordal_env_t *env; + bitset_t *allocatable_regs; + pbqp_matrix_t *ife_matrix_template; + pbqp_matrix_t *aff_matrix_template; + plist_t *rpeo; + unsigned *restr_nodes; + unsigned *ife_edge_num; + ir_execfreq_int_factors execfreq_factors; + be_chordal_env_t *env; } be_pbqp_alloc_env_t; -#define is_Reg_Phi(irn) (is_Phi(irn) && mode_is_data(get_irn_mode(irn))) -#define get_Perm_src(irn) (get_irn_n(get_Proj_pred(irn), get_Proj_proj(irn))) -#define is_Perm_Proj(irn) (is_Proj(irn) && be_is_Perm(get_Proj_pred(irn))) -#define insert_edge(pbqp, src_node, trg_node, template_matrix) (add_edge_costs(pbqp, get_irn_idx(src_node), get_irn_idx(trg_node), pbqp_matrix_copy(pbqp, template_matrix))) -#define get_free_regs(restr_nodes, cls, irn) (arch_register_class_n_regs(cls) - restr_nodes[get_irn_idx(irn)]) - -static inline int is_2addr_code(const arch_register_req_t *req) -{ - return (req->type & arch_register_req_type_should_be_same) != 0; -} +#define is_Reg_Phi(irn) (is_Phi(irn) && mode_is_data(get_irn_mode(irn))) +#define get_Perm_src(irn) (get_irn_n(get_Proj_pred(irn), get_Proj_proj(irn))) +#define is_Perm_Proj(irn) (is_Proj(irn) && be_is_Perm(get_Proj_pred(irn))) +#define insert_edge(pbqp, src_node, trg_node, template_matrix) (add_edge_costs(pbqp, get_irn_idx(src_node), get_irn_idx(trg_node), pbqp_matrix_copy(pbqp, template_matrix))) +#define get_free_regs(restr_nodes, cls, irn) (arch_register_class_n_regs(cls) - restr_nodes[get_irn_idx(irn)]) static const lc_opt_table_entry_t options[] = { - LC_OPT_ENT_BOOL ("exec_freq", "use exec_freq", &use_exec_freq), - LC_OPT_ENT_BOOL ("late_decision", "use late decision for register allocation", &use_late_decision), + LC_OPT_ENT_BOOL("exec_freq", "use exec_freq", &use_exec_freq), + LC_OPT_ENT_BOOL("late_decision", "use late decision for register allocation", &use_late_decision), LC_OPT_LAST }; #if KAPS_DUMP static FILE *my_open(const be_chordal_env_t *env, const char *prefix, const char *suffix) { - FILE *result; - char buf[1024]; - size_t i, n; - char *tu_name; + FILE *result; + char buf[1024]; + size_t i; + size_t n; + char *tu_name; const char *cup_name = be_get_irg_main_env(env->irg)->cup_name; n = strlen(cup_name); @@ -145,18 +139,21 @@ static FILE *my_open(const be_chordal_env_t *env, const char *prefix, const char static void create_pbqp_node(be_pbqp_alloc_env_t *pbqp_alloc_env, ir_node *irn) { const arch_register_class_t *cls = pbqp_alloc_env->cls; - pbqp *pbqp_inst = pbqp_alloc_env->pbqp_inst; - bitset_t *ignored_regs = pbqp_alloc_env->ignored_regs; + pbqp_t *pbqp_inst = pbqp_alloc_env->pbqp_inst; + bitset_t *allocatable_regs = pbqp_alloc_env->allocatable_regs; unsigned colors_n = arch_register_class_n_regs(cls); unsigned cntConstrains = 0; /* create costs vector depending on register constrains */ - struct vector *costs_vector = vector_alloc(pbqp_inst, colors_n); + vector_t *costs_vector = vector_alloc(pbqp_inst, colors_n); /* set costs depending on register constrains */ unsigned idx; for (idx = 0; idx < colors_n; idx++) { - if (bitset_is_set(ignored_regs, idx) || !arch_reg_out_is_allocatable(irn, arch_register_for_index(cls, idx))) { + const arch_register_req_t *req = arch_get_irn_register_req(irn); + const arch_register_t *reg = arch_register_for_index(cls, idx); + if (!bitset_is_set(allocatable_regs, idx) + || !arch_reg_is_allocatable(req, reg)) { /* constrained */ vector_set(costs_vector, idx, INF_COSTS); cntConstrains++; @@ -170,14 +167,14 @@ static void create_pbqp_node(be_pbqp_alloc_env_t *pbqp_alloc_env, ir_node *irn) static void insert_ife_edge(be_pbqp_alloc_env_t *pbqp_alloc_env, ir_node *src_node, ir_node *trg_node) { - pbqp *pbqp = pbqp_alloc_env->pbqp_inst; + pbqp_t *pbqp = pbqp_alloc_env->pbqp_inst; const arch_register_class_t *cls = pbqp_alloc_env->cls; - pbqp_matrix *ife_matrix_template = pbqp_alloc_env->ife_matrix_template; - unsigned *restr_nodes = pbqp_alloc_env->restr_nodes; + pbqp_matrix_t *ife_matrix_template = pbqp_alloc_env->ife_matrix_template; + unsigned *restr_nodes = pbqp_alloc_env->restr_nodes; if (get_edge(pbqp, get_irn_idx(src_node), get_irn_idx(trg_node)) == NULL) { -// /* increase ife edge counter */ + /* increase ife edge counter */ pbqp_alloc_env->ife_edge_num[get_irn_idx(src_node)]++; pbqp_alloc_env->ife_edge_num[get_irn_idx(trg_node)]++; @@ -206,21 +203,20 @@ static void insert_ife_edge(be_pbqp_alloc_env_t *pbqp_alloc_env, ir_node *src_no } } -static void inser_afe_edge(be_pbqp_alloc_env_t *pbqp_alloc_env, ir_node *src_node, ir_node *trg_node, int pos) +static void insert_afe_edge(be_pbqp_alloc_env_t *pbqp_alloc_env, ir_node *src_node, ir_node *trg_node, int pos) { - pbqp *pbqp = pbqp_alloc_env->pbqp_inst; - const arch_register_class_t *cls = pbqp_alloc_env->cls; - unsigned *restr_nodes = pbqp_alloc_env->restr_nodes; - pbqp_matrix *afe_matrix = pbqp_matrix_alloc(pbqp, arch_register_class_n_regs(cls), arch_register_class_n_regs(cls)); - unsigned colors_n = arch_register_class_n_regs(cls); + pbqp_t *pbqp = pbqp_alloc_env->pbqp_inst; + const arch_register_class_t *cls = pbqp_alloc_env->cls; + unsigned *restr_nodes = pbqp_alloc_env->restr_nodes; + pbqp_matrix_t *afe_matrix = pbqp_matrix_alloc(pbqp, arch_register_class_n_regs(cls), arch_register_class_n_regs(cls)); + unsigned colors_n = arch_register_class_n_regs(cls); if (get_edge(pbqp, get_irn_idx(src_node), get_irn_idx(trg_node)) == NULL) { if (use_exec_freq) { /* get exec_freq for copy_block */ ir_node *root_bl = get_nodes_block(src_node); ir_node *copy_bl = is_Phi(src_node) ? get_Block_cfgpred_block(root_bl, pos) : root_bl; - ir_exec_freq *exec_freq = be_get_irg_exec_freq(pbqp_alloc_env->irg); - unsigned long res = get_block_execfreq_ulong(exec_freq, copy_bl); + int res = get_block_execfreq_int(&pbqp_alloc_env->execfreq_factors, copy_bl); /* create afe-matrix */ unsigned row, col; @@ -258,13 +254,14 @@ static void inser_afe_edge(be_pbqp_alloc_env_t *pbqp_alloc_env, ir_node *src_nod static void create_affinity_edges(ir_node *irn, void *env) { - be_pbqp_alloc_env_t *pbqp_alloc_env = env; - const arch_register_class_t *cls = pbqp_alloc_env->cls; - const arch_register_req_t *req = arch_get_register_req_out(irn); - unsigned pos, max; + be_pbqp_alloc_env_t *pbqp_alloc_env = (be_pbqp_alloc_env_t*)env; + const arch_register_class_t *cls = pbqp_alloc_env->cls; + const arch_register_req_t *req = arch_get_irn_register_req(irn); + unsigned pos; + unsigned max; if (is_Reg_Phi(irn)) { /* Phis */ - for (pos=0, max=get_irn_arity(irn); posother_same; - int i; - - for (i = 0; 1U << i <= other; ++i) { - if (other & (1U << i)) { - ir_node *other = get_irn_n(skip_Proj(irn), i); - if (!arch_irn_consider_in_reg_alloc(cls, other)) - continue; - - /* no edges to itself */ - if (irn == other) { - continue; - } + insert_afe_edge(pbqp_alloc_env, irn, arg, -1); + } else if (arch_register_req_is(req, should_be_same)) { + const unsigned other = req->other_same; + int i; - inser_afe_edge(pbqp_alloc_env, irn, other, i); + for (i = 0; 1U << i <= other; ++i) { + if (other & (1U << i)) { + ir_node *other = get_irn_n(skip_Proj(irn), i); + if (!arch_irn_consider_in_reg_alloc(cls, other)) + continue; + + /* no edges to itself */ + if (irn == other) { + continue; } + + insert_afe_edge(pbqp_alloc_env, irn, other, i); } } } @@ -310,24 +304,22 @@ static void create_affinity_edges(ir_node *irn, void *env) static void create_pbqp_coloring_instance(ir_node *block, void *data) { - be_pbqp_alloc_env_t *pbqp_alloc_env = data; - be_lv_t *lv = pbqp_alloc_env->lv; - const arch_register_class_t *cls = pbqp_alloc_env->cls; - plist_t *rpeo = pbqp_alloc_env->rpeo; - pbqp *pbqp_inst = pbqp_alloc_env->pbqp_inst; - plist_t *temp_list = plist_new(); - plist_element_t *el; - ir_node *irn; + be_pbqp_alloc_env_t *pbqp_alloc_env = (be_pbqp_alloc_env_t*)data; + be_lv_t *lv = pbqp_alloc_env->lv; + const arch_register_class_t *cls = pbqp_alloc_env->cls; + plist_t *rpeo = pbqp_alloc_env->rpeo; + pbqp_t *pbqp_inst = pbqp_alloc_env->pbqp_inst; + plist_t *temp_list = plist_new(); + plist_element_t *el; ir_nodeset_t live_nodes; #if USE_BIPARTIT_MATCHING - int *assignment = ALLOCAN(int, cls->n_regs); -// ir_graph *irg = pbqp_alloc_env->irg; + int *assignment = ALLOCAN(int, cls->n_regs); #else - unsigned *restr_nodes = pbqp_alloc_env->restr_nodes; - pqueue_t *restr_nodes_queue = new_pqueue(); - pqueue_t *queue = new_pqueue(); - plist_t *sorted_list = plist_new(); - ir_node *last_element = NULL; + unsigned *restr_nodes = pbqp_alloc_env->restr_nodes; + pqueue_t *restr_nodes_queue = new_pqueue(); + pqueue_t *queue = new_pqueue(); + plist_t *sorted_list = plist_new(); + ir_node *last_element = NULL; #endif /* first, determine the pressure */ @@ -340,61 +332,27 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) /* create pbqp nodes, interference edges and reverse perfect elimination order */ sched_foreach_reverse(block, irn) { - ir_node *live; - ir_nodeset_iterator_t iter; - - if (get_irn_mode(irn) == mode_T) { - const ir_edge_t *edge; - foreach_out_edge(irn, edge) { - ir_node *proj = get_edge_src_irn(edge); - if (!arch_irn_consider_in_reg_alloc(cls, proj)) - continue; - - /* create pbqp source node if it dosn't exist */ - if (get_node(pbqp_inst, get_irn_idx(proj)) == NULL) { - create_pbqp_node(pbqp_alloc_env, proj); - } - - /* create nodes and interference edges */ - foreach_ir_nodeset(&live_nodes, live, iter) { - /* create pbqp source node if it dosn't exist */ - if (get_node(pbqp_inst, get_irn_idx(live)) == NULL) { - create_pbqp_node(pbqp_alloc_env, live); - } + be_foreach_value(irn, value, + if (!arch_irn_consider_in_reg_alloc(cls, value)) + continue; - /* no edges to itself */ - if (proj == live) { - continue; - } + /* create pbqp source node if it dosn't exist */ + if (!get_node(pbqp_inst, get_irn_idx(value))) + create_pbqp_node(pbqp_alloc_env, value); - insert_ife_edge(pbqp_alloc_env, proj, live); - } - } - } - else { - if (arch_irn_consider_in_reg_alloc(cls, irn)) { + /* create nodes and interference edges */ + foreach_ir_nodeset(&live_nodes, live, iter) { /* create pbqp source node if it dosn't exist */ - if (get_node(pbqp_inst, get_irn_idx(irn)) == NULL) { - create_pbqp_node(pbqp_alloc_env, irn); - } + if (!get_node(pbqp_inst, get_irn_idx(live))) + create_pbqp_node(pbqp_alloc_env, live); - /* create nodes and interference edges */ - foreach_ir_nodeset(&live_nodes, live, iter) { - /* create pbqp source node if it dosn't exist */ - if (get_node(pbqp_inst, get_irn_idx(live)) == NULL) { - create_pbqp_node(pbqp_alloc_env, live); - } - - /* no edges to itself */ - if (irn == live) { - continue; - } + /* no edges to itself */ + if (value == live) + continue; - /* insert interference edge */ - insert_ife_edge(pbqp_alloc_env, irn, live); - } + insert_ife_edge(pbqp_alloc_env, value, live); } - } + ); /* get living nodes for next step */ if (!is_Phi(irn)) { @@ -403,14 +361,12 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) #if USE_BIPARTIT_MATCHING if (get_irn_mode(irn) == mode_T) { - - unsigned clique_size = 0; - unsigned n_alloc = 0; - pbqp_node *clique[cls->n_regs]; - bipartite_t *bp = bipartite_new(cls->n_regs, cls->n_regs); + unsigned clique_size = 0; + unsigned n_alloc = 0; + pbqp_node *clique[cls->n_regs]; + bipartite_t *bp = bipartite_new(cls->n_regs, cls->n_regs); /* add all proj after a perm to clique */ - const ir_edge_t *edge; foreach_out_edge(irn, edge) { ir_node *proj = get_edge_src_irn(edge); @@ -424,9 +380,11 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) if(is_Perm_Proj(proj)) { /* add proj to clique */ pbqp_node *clique_member = get_node(pbqp_inst,proj->node_idx); + vector *costs = clique_member->costs; + unsigned idx = 0; + clique[clique_size] = clique_member; - vector *costs = clique_member->costs; - unsigned idx = 0; + for(idx = 0; idx < costs->len; idx++) { if(costs->entries[idx].data != INF_COSTS) { bipartite_add(bp, clique_size, idx); @@ -442,9 +400,9 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) if(clique_size > 0) { plist_element_t *listElement; foreach_plist(temp_list, listElement) { - pbqp_node *clique_candidate = listElement->data; - unsigned idx = 0; - bool isMember = true; + pbqp_node *clique_candidate = listElement->data; + unsigned idx = 0; + bool isMember = true; /* clique size not bigger then register class size */ if(clique_size >= cls->n_regs) break; @@ -478,8 +436,8 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) /* increase node counter */ clique_size++; - } } + } /* solve bipartite matching */ bipartite_matching(bp, assignment); @@ -488,7 +446,7 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) unsigned nodeIdx = 0; for(nodeIdx = 0; nodeIdx < clique_size; nodeIdx++) { vector *costs = clique[nodeIdx]->costs; - int idx; + int idx; for(idx = 0; idx < (int)costs->len; idx++) { if(assignment[nodeIdx] != idx) { costs->entries[idx].data = INF_COSTS; @@ -509,8 +467,6 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) /* order nodes for perfect elimination order */ if (get_irn_mode(irn) == mode_T) { bool allHaveIFEdges = true; - - const ir_edge_t *edge; foreach_out_edge(irn, edge) { ir_node *proj = get_edge_src_irn(edge); if (!arch_irn_consider_in_reg_alloc(cls, proj)) @@ -547,12 +503,14 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) /* first insert all restricted proj nodes */ while (!pqueue_empty(restr_nodes_queue)) { - plist_insert_front(sorted_list, get_node(pbqp_inst, get_irn_idx(pqueue_pop_front(restr_nodes_queue)))); + ir_node *node = (ir_node*)pqueue_pop_front(restr_nodes_queue); + plist_insert_front(sorted_list, get_node(pbqp_inst, get_irn_idx(node))); } /* insert proj nodes descending by their number of interference edges */ while (!pqueue_empty(queue)) { - plist_insert_front(sorted_list, get_node(pbqp_inst, get_irn_idx(pqueue_pop_front(queue)))); + ir_node *node = (ir_node*)pqueue_pop_front(queue); + plist_insert_front(sorted_list, get_node(pbqp_inst, get_irn_idx(node))); } /* invert sorted list */ @@ -595,48 +553,34 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data) static void insert_perms(ir_node *block, void *data) { - /* - * Start silent in the start block. - * The silence remains until the first barrier is seen. - * Each other block is begun loud. - */ - be_chordal_env_t *env = data; + be_chordal_env_t *env = (be_chordal_env_t*)data; ir_node *irn; - int silent = block == get_irg_start_block(get_irn_irg(block)); - /* - * If the block is the start block search the barrier and - * start handling constraints from there. - */ for (irn = sched_first(block); !sched_is_end(irn);) { - int silent_old = silent; /* store old silent value */ - if (be_is_Barrier(irn)) - silent = !silent; /* toggle silent flag */ - - be_insn_t *insn = chordal_scan_insn(env, irn); - irn = insn->next_insn; + ir_node *const next = sched_next(irn); + be_insn_t * insn = be_scan_insn(env, irn); + if (insn) + pre_process_constraints(env, &insn); - if (silent_old) - continue; - - if (!insn->has_constraints) - continue; - - pre_process_constraints(env, &insn); + irn = next; } } static void be_pbqp_coloring(be_chordal_env_t *env) { - ir_graph *irg = env->irg; - const arch_register_class_t *cls = env->cls; - be_lv_t *lv = NULL; - plist_element_t *element = NULL; - unsigned colors_n = arch_register_class_n_regs(cls); - be_pbqp_alloc_env_t pbqp_alloc_env; - unsigned row, col; - - + ir_graph *irg = env->irg; + const arch_register_class_t *cls = env->cls; + be_lv_t *lv = NULL; + plist_element_t *element = NULL; + unsigned colors_n = arch_register_class_n_regs(cls); + be_pbqp_alloc_env_t pbqp_alloc_env; + unsigned col; + unsigned row; + pbqp_matrix_t *ife_matrix; + num solution; +#if KAPS_DUMP + FILE *file_before; +#endif #if TIMER ir_timer_t *t_ra_pbqp_alloc_create = ir_timer_new(); ir_timer_t *t_ra_pbqp_alloc_solve = ir_timer_new(); @@ -644,9 +588,8 @@ static void be_pbqp_coloring(be_chordal_env_t *env) printf("#### ----- === Allocating registers of %s (%s) ===\n", cls->name, get_entity_name(get_irg_entity(irg))); #endif - lv = be_assure_liveness(irg); - be_liveness_assure_sets(lv); - be_liveness_assure_chk(lv); + be_assure_live_sets(irg); + lv = be_get_irg_liveness(irg); /* insert perms */ assure_doms(irg); @@ -659,24 +602,25 @@ static void be_pbqp_coloring(be_chordal_env_t *env) dump_ir_graph(irg, buf); } + ir_calculate_execfreq_int_factors(&pbqp_alloc_env.execfreq_factors, irg); /* initialize pbqp allocation data structure */ - pbqp_alloc_env.pbqp_inst = alloc_pbqp(get_irg_last_idx(irg)); /* initialize pbqp instance */ - pbqp_alloc_env.cls = cls; - pbqp_alloc_env.irg = irg; - pbqp_alloc_env.lv = lv; - pbqp_alloc_env.ignored_regs = bitset_malloc(colors_n); - pbqp_alloc_env.rpeo = plist_new(); - pbqp_alloc_env.restr_nodes = XMALLOCNZ(unsigned, get_irg_last_idx(irg)); - pbqp_alloc_env.ife_edge_num = XMALLOCNZ(unsigned, get_irg_last_idx(irg)); - pbqp_alloc_env.env = env; - be_put_ignore_regs(irg, cls, pbqp_alloc_env.ignored_regs); /* get ignored registers */ + pbqp_alloc_env.pbqp_inst = alloc_pbqp(get_irg_last_idx(irg)); /* initialize pbqp instance */ + pbqp_alloc_env.cls = cls; + pbqp_alloc_env.irg = irg; + pbqp_alloc_env.lv = lv; + pbqp_alloc_env.allocatable_regs = bitset_malloc(colors_n); + pbqp_alloc_env.rpeo = plist_new(); + pbqp_alloc_env.restr_nodes = XMALLOCNZ(unsigned, get_irg_last_idx(irg)); + pbqp_alloc_env.ife_edge_num = XMALLOCNZ(unsigned, get_irg_last_idx(irg)); + pbqp_alloc_env.env = env; + be_put_allocatable_regs(irg, cls, pbqp_alloc_env.allocatable_regs); /* create costs matrix template for interference edges */ - struct pbqp_matrix *ife_matrix = pbqp_matrix_alloc(pbqp_alloc_env.pbqp_inst, colors_n, colors_n); + ife_matrix = pbqp_matrix_alloc(pbqp_alloc_env.pbqp_inst, colors_n, colors_n); /* set costs */ - for (row = 0, col=0; row < colors_n; row++, col++) + for (row = 0, col = 0; row < colors_n; row++, col++) pbqp_matrix_set(ife_matrix, row, col, INF_COSTS); pbqp_alloc_env.ife_matrix_template = ife_matrix; @@ -684,7 +628,7 @@ static void be_pbqp_coloring(be_chordal_env_t *env) if (!use_exec_freq) { /* create costs matrix template for affinity edges */ - struct pbqp_matrix *afe_matrix = pbqp_matrix_alloc(pbqp_alloc_env.pbqp_inst, colors_n, colors_n); + pbqp_matrix_t *afe_matrix = pbqp_matrix_alloc(pbqp_alloc_env.pbqp_inst, colors_n, colors_n); /* set costs */ for (row = 0; row < colors_n; row++) { for (col = 0; col < colors_n; col++) { @@ -712,8 +656,8 @@ static void be_pbqp_coloring(be_chordal_env_t *env) ir_timer_reset_and_start(t_ra_pbqp_alloc_create_aff); #endif foreach_plist(pbqp_alloc_env.rpeo, element) { - pbqp_node *node = element->data; - ir_node *irn = get_idx_irn(irg, node->index); + pbqp_node_t *node = (pbqp_node_t*)element->data; + ir_node *irn = get_idx_irn(irg, node->index); create_affinity_edges(irn, &pbqp_alloc_env); } @@ -724,18 +668,20 @@ static void be_pbqp_coloring(be_chordal_env_t *env) #if KAPS_DUMP // dump graph before solving pbqp - FILE *file_before = my_open(env, "", "-pbqp_coloring.html"); + file_before = my_open(env, "", "-pbqp_coloring.html"); set_dumpfile(pbqp_alloc_env.pbqp_inst, file_before); #endif - /* print out reverse perfect eleminiation order */ + /* print out reverse perfect elimination order */ #if PRINT_RPEO - plist_element_t *elements; - foreach_plist(pbqp_alloc_env.rpeo, elements) { - pbqp_node *node = elements->data; - printf(" %d(%lu);", node->index, get_idx_irn(irg, node->index)->node_nr); + { + plist_element_t *elements; + foreach_plist(pbqp_alloc_env.rpeo, elements) { + pbqp_node_t *node = elements->data; + printf(" %d(%ld);", node->index, get_idx_irn(irg, node->index)->node_nr); + } + printf("\n"); } - printf("\n"); #endif /* solve pbqp instance */ @@ -753,16 +699,17 @@ static void be_pbqp_coloring(be_chordal_env_t *env) #endif - num solution = get_solution(pbqp_alloc_env.pbqp_inst); - assert(solution != INF_COSTS && "No PBQP solution found"); + solution = get_solution(pbqp_alloc_env.pbqp_inst); + if (solution == INF_COSTS) + panic("No PBQP solution found"); /* assign colors */ foreach_plist(pbqp_alloc_env.rpeo, element) { - pbqp_node *node = element->data; - ir_node *irn = get_idx_irn(irg, node->index); - num color = get_node_solution(pbqp_alloc_env.pbqp_inst, node->index); - const arch_register_t *reg = arch_register_for_index(cls, color); + pbqp_node_t *node = (pbqp_node_t*)element->data; + ir_node *irn = get_idx_irn(irg, node->index); + num color = get_node_solution(pbqp_alloc_env.pbqp_inst, node->index); + const arch_register_t *reg = arch_register_for_index(cls, color); arch_set_irn_register(irn, reg); } @@ -782,7 +729,7 @@ static void be_pbqp_coloring(be_chordal_env_t *env) #if KAPS_DUMP fclose(file_before); #endif - bitset_free(pbqp_alloc_env.ignored_regs); + bitset_free(pbqp_alloc_env.allocatable_regs); free_pbqp(pbqp_alloc_env.pbqp_inst); plist_free(pbqp_alloc_env.rpeo); xfree(pbqp_alloc_env.restr_nodes); @@ -793,14 +740,14 @@ static void be_pbqp_coloring(be_chordal_env_t *env) /** * Initializes this module. */ -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_pbqp_coloring); +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_pbqp_coloring) void be_init_pbqp_coloring(void) { - lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); - lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra"); - lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal"); + lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); + lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra"); + lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal"); lc_opt_entry_t *coloring_grp = lc_opt_get_grp(chordal_grp, "coloring"); - lc_opt_entry_t *pbqp_grp = lc_opt_get_grp(coloring_grp, "pbqp"); + lc_opt_entry_t *pbqp_grp = lc_opt_get_grp(coloring_grp, "pbqp"); static be_ra_chordal_coloring_t coloring = { be_pbqp_coloring @@ -809,5 +756,3 @@ void be_init_pbqp_coloring(void) lc_opt_add_table(pbqp_grp, options); be_register_chordal_coloring("pbqp", &coloring); } - -#endif