X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=48a9bf1b8701a5ccb133bd6bfdc53bbc0810ca70;hb=14b4e9b3f48cd53db6c3179283ce8354d5127ce1;hp=825f46b56c0bcacb24d80a11380229f31503ca11;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index 825f46b56..48a9bf1b8 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -18,16 +18,13 @@ */ /** - * Author: Daniel Grund - * Date: 25.05.2005 - * Copyright: (c) Universitaet Karlsruhe - * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. - * - * Performs SSA-Destruction. + * @file + * @brief Performs SSA-Destruction. + * @author Daniel Grund + * @date 25.05.2005 + * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "debug.h" #include "set.h" @@ -43,24 +40,22 @@ #include "be_t.h" #include "beutil.h" #include "bechordal_t.h" -#include "bearch_t.h" +#include "bearch.h" #include "belive_t.h" -#include "benode_t.h" -#include "besched_t.h" -#include "benodesets.h" +#include "benode.h" +#include "besched.h" #include "bestatevent.h" +#include "beirg.h" +#include "beintlive_t.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -#define get_chordal_arch(ce) ((ce)->birg->main_env->arch_env) -#define get_reg(irn) arch_get_irn_register(get_chordal_arch(chordal_env), irn) -#define set_reg(irn, reg) arch_set_irn_register(get_chordal_arch(chordal_env), irn, reg) - -#define is_Perm(irn) (arch_irn_class_is(arch_env, irn, perm)) -#define get_reg_cls(irn) (arch_get_irn_reg_class(arch_env, irn, -1)) -#define is_curr_reg_class(irn) (get_reg_cls(p) == chordal_env->cls) +#define get_reg(irn) arch_get_irn_register(irn) +#define set_reg(irn, reg) arch_set_irn_register(irn, reg) -static void clear_link(ir_node *irn, void *data) { +static void clear_link(ir_node *irn, void *data) +{ + (void) data; set_irn_link(irn, NULL); } @@ -70,9 +65,10 @@ static void clear_link(ir_node *irn, void *data) { * - have the current register class * The list is rooted at get_irn_link(BB). */ -static void collect_phis_walker(ir_node *irn, void *data) { +static void collect_phis_walker(ir_node *irn, void *data) +{ be_chordal_env_t *env = data; - if(is_Phi(irn) && chordal_has_class(env, irn)) { + if (is_Phi(irn) && chordal_has_class(env, irn)) { ir_node *bl = get_nodes_block(irn); set_irn_link(irn, get_irn_link(bl)); set_irn_link(bl, irn); @@ -92,9 +88,12 @@ typedef struct { ir_node *proj; /**< The proj created for @p arg. */ } perm_proj_t; -static int cmp_perm_proj(const void *a, const void *b, size_t n) { +static int cmp_perm_proj(const void *a, const void *b, size_t n) +{ const perm_proj_t *p = a; const perm_proj_t *q = b; + (void) n; + return !(p->arg == q->arg); } @@ -106,11 +105,11 @@ typedef struct insert_all_perms_env_t { /** * Insert Perms in all predecessors of a block containing a phi */ -static void insert_all_perms_walker(ir_node *bl, void *data) { +static void insert_all_perms_walker(ir_node *bl, void *data) +{ insert_all_perms_env_t *env = data; be_chordal_env_t *chordal_env = env->chordal_env; pmap *perm_map = env->perm_map; - ir_graph *irg = chordal_env->irg; be_lv_t *lv = chordal_env->birg->lv; int i, n; @@ -135,10 +134,15 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { * register class by construction. */ for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { - perm_proj_t templ; - ir_node *arg = get_irn_n(phi, i); - unsigned hash = nodeset_hash(arg); + ir_node *arg = get_irn_n(phi, i); + const arch_register_req_t *req = arch_get_register_req_out(arg); + unsigned hash; + perm_proj_t templ; + if (req->type & arch_register_req_type_ignore) + continue; + + hash = hash_irn(arg); templ.arg = arg; pp = set_find(arg_set, &templ, sizeof(templ), hash); @@ -147,7 +151,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { * create one. The only restriction is, that the phi argument * may not be live in at the current block, since this argument * interferes with the phi and must thus not be member of a - * Perm. A copy will be inserted for this argument alter on. + * Perm. A copy will be inserted for this argument later on. */ if(!pp && !be_is_live_in(lv, bl, arg)) { templ.pos = n_projs++; @@ -161,15 +165,14 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { * Create a new Perm with the arguments just collected * above in the arg_set and insert it into the schedule. */ - in = xmalloc(n_projs * sizeof(in[0])); + in = XMALLOCN(ir_node*, n_projs); for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) in[pp->pos] = pp->arg; - perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in); + perm = be_new_Perm(chordal_env->cls, pred_bl, n_projs, in); be_stat_ev("phi_perm", n_projs); - free(in); - insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env); + insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, NULL); sched_add_after(insert_after, perm); /* @@ -179,11 +182,10 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { */ insert_after = perm; for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) { - ir_node *proj = new_r_Proj(irg, pred_bl, perm, get_irn_mode(pp->arg), pp->pos); + ir_node *proj = new_r_Proj(pred_bl, perm, get_irn_mode(pp->arg), pp->pos); pp->proj = proj; assert(get_reg(pp->arg)); set_reg(proj, get_reg(pp->arg)); - sched_add_after(insert_after, proj); insert_after = proj; DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", get_reg(pp->arg)->name, pp->arg, pp->proj)); } @@ -195,12 +197,22 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { perm_proj_t templ; templ.arg = get_irn_n(phi, i); - pp = set_find(arg_set, &templ, sizeof(templ), nodeset_hash(templ.arg)); + pp = set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg)); /* If not found, it was an interfering argument */ - if (pp) + if (pp) { set_irn_n(phi, i, pp->proj); + be_liveness_introduce(lv, pp->proj); + } + } + + /* update the liveness of the Perm's operands. It might be changed. */ + { + int i; + for (i = 0; i < n_projs; ++i) + be_liveness_update(lv, in[i]); } + free(in); /* register in perm map */ pmap_insert(perm_map, pred_bl, perm); @@ -218,27 +230,32 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { * Adjusts the register allocation for the (new) phi-operands * and insert duplicates iff necessary. */ -static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { +static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) +{ be_chordal_env_t *chordal_env = data; be_lv_t *lv = chordal_env->birg->lv; ir_node *phi; /* Consider all phis of this block */ for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { - int i, max; - ir_node *arg, *phi_block, *arg_block; - const arch_register_t *phi_reg, *arg_reg; - const arch_register_class_t *cls; + ir_node *phi_block = get_nodes_block(phi); + const arch_register_t *phi_reg = get_reg(phi); + const arch_register_class_t *cls = phi_reg->reg_class; + int max; + int i; assert(is_Phi(phi) && "Can only handle phi-destruction :)"); - phi_block = get_nodes_block(phi); - phi_reg = get_reg(phi); - cls = arch_get_irn_reg_class(get_chordal_arch(chordal_env), phi, -1); - /* process all arguments of the phi */ for (i = 0, max = get_irn_arity(phi); i < max; ++i) { - arg = get_irn_n(phi, i); + ir_node *arg = get_irn_n(phi, i); + const arch_register_req_t *req = arch_get_register_req_out(arg); + const arch_register_t *arg_reg; + ir_node *arg_block; + + if (req->type & arch_register_req_type_ignore) + continue; + arg_block = get_Block_cfgpred_block(phi_block, i); arg_reg = get_reg(arg); @@ -246,7 +263,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { DBG((dbg, LEVEL_1, " for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name)); - if(values_interfere(lv, phi, arg)) { + if (be_values_interfere(lv, phi, arg)) { /* Insert a duplicate in arguments block, make it the new phi arg, @@ -254,7 +271,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { insert it into schedule, pin it */ - ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, arg); + ir_node *dupl = be_new_Copy(cls, arg_block, arg); /* this is commented out because it will fail in case of unknown float */ #if 0 @@ -271,8 +288,10 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { set_irn_n(phi, i, dupl); set_reg(dupl, phi_reg); - sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env), dupl); + sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, NULL), dupl); pin_irn(dupl, phi_block); + be_liveness_introduce(lv, dupl); + be_liveness_update(lv, arg); DBG((dbg, LEVEL_1, " they do interfere: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); continue; /* with next argument */ } @@ -321,8 +340,8 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { insert it into schedule, pin it */ - ir_node *perm = get_Proj_pred(arg); - ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, arg); + ir_node *perm = get_Proj_pred(arg); + ir_node *dupl = be_new_Copy(cls, arg_block, arg); ir_node *ins; /* this is commented out because it will fail in case of unknown float */ @@ -345,6 +364,8 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { for(ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins)); sched_add_before(ins, dupl); pin_irn(dupl, phi_block); + be_liveness_introduce(lv, dupl); + be_liveness_update(lv, arg); DBG((dbg, LEVEL_1, " arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); } else { /* @@ -359,14 +380,16 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { } } -void be_ssa_destruction(be_chordal_env_t *chordal_env) { +void be_ssa_destruction(be_chordal_env_t *chordal_env) +{ + insert_all_perms_env_t insert_perms_env; pmap *perm_map = pmap_create(); ir_graph *irg = chordal_env->irg; - insert_all_perms_env_t insert_perms_env; + be_lv_t *lv = be_assure_liveness(chordal_env->birg); FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr"); - be_assure_liveness(chordal_env->birg); + be_liveness_invalidate(lv); /* create a map for fast lookup of perms: block --> perm */ irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env); @@ -376,26 +399,32 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) { insert_perms_env.perm_map = perm_map; irg_block_walk_graph(irg, insert_all_perms_walker, NULL, &insert_perms_env); + // Matze: really needed here? + // Sebastian: Yes. the walker function uses interference. + be_liveness_invalidate(lv); + if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR) be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched); - // Matze: really needed here? - be_invalidate_liveness(chordal_env->birg); - be_assure_liveness(chordal_env->birg); + be_liveness_assure_chk(lv); DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n")); irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env); + /* TODO: unfortunately updating doesn't work yet. */ + be_liveness_invalidate(lv); + if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR) be_dump(irg, "-ssa_destr_regs_set", dump_ir_block_graph_sched); pmap_destroy(perm_map); } -static void ssa_destruction_check_walker(ir_node *bl, void *data) { - be_chordal_env_t *chordal_env = data; +static void ssa_destruction_check_walker(ir_node *bl, void *data) +{ ir_node *phi; int i, max; + (void)data; for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { const arch_register_t *phi_reg, *arg_reg; @@ -403,7 +432,11 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) { phi_reg = get_reg(phi); /* iterate over all args of phi */ for (i = 0, max = get_irn_arity(phi); i < max; ++i) { - ir_node *arg = get_irn_n(phi, i); + ir_node *arg = get_irn_n(phi, i); + const arch_register_req_t *req = arch_get_register_req_out(arg); + + if (req->type & arch_register_req_type_ignore) + continue; arg_reg = get_reg(arg); @@ -420,6 +453,7 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) { } } -void be_ssa_destruction_check(be_chordal_env_t *chordal_env) { - irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, chordal_env); +void be_ssa_destruction_check(be_chordal_env_t *chordal_env) +{ + irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, NULL); }