X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=08aa8d5a6dc05441ea63446f288fbbdb4835fe2d;hb=a801e68c8aa279117fe7845fb2d4220750131553;hp=2eaffdcb42e7e6396a3523a467e92ab7d5d215d1;hpb=32a664cf05ce77aa410e334fdea34a851c36143f;p=libfirm diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c index 2eaffdcb4..08aa8d5a6 100644 --- a/ir/be/bespillbelady.c +++ b/ir/be/bespillbelady.c @@ -4,8 +4,18 @@ * Copyright: (c) Universitaet Karlsruhe * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#ifdef HAVE_ALLOCA_H #include +#endif + +#ifdef HAVE_MALLOC_H +#include +#endif + #include "obst.h" #include "set.h" #include "pset.h" @@ -24,6 +34,7 @@ #include "beirgmod.h" #include "belive_t.h" #include "benode_t.h" +#include "bechordal_t.h" #define DBG_SPILL 1 #define DBG_WSETS 2 @@ -94,7 +105,7 @@ static INLINE workset_t *workset_clone(struct obstack *ob, workset_t *ws) { static INLINE void workset_insert(workset_t *ws, ir_node *val) { int i; /* check for current regclass */ - if (arch_get_irn_reg_class(ws->bel->arch, val, 0) != ws->bel->cls) { + if (arch_get_irn_reg_class(ws->bel->arch, val, -1) != ws->bel->cls) { DBG((dbg, DBG_DECIDE, "Dropped %+F\n", val)); return; } @@ -121,7 +132,7 @@ static INLINE void workset_bulk_insert(workset_t *ws, int cnt, ir_node **vals) { ir_node *val = vals[o]; DBG((dbg, DBG_TRACE, "Bulk insert %+F\n", val)); /* check for current regclass */ - if (arch_get_irn_reg_class(ws->bel->arch, val, 0) != ws->bel->cls) { + if (arch_get_irn_reg_class(ws->bel->arch, val, -1) != ws->bel->cls) { DBG((dbg, DBG_TRACE, "Wrong reg class\n")); goto no_insert; } @@ -186,9 +197,11 @@ static INLINE int workset_contains(const workset_t *ws, const ir_node *val) { static int is_mem_phi(const ir_node *irn, void *data) { + workset_t *sws; ir_node *blk = get_nodes_block(irn); + DBG((dbg, DBG_SPILL, "Is %+F a mem-phi?\n", irn)); - workset_t *sws = ((block_info_t *)get_irn_link(blk))->ws_start; + sws = ((block_info_t *) get_irn_link(blk))->ws_start; DBG((dbg, DBG_SPILL, " %d\n", !workset_contains(sws, irn))); return !workset_contains(sws, irn); } @@ -211,7 +224,7 @@ static void build_start_set(belady_env_t *bel, ir_node *blk) { first = sched_first(blk); count = 0; sched_foreach(blk, irn) - if (is_Phi(irn) && arch_get_irn_reg_class(bel->arch, irn, 0) == bel->cls) { + if (is_Phi(irn) && arch_get_irn_reg_class(bel->arch, irn, -1) == bel->cls) { loc.irn = irn; loc.time = be_get_next_use(bel->uses, first, 0, irn, 0); DBG((dbg, DBG_START, " %+F next-use %d\n", loc.irn, loc.time)); @@ -221,7 +234,7 @@ static void build_start_set(belady_env_t *bel, ir_node *blk) { break; live_foreach(blk, li) - if (live_is_in(li) && arch_get_irn_reg_class(bel->arch, li->irn, 0) == bel->cls) { + if (live_is_in(li) && arch_get_irn_reg_class(bel->arch, li->irn, -1) == bel->cls) { loc.irn = (ir_node *)li->irn; loc.time = be_get_next_use(bel->uses, first, 0, li->irn, 0); DBG((dbg, DBG_START, " %+F next-use %d\n", loc.irn, loc.time)); @@ -400,18 +413,19 @@ static void decide(ir_node *blk, void *env) { } /** - * 'decide' is block-local and makes assumtions + * 'decide' is block-local and makes assumptions * about the set of live-ins. Thus we must adapt the * live-outs to the live-ins at each block-border. */ static void fix_block_borders(ir_node *blk, void *env) { + workset_t *wsb; belady_env_t *bel = env; int i, max; DBG((dbg, DBG_FIX, "\n")); DBG((dbg, DBG_FIX, "Fixing %+F\n", blk)); - workset_t *wsb = ((block_info_t *)get_irn_link(blk))->ws_start; + wsb = ((block_info_t *)get_irn_link(blk))->ws_start; /* process all pred blocks */ for (i=0, max=get_irn_arity(blk); ireloads); for(irn = pset_first(bel->reloads); irn; irn = pset_next(bel->reloads)) { + ir_node *spill; DBG((dbg, DBG_SPILL, "Removing %+F before %+F in %+F\n", irn, sched_next(irn), get_nodes_block(irn))); - ir_node *spill = get_irn_n(irn, 0); + spill = get_irn_n(irn, 0); - /* remove reaload */ + /* remove reload */ set_irn_n(irn, 0, new_Bad()); sched_remove(irn); /* if spill not used anymore, remove it too * test of regclass is necessary since spill may be a phi-M */ - if (get_irn_n_edges(spill) == 0 && bel->cls == arch_get_irn_reg_class(bel->arch, spill, 0)) { + if (get_irn_n_edges(spill) == 0 && bel->cls == arch_get_irn_reg_class(bel->arch, spill, -1)) { set_irn_n(spill, 0, new_Bad()); sched_remove(spill); } } } -void be_spill_belady(const be_main_session_env_t *session, const arch_register_class_t *cls) { +void be_spill_belady(const be_chordal_env_t *chordal_env) { + belady_env_t bel; + dbg = firm_dbg_register("ir.be.spillbelady"); firm_dbg_set_mask(dbg, DEBUG_LVL); /* init belady env */ - belady_env_t *bel = alloca(sizeof(*bel)); - obstack_init(&bel->ob); - bel->factory = session->main_env->node_factory; - bel->arch = session->main_env->arch_env; - bel->cls = cls; - bel->n_regs = arch_register_class_n_regs(cls); - bel->ws = new_workset(&bel->ob, bel); - bel->uses = be_begin_uses(session->irg, session->main_env->arch_env, cls); - bel->senv = be_new_spill_env(dbg, session, cls, is_mem_phi, NULL); - bel->reloads = pset_new_ptr_default(); + obstack_init(&bel.ob); + bel.factory = chordal_env->main_env->node_factory; + bel.arch = chordal_env->main_env->arch_env; + bel.cls = chordal_env->cls; + bel.n_regs = arch_register_class_n_regs(bel.cls); + bel.ws = new_workset(&bel.ob, &bel); + bel.uses = be_begin_uses(chordal_env->irg, chordal_env->main_env->arch_env, bel.cls); + bel.senv = be_new_spill_env(dbg, chordal_env, is_mem_phi, NULL); + bel.reloads = pset_new_ptr_default(); /* do the work */ - irg_block_walk_graph(session->irg, decide, NULL, bel); - irg_block_walk_graph(session->irg, fix_block_borders, NULL, bel); - be_insert_spills_reloads(bel->senv, bel->reloads); - remove_unused_reloads(session->irg, bel); + irg_block_walk_graph(chordal_env->irg, decide, NULL, &bel); + irg_block_walk_graph(chordal_env->irg, fix_block_borders, NULL, &bel); + be_insert_spills_reloads(bel.senv, bel.reloads); + remove_unused_reloads(chordal_env->irg, &bel); /* clean up */ - del_pset(bel->reloads); - be_delete_spill_env(bel->senv); - be_end_uses(bel->uses); - obstack_free(&bel->ob, NULL); + del_pset(bel.reloads); + be_delete_spill_env(bel.senv); + be_end_uses(bel.uses); + obstack_free(&bel.ob, NULL); }