X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=7afcb798bcc9c856ae0b45c34955e4ce5659d095;hb=ca1b1615fbe23a4d5cf72e7be5d2ee831615cbc2;hp=b9dfe56269da93cd346f5bcec856c21bbb472e32;hpb=0e68caee0cb13f6e4f8f7cff656015edc141f2ae;p=libfirm diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c index b9dfe5626..7afcb798b 100644 --- a/ir/be/beirgmod.c +++ b/ir/be/beirgmod.c @@ -4,10 +4,11 @@ #include -#ifdef WIN32 -#include -#else -#include +#ifdef HAVE_MALLOC_H + #include +#endif +#ifdef HAVE_ALLOCA_H + #include #endif #include "hashptr.h" @@ -35,9 +36,23 @@ #include "beirgmod.h" -#define DBG_MODULE firm_dbg_register("firm.be.irgmod") +#define DBG_MODULE "firm.be.irgmod" #define DBG_LEVEL SET_LEVEL_0 +/* + ____ _ + | _ \ ___ _ __ ___ (_)_ __ __ _ _ __ ___ ___ + | | | |/ _ \| '_ ` _ \| | '_ \ / _` | '_ \ / __/ _ \ + | |_| | (_) | | | | | | | | | | (_| | | | | (_| __/ + |____/ \___/|_| |_| |_|_|_| |_|\__,_|_| |_|\___\___| + | ___| __ ___ _ __ | |_(_) ___ _ __ ___ + | |_ | '__/ _ \| '_ \| __| |/ _ \ '__/ __| + | _|| | | (_) | | | | |_| | __/ | \__ \ + |_| |_| \___/|_| |_|\__|_|\___|_| |___/ + +*/ + + struct _dom_front_info_t { pmap *df_map; }; @@ -94,10 +109,11 @@ static void compute_df(ir_node *n, pmap *df_map) dom_front_info_t *be_compute_dominance_frontiers(ir_graph *irg) { - dom_front_info_t *info = malloc(sizeof(*info)); + dom_front_info_t *info = xmalloc(sizeof(*info)); edges_assure(irg); info->df_map = pmap_create(); + compute_doms(irg); compute_df(get_irg_start_block(irg), info->df_map); return info; @@ -123,34 +139,36 @@ static void determine_phi_blocks(pset *copies, pset *copy_blocks, pset *phi_bloc { ir_node *bl; pdeq *worklist = new_pdeq(); - firm_dbg_module_t *dbg = DBG_MODULE; + FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE); /* - * Fill the worklist queue and the rest of the orig blocks array. - */ + * Fill the worklist queue and the rest of the orig blocks array. + */ for(bl = pset_first(copy_blocks); bl; bl = pset_next(copy_blocks)) { pdeq_putr(worklist, bl); } - while(!pdeq_empty(worklist)) { + while (!pdeq_empty(worklist)) { ir_node *bl = pdeq_getl(worklist); pset *df = be_get_dominance_frontier(df_info, bl); ir_node *y; DBG((dbg, LEVEL_3, "dom front of %+F\n", bl)); - for(y = pset_first(df); y; y = pset_next(df)) - DBG((dbg, LEVEL_3, "\t%+F\n", y)); + DEBUG_ONLY( + for (y = pset_first(df); y; y = pset_next(df)) + DBG((dbg, LEVEL_3, "\t%+F\n", y)) + ); for(y = pset_first(df); y; y = pset_next(df)) { if(!pset_find_ptr(phi_blocks, y)) { pset_insert_ptr(phi_blocks, y); /* - * Clear the link field of a possible phi block, since - * the possibly created phi will be stored there. See, - * search_def() - */ + * Clear the link field of a possible phi block, since + * the possibly created phi will be stored there. See, + * search_def() + */ set_irn_link(y, NULL); if(!pset_find_ptr(copy_blocks, y)) @@ -163,31 +181,45 @@ static void determine_phi_blocks(pset *copies, pset *copy_blocks, pset *phi_bloc del_pdeq(worklist); } +/* + ____ ____ _ + / ___/ ___| / \ + \___ \___ \ / _ \ + ___) |__) / ___ \ + |____/____/_/ \_\ + ____ _ _ _ + / ___|___ _ __ ___| |_ _ __ _ _ ___| |_(_) ___ _ __ + | | / _ \| '_ \/ __| __| '__| | | |/ __| __| |/ _ \| '_ \ + | |__| (_) | | | \__ \ |_| | | |_| | (__| |_| | (_) | | | | + \____\___/|_| |_|___/\__|_| \__,_|\___|\__|_|\___/|_| |_| + +*/ + /** * Find the copy of the given original node whose value is 'active' * at a usage. * * The usage is given as a node and a position. Initially, the given operand * points to a node for which copies were introduced. We have to find - * the valid copy for this usage. This is done by travering the + * the valid copy for this usage. This is done by traversing the * dominance tree upwards. If the usage is a phi function, we start * traversing from the predecessor block which corresponds to the phi * usage. * - * @param usage The node which uses the original node. - * @param pos The number of the argument which corresponds to the - * original node. - * @param copy_blocks A set containing all basic block in which copies - * of the original node are located. - * @param copies A set containing all node which are copies from the - * original node. - * @return The valid copy for usage. + * @param usage The node which uses the original node. + * @param pos The position of the argument which corresponds to the original node. + * @param copies A set containing all node which are copies from the original node. + * @param copy_blocks A set containing all basic block in which copies of the original node are located. + * @param phis A set where all created phis are recorded. + * @param phi_blocks A set of all blocks where Phis shall be inserted (iterated dominance frontier). + * @param mode The mode for the Phi if one has to be created. + * @return The valid copy for usage. */ -static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blocks, pset *phi_blocks, ir_mode *mode) +static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blocks, pset *phis, pset *phi_blocks, ir_mode *mode) { ir_node *curr_bl; ir_node *start_irn; - firm_dbg_module_t *dbg = DBG_MODULE; + FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE); curr_bl = get_nodes_block(usage); @@ -231,10 +263,10 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo if(!phi) { int i, n_preds = get_irn_arity(curr_bl); ir_graph *irg = get_irn_irg(curr_bl); - ir_node **ins = malloc(n_preds * sizeof(ins[0])); + ir_node **ins = xmalloc(n_preds * sizeof(ins[0])); for(i = 0; i < n_preds; ++i) - ins[i] = new_r_Unknown(irg, mode); + ins[i] = new_r_Bad(irg); phi = new_r_Phi(irg, curr_bl, n_preds, ins, mode); DBG((dbg, LEVEL_2, "\tcreating phi %+F in %+F\n", phi, curr_bl)); @@ -244,10 +276,13 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo free(ins); for(i = 0; i < n_preds; ++i) { - ir_node *arg = search_def(phi, i, copies, copy_blocks, phi_blocks, mode); + ir_node *arg = search_def(phi, i, copies, copy_blocks, phis, phi_blocks, mode); DBG((dbg, LEVEL_2, "\t\t%+F(%d) -> %+F\n", phi, i, arg)); set_irn_n(phi, i, arg); } + + if(phis) + pset_insert_ptr(phis, phi); } return phi; @@ -262,58 +297,58 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo return NULL; } -static void fix_usages(int n_origs, ir_node *orig[], pset *copies, - pset *copy_blocks, pset *phi_blocks, pset *ignore_uses) +static void fix_usages(pset *copies, pset *copy_blocks, pset *phi_blocks, pset *phis, pset *ignore_uses) { - firm_dbg_module_t *dbg = DBG_MODULE; - int n_outs = 0; - ir_mode *mode = get_irn_mode(orig[0]); - - int i, j; - - struct { + int n_outs = 0; + struct obstack obst; + ir_node *irn; + int i; + struct out { ir_node *irn; int pos; } *outs; - /* Count the number of outs. */ - for(i = 0; i < n_origs; ++i) { - const ir_edge_t *edge; - foreach_out_edge(orig[i], edge) - n_outs += !pset_find_ptr(ignore_uses, get_edge_src_irn(edge)); - } + FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE); + + obstack_init(&obst); /* - * Put all outs into an array. - * This is necessary, since the outs would be modified while - * iterating on them what could bring the outs module in trouble. + * Put all outs into an array. + * This is necessary, since the outs would be modified while + * iterating on them what could bring the outs module in trouble. */ - outs = alloca(n_outs * sizeof(outs[0])); - for(i = 0, j = 0; i < n_origs; ++i) { + for (irn = pset_first(copies); irn; irn = pset_next(copies)) { const ir_edge_t *edge; - foreach_out_edge(orig[i], edge) { - if(!pset_find_ptr(ignore_uses, get_edge_src_irn(edge))) { - outs[j].irn = get_edge_src_irn(edge); - outs[j].pos = get_edge_src_pos(edge); - j += 1; + foreach_out_edge(irn, edge) { + if (!pset_find_ptr(ignore_uses, get_edge_src_irn(edge))) { + struct out tmp; + tmp.irn = get_edge_src_irn(edge); + tmp.pos = get_edge_src_pos(edge); + obstack_grow(&obst, &tmp, sizeof(tmp)); + n_outs++; } } } + outs = obstack_finish(&obst); /* * Search the valid def for each out and set it. */ for(i = 0; i < n_outs; ++i) { + ir_node *irn = outs[i].irn; + int pos = outs[i].pos; + ir_mode *mode = get_irn_mode(get_irn_n(irn, pos)); + ir_node *def; - ir_node *irn = outs[i].irn; - int pos = outs[i].pos; - def = search_def(irn, pos, copies, copy_blocks, phi_blocks, mode); + def = search_def(irn, pos, copies, copy_blocks, phis, phi_blocks, mode); DBG((dbg, LEVEL_2, "\t%+F(%d) -> %+F\n", irn, pos, def)); if(def != NULL) set_irn_n(irn, pos, def); } + + obstack_free(&obst, NULL); } /** @@ -349,102 +384,149 @@ static void remove_odd_phis(pset *copies, pset *unused_copies) } } -void be_ssa_constr_single_ignore(dom_front_info_t *info, ir_node *orig, int n, ir_node *copies[], pset *ignore_uses) +void be_ssa_constr_phis_ignore(dom_front_info_t *info, int n, ir_node *nodes[], pset *phis, pset *ignore_uses) +{ + pset *irns = pset_new_ptr(n); + int i; + + for(i = 0; i < n; ++i) + pset_insert_ptr(irns, nodes[i]); + be_ssa_constr_set_phis_ignore(info, irns, phis, ignore_uses); + del_pset(irns); +} + +void be_ssa_constr_ignore(dom_front_info_t *info, int n, ir_node *nodes[], pset *ignore_uses) { - ir_node *origs[1]; - origs[0] = orig; - be_ssa_constr_ignore(info, 1, origs, n, copies, ignore_uses); + be_ssa_constr_phis_ignore(info, n, nodes, NULL, ignore_uses); } -void be_ssa_constr_ignore(dom_front_info_t *info, int n_origs, ir_node *orig_nodes[], - int n_copies, ir_node *copy_nodes[], pset *ignore_uses) +void be_ssa_constr(dom_front_info_t *info, int n, ir_node *nodes[]) { - int n_all = n_copies + n_origs; - pset *copies = pset_new_ptr(2 * n_all); - pset *copy_blocks = pset_new_ptr(2 * n_all); - pset *phi_blocks = pset_new_ptr(2 * n_all); + pset *empty_set = be_empty_set(); + be_ssa_constr_ignore(info, n, nodes, empty_set); +} + +void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis, pset *ignore_uses) +{ + int n = pset_count(nodes); + pset *blocks = pset_new_ptr(n); + pset *phi_blocks = pset_new_ptr(n); int save_optimize = get_optimize(); int save_normalize = get_opt_normalize(); - firm_dbg_module_t *dbg = DBG_MODULE; + FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE); - int i; + ir_node *irn; - firm_dbg_set_mask(dbg, DBG_LEVEL); - // DBG((dbg, LEVEL_1, "Introducing following copies of %+F\n", orig)); + DBG((dbg, LEVEL_1, "Introducing following copies for:\n")); /* Fill the sets. */ - for(i = 0; i < n_origs; ++i) { - pset_insert_ptr(copies, orig_nodes[i]); - pset_insert_ptr(copy_blocks, get_nodes_block(orig_nodes[i])); + for(irn = pset_first(nodes); irn; irn = pset_next(nodes)) { + ir_node *bl = get_nodes_block(irn); + pset_insert_ptr(blocks, bl); + DBG((dbg, LEVEL_1, "\t%+F in %+F\n", irn, bl)); } /* - * All phis using the original values are also copies of it - * and must be present in the copies set. - */ - for(i = 0; i < n_copies; ++i) { - ir_node *bl = get_nodes_block(copy_nodes[i]); - DBG((dbg, LEVEL_1, "\t%+F in block %+F\n", copy_nodes[i], bl)); - pset_insert_ptr(copies, copy_nodes[i]); - pset_insert_ptr(copy_blocks, get_nodes_block(bl)); - } - - /* - * Disable optimization so that the phi functions do not - * disappear. - */ + * Disable optimization so that the phi functions do not + * disappear. + */ set_optimize(0); set_opt_normalize(0); /* - * Place the phi functions and reroute the usages. - */ - determine_phi_blocks(copies, copy_blocks, phi_blocks, info); - fix_usages(n_origs, orig_nodes, copies, copy_blocks, phi_blocks, ignore_uses); + * Place the phi functions and reroute the usages. + */ + determine_phi_blocks(nodes, blocks, phi_blocks, df); + fix_usages(nodes, blocks, phi_blocks, phis, ignore_uses); /* reset the optimizations */ set_optimize(save_optimize); set_opt_normalize(save_normalize); - del_pset(copies); del_pset(phi_blocks); - del_pset(copy_blocks); + del_pset(blocks); } -void be_ssa_constr(dom_front_info_t *info, int n_origs, ir_node *orig[], int n_copies, ir_node *copy_nodes[]) +void be_ssa_constr_set_phis(dom_front_info_t *df, pset *nodes, pset *phis) { pset *empty_set = be_empty_set(); - - assert(pset_count(empty_set) == 0); - be_ssa_constr_ignore(info, n_origs, orig, n_copies, copy_nodes, empty_set); + be_ssa_constr_set_phis_ignore(df, nodes, phis, empty_set); } +void be_ssa_constr_set_ignore(dom_front_info_t *df, pset *nodes, pset *ignore_uses) +{ + be_ssa_constr_set_phis_ignore(df, nodes, NULL, ignore_uses); +} -void be_ssa_constr_single(dom_front_info_t *info, ir_node *orig, int n, ir_node *copy_nodes[]) +void be_ssa_constr_set(dom_front_info_t *info, pset *nodes) { pset *empty_set = be_empty_set(); - - assert(pset_count(empty_set) == 0); - be_ssa_constr_single_ignore(info, orig, n, copy_nodes, empty_set); + be_ssa_constr_set_ignore(info, nodes, empty_set); } -void be_ssa_constr_sets(dom_front_info_t *info, pset *origs, pset *copies) +/* + ___ _ ____ + |_ _|_ __ ___ ___ _ __| |_ | _ \ ___ _ __ _ __ ___ + | || '_ \/ __|/ _ \ '__| __| | |_) / _ \ '__| '_ ` _ \ + | || | | \__ \ __/ | | |_ | __/ __/ | | | | | | | + |___|_| |_|___/\___|_| \__| |_| \___|_| |_| |_| |_| + +*/ + +ir_node *insert_Perm_after(const arch_env_t *arch_env, + const arch_register_class_t *cls, + dom_front_info_t *dom_front, + ir_node *pos) { - int n_origs = pset_count(origs); - int n_copies = pset_count(copies); + ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos); + ir_graph *irg = get_irn_irg(bl); + pset *live = pset_new_ptr_default(); + FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, "be.node"); - ir_node **orig_nodes = alloca(n_origs * sizeof(orig_nodes[0])); - ir_node **copy_nodes = alloca(n_copies * sizeof(orig_nodes[0])); + ir_node *curr, *irn, *perm, **nodes; + int i, n; - ir_node *irn; - int i; + DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos)); - for(i = 0, irn = pset_first(origs); irn; irn = pset_next(origs)) - orig_nodes[i++] = irn; + if(!be_liveness_nodes_live_at(arch_env, cls, pos, live)); - for(i = 0, irn = pset_first(copies); irn; irn = pset_next(copies)) - copy_nodes[i++] = irn; + n = pset_count(live); - be_ssa_constr(info, n_origs, orig_nodes, n_copies, copy_nodes); + if(n == 0) { + del_pset(live); + return NULL; + } + + nodes = xmalloc(n * sizeof(nodes[0])); + + DBG((dbg, LEVEL_1, "live:\n")); + for(irn = pset_first(live), i = 0; irn; irn = pset_next(live), i++) { + DBG((dbg, LEVEL_1, "\t%+F\n", irn)); + nodes[i] = irn; + } + del_pset(live); + + perm = be_new_Perm(cls, irg, bl, n, nodes); + sched_add_after(pos, perm); + free(nodes); + + curr = perm; + for(i = 0; i < n; ++i) { + ir_node *copies[2]; + ir_node *perm_op = get_irn_n(perm, i); + const arch_register_t *reg = arch_get_irn_register(arch_env, perm_op); + + ir_mode *mode = get_irn_mode(perm_op); + ir_node *proj = new_r_Proj(irg, bl, perm, mode, i); + arch_set_irn_register(arch_env, proj, reg); + + sched_add_after(curr, proj); + curr = proj; + + copies[0] = perm_op; + copies[1] = proj; + be_ssa_constr(dom_front, 2, copies); + } + return perm; }