X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=77cf75c534798797a7ad045bf55f66f3d88aa559;hb=eba5516120eb38bcae5464e628aa0d2cb8708866;hp=825f46b56c0bcacb24d80a11380229f31503ca11;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index 825f46b56..77cf75c53 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,12 +18,11 @@ */ /** - * 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" @@ -47,8 +46,9 @@ #include "belive_t.h" #include "benode_t.h" #include "besched_t.h" -#include "benodesets.h" #include "bestatevent.h" +#include "beirg_t.h" +#include "beintlive_t.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) @@ -61,6 +61,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) #define is_curr_reg_class(irn) (get_reg_cls(p) == chordal_env->cls) static void clear_link(ir_node *irn, void *data) { + (void) data; set_irn_link(irn, NULL); } @@ -72,7 +73,7 @@ static void clear_link(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); @@ -95,6 +96,8 @@ typedef struct { 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); } @@ -135,9 +138,12 @@ 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); + unsigned hash = hash_irn(arg); + perm_proj_t templ; + + if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore)) + continue; templ.arg = arg; pp = set_find(arg_set, &templ, sizeof(templ), hash); @@ -168,8 +174,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { perm = be_new_Perm(chordal_env->cls, irg, 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, &chordal_env->birg->main_env->arch_env); sched_add_after(insert_after, perm); /* @@ -183,7 +188,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { 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,13 +199,23 @@ 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); } @@ -242,11 +256,14 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { arg_block = get_Block_cfgpred_block(phi_block, i); arg_reg = get_reg(arg); + if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore)) + continue; + assert(arg_reg && "Register must be set while placing perms"); 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 (values_interfere(chordal_env->birg, phi, arg)) { /* Insert a duplicate in arguments block, make it the new phi arg, @@ -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, &chordal_env->birg->main_env->arch_env), 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 */ } @@ -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 { /* @@ -360,13 +381,14 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { } 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,16 +398,21 @@ 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: unfortunaltely 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); @@ -405,6 +432,9 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) { for (i = 0, max = get_irn_arity(phi); i < max; ++i) { ir_node *arg = get_irn_n(phi, i); + if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore)) + continue; + arg_reg = get_reg(arg); if (phi_reg != arg_reg) {