X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=81b7561ea47b6a63e8c83c7dbb16d2c146d59732;hb=d7b29b5991a61f4e5967157e573bed898204ec03;hp=49a630314927117f59f20f3c99abfabe1e2ea208;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c index 49a630314..81b7561ea 100644 --- a/ir/be/becopyheur2.c +++ b/ir/be/becopyheur2.c @@ -178,7 +178,7 @@ typedef struct { static co2_irn_t *get_co2_irn(co2_t *env, const ir_node *node) { - co2_irn_t *ci = ir_nodemap_get(&env->map, node); + co2_irn_t *ci = ir_nodemap_get(co2_irn_t, &env->map, node); if (ci == NULL) { ci = OALLOCZ(&env->obst, co2_irn_t); @@ -196,7 +196,7 @@ static co2_irn_t *get_co2_irn(co2_t *env, const ir_node *node) static co2_cloud_irn_t *get_co2_cloud_irn(co2_t *env, const ir_node *node) { - co2_cloud_irn_t *ci = ir_nodemap_get(&env->map, node); + co2_cloud_irn_t *ci = ir_nodemap_get(co2_cloud_irn_t, &env->map, node); if (ci == NULL) { ci = OALLOCZ(&env->obst, co2_cloud_irn_t); @@ -337,7 +337,6 @@ static void determine_color_costs(co2_t *env, co2_irn_t *ci, col_cost_pair_t *co bitset_t *forb = bitset_alloca(n_regs); affinity_node_t *a = ci->aff; - size_t elm; const ir_node *pos; neighbours_iter_t it; int i; @@ -352,8 +351,6 @@ static void determine_color_costs(co2_t *env, co2_irn_t *ci, col_cost_pair_t *co } if (a) { - neighb_t *n; - co_gs_foreach_neighb(a, n) { if (color_is_fix(env, n->irn)) { col_t col = get_col(env, n->irn); @@ -622,7 +619,6 @@ static void node_color_badness(co2_cloud_irn_t *ci, int *badness) be_ifg_t *ifg = env->co->cenv->ifg; bitset_t *bs = bitset_alloca(n_regs); - size_t elm; const ir_node *irn; neighbours_iter_t it; @@ -780,7 +776,6 @@ static void populate_cloud(co2_t *env, co2_cloud_t *cloud, affinity_node_t *a, i be_ifg_t *ifg = env->co->cenv->ifg; co2_cloud_irn_t *ci = get_co2_cloud_irn(env, a->irn); int costs = 0; - neighb_t *n; if (ci->cloud) return; @@ -893,7 +888,6 @@ static void process_cloud(co2_cloud_t *cloud) obstack_init(&cloud->obst); for (i = 0; i < cloud->n_memb; ++i) { co2_cloud_irn_t *ci = cloud->seq[i]; - neighb_t *n; co_gs_foreach_neighb(ci->inh.aff, n) { co2_cloud_irn_t *ni = get_co2_cloud_irn(cloud->env, n->irn); @@ -1010,7 +1004,6 @@ static void process_cloud(co2_cloud_t *cloud) static int cloud_costs(co2_cloud_t *cloud) { int i, costs = 0; - neighb_t *n; for (i = 0; i < cloud->n_memb; ++i) { co2_irn_t *ci = (co2_irn_t *) cloud->seq[i]; @@ -1034,149 +1027,8 @@ static void writeback_colors(co2_t *env) } } - -/* - ___ _____ ____ ____ ___ _____ ____ _ - |_ _| ___/ ___| | _ \ / _ \_ _| | _ \ _ _ _ __ ___ _ __ (_)_ __ __ _ - | || |_ | | _ | | | | | | || | | | | | | | | '_ ` _ \| '_ \| | '_ \ / _` | - | || _|| |_| | | |_| | |_| || | | |_| | |_| | | | | | | |_) | | | | | (_| | - |___|_| \____| |____/ \___/ |_| |____/ \__,_|_| |_| |_| .__/|_|_| |_|\__, | - |_| |___/ -*/ - -static const char *get_dot_color_name(size_t col) -{ - static const char *const names[] = { - "blue", - "red", - "green", - "yellow", - "cyan", - "magenta", - "orange", - "chocolate", - "beige", - "navy", - "darkgreen", - "darkred", - "lightPink", - "chartreuse", - "lightskyblue", - "linen", - "pink", - "lightslateblue", - "mintcream", - "red", - "darkolivegreen", - "mediumblue", - "mistyrose", - "salmon", - "darkseagreen", - "mediumslateblue" - "moccasin", - "tomato", - "forestgreen", - "darkturquoise", - "palevioletred" - }; - - return col < (sizeof(names)/sizeof(names[0])) ? names[col] : "white"; -} - -static const char *get_dot_shape_name(co2_irn_t *ci) -{ - const arch_register_req_t *req = arch_get_irn_register_req(ci->irn); - - if (arch_register_req_is(req, limited)) - return "diamond"; - - if (ci->fixed) - return "rectangle"; - - if (ci->tmp_fixed) - return "hexagon"; - - return "ellipse"; -} - -static void ifg_dump_graph_attr(FILE *f, void *self) -{ - (void) self; - fprintf(f, "overlay=false"); -} - -static int ifg_is_dump_node(void *self, ir_node *irn) -{ - const arch_register_req_t *req = arch_get_irn_register_req(irn); - (void)self; - return !(req->type & arch_register_req_type_ignore); -} - -static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn) -{ - co2_t *env = (co2_t*)self; - co2_irn_t *ci = get_co2_irn(env, irn); - int peri = 1; - - char buf[128] = ""; - - if (ci->aff) { - co2_cloud_irn_t *cci = (co2_cloud_irn_t*) ci; - if (cci->cloud && cci->cloud->mst_root == cci) - peri = 2; - - if (cci->cloud && cci->cloud->mst_root) - ir_snprintf(buf, sizeof(buf), "%+F", cci->cloud->mst_root->inh.irn); - } - - ir_fprintf(f, "label=\"%+F%s\" style=filled peripheries=%d color=%s shape=%s", irn, buf, peri, - get_dot_color_name(get_col(env, irn)), get_dot_shape_name(ci)); -} - -static void ifg_dump_at_end(FILE *file, void *self) -{ - co2_t *env = (co2_t*)self; - affinity_node_t *a; - - co_gs_foreach_aff_node(env->co, a) { - co2_cloud_irn_t *ai = get_co2_cloud_irn(env, a->irn); - int idx = get_irn_idx(a->irn); - neighb_t *n; - - if (ai->mst_parent != ai) - fprintf(file, "\tn%d -- n%u [style=dotted color=blue arrowhead=normal];\n", idx, get_irn_idx(ai->mst_parent->inh.irn)); - - co_gs_foreach_neighb(a, n) { - int nidx = get_irn_idx(n->irn); - co2_cloud_irn_t *ci = get_co2_cloud_irn(env, n->irn); - - if (idx < nidx) { - const char *color = get_col(env, a->irn) == get_col(env, n->irn) ? "black" : "red"; - const char *arr = "arrowhead=dot arrowtail=dot"; - - if (ci->mst_parent == ai) - arr = "arrowtail=normal"; - else if (ai->mst_parent == ci) - arr = "arrowhead=normal"; - - fprintf(file, "\tn%d -- n%d [label=\"%d\" %s style=dashed color=%s weight=0.01];\n", idx, nidx, n->costs, arr, color); - } - } - } -} - -static be_ifg_dump_dot_cb_t ifg_dot_cb = { - ifg_is_dump_node, - ifg_dump_graph_attr, - ifg_dump_node_attr, - NULL, - NULL, - ifg_dump_at_end -}; - static void process(co2_t *env) { - affinity_node_t *a; co2_cloud_t *pos; co2_cloud_t **clouds; int n_clouds; @@ -1209,19 +1061,6 @@ static void process(co2_t *env) all_costs += clouds[i]->costs; final_costs += cloud_costs(clouds[i]); - - /* Dump the IFG if the user demanded it. */ - if (dump_flags & DUMP_CLOUD) { - char buf[256]; - FILE *f; - - ir_snprintf(buf, sizeof(buf), "ifg_%F_%s_cloud_%d.dot", env->co->irg, env->co->cls->name, i); - f = fopen(buf, "wt"); - if (f != NULL) { - be_ifg_dump_dot(env->co->cenv->ifg, env->co->irg, f, &ifg_dot_cb, env); - fclose(f); - } - } } DB((env->dbg, LEVEL_1, "all costs: %d, init costs: %d, final costs: %d\n", all_costs, init_costs, final_costs)); @@ -1229,11 +1068,9 @@ static void process(co2_t *env) xfree(clouds); } -int co_solve_heuristic_new(copy_opt_t *co) +static int co_solve_heuristic_new(copy_opt_t *co) { - char buf[256]; co2_t env; - FILE *f; ir_nodemap_init(&env.map, co->irg); obstack_init(&env.obst); @@ -1246,26 +1083,8 @@ int co_solve_heuristic_new(copy_opt_t *co) FIRM_DBG_REGISTER(env.dbg, "firm.be.co2"); INIT_LIST_HEAD(&env.cloud_head); - if (dump_flags & DUMP_BEFORE) { - ir_snprintf(buf, sizeof(buf), "ifg_%F_%s_before.dot", co->irg, co->cls->name); - f = fopen(buf, "wt"); - if (f != NULL) { - be_ifg_dump_dot(co->cenv->ifg, co->irg, f, &ifg_dot_cb, &env); - fclose(f); - } - } - process(&env); - if (dump_flags & DUMP_AFTER) { - ir_snprintf(buf, sizeof(buf), "ifg_%F_%s_after.dot", co->irg, co->cls->name); - f = fopen(buf, "wt"); - if (f != NULL) { - be_ifg_dump_dot(co->cenv->ifg, co->irg, f, &ifg_dot_cb, &env); - fclose(f); - } - } - writeback_colors(&env); obstack_free(&env.obst, NULL); ir_nodemap_destroy(&env.map);