X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=7afcb798bcc9c856ae0b45c34955e4ce5659d095;hb=44e06c719bc59348c183e041947461b49e48c79f;hp=773343f7a5de9183e42ed25f77a5157d6cbc18c5;hpb=1d017c585cbce1afb01e3e8f54b1af6cbcd0eabd;p=libfirm diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c index 773343f7a..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,7 +109,7 @@ 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(); @@ -120,38 +135,40 @@ pset *be_get_dominance_frontier(dom_front_info_t *info, ir_node *block) return pmap_get(info->df_map, block); } -static void determine_phi_blocks(pset *copies, pset* copy_blocks, pset *phi_blocks, dom_front_info_t *df_info) +static void determine_phi_blocks(pset *copies, pset *copy_blocks, pset *phi_blocks, dom_front_info_t *df_info) { 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)) @@ -164,13 +181,27 @@ 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. @@ -188,7 +219,7 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo { 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); @@ -235,7 +266,7 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo 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)); @@ -268,29 +299,28 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo 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; - + int n_outs = 0; struct obstack obst; ir_node *irn; int i; - struct out { ir_node *irn; int pos; } *outs; + 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. - */ - for(irn = pset_first(copies); irn; irn = pset_next(copies)) { + * 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. + */ + for (irn = pset_first(copies); irn; irn = pset_next(copies)) { const ir_edge_t *edge; foreach_out_edge(irn, edge) { - if(!pset_find_ptr(ignore_uses, get_edge_src_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); @@ -373,7 +403,6 @@ void be_ssa_constr_ignore(dom_front_info_t *info, int n, ir_node *nodes[], pset void be_ssa_constr(dom_front_info_t *info, int n, ir_node *nodes[]) { pset *empty_set = be_empty_set(); - assert(pset_count(empty_set) == 0); be_ssa_constr_ignore(info, n, nodes, empty_set); } @@ -384,11 +413,10 @@ void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis 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); ir_node *irn; - firm_dbg_set_mask(dbg, DBG_LEVEL); DBG((dbg, LEVEL_1, "Introducing following copies for:\n")); /* Fill the sets. */ @@ -399,15 +427,15 @@ void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis } /* - * 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. - */ + * 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); @@ -423,9 +451,7 @@ void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis 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_set_phis_ignore(df, nodes,phis, 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) @@ -436,6 +462,71 @@ void be_ssa_constr_set_ignore(dom_front_info_t *df, pset *nodes, pset *ignore_us 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_set_ignore(info, nodes, empty_set); } + +/* + ___ _ ____ + |_ _|_ __ ___ ___ _ __| |_ | _ \ ___ _ __ _ __ ___ + | || '_ \/ __|/ _ \ '__| __| | |_) / _ \ '__| '_ ` _ \ + | || | | \__ \ __/ | | |_ | __/ __/ | | | | | | | + |___|_| |_|___/\___|_| \__| |_| \___|_| |_| |_| |_| + +*/ + +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) +{ + 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 *curr, *irn, *perm, **nodes; + int i, n; + + DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos)); + + if(!be_liveness_nodes_live_at(arch_env, cls, pos, live)); + + n = pset_count(live); + + 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; +}