spills and reloads don't take frame pointer as input any more

[libfirm] / ir / be / bespill.c

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 154a3a1..c2a1b6f 100644 (file)
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -66,6 +66,7 @@ struct _spill_env_t {
        const arch_env_t *arch_env;
        const be_chordal_env_t *chordal_env;
        struct obstack obst;
+       be_irg_t *birg;
        int spill_cost;     /**< the cost of a single spill node */
        int reload_cost;    /**< the cost of a reload node */
        set *spills;        /**< all spill_info_t's, which must be placed */
@@ -129,6 +130,7 @@ spill_env_t *be_new_spill_env(const be_chordal_env_t *chordal_env) {
        env->spills                     = new_set(cmp_spillinfo, 1024);
        env->cls                        = chordal_env->cls;
        env->chordal_env        = chordal_env;
+       env->birg           = chordal_env->birg;
        env->arch_env       = env->chordal_env->birg->main_env->arch_env;
        env->mem_phis           = pset_new_ptr_default();
        // TODO, ask backend about costs...
@@ -159,7 +161,6 @@ void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before) {
        spill_info_t *info;
        reloader_t *rel;
 
-       assert(sched_is_scheduled(before));
        assert(arch_irn_consider_in_reg_alloc(env->arch_env, env->cls, to_spill));
 
        info = get_spillinfo(env, to_spill);
@@ -171,6 +172,18 @@ void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before) {
                        ir_node *arg = get_irn_n(to_spill, i);
                        get_spillinfo(env, arg);
                }
+
+#if 1
+               // hackery... sometimes the morgan algo spilled the value of a phi,
+               // the belady algo decides later to spill the whole phi, then sees the
+               // spill node and adds a reload for that spill node, problem is the
+               // reload gets attach to that same spill (and is totally unnecessary)
+               if(info->old_spill != NULL &&
+                       (before == info->old_spill || value_dominates(before, info->old_spill))) {
+                       printf("spilledphi hack was needed...\n");
+                       before = sched_next(info->old_spill);
+               }
+#endif
        }
 
        rel           = obstack_alloc(&env->obst, sizeof(rel[0]));
@@ -204,6 +217,7 @@ static ir_node *get_reload_insertion_point(ir_node *block, int pos) {
                ir_graph *irg = get_irn_irg(block);
                ir_node *startblock = get_irg_start_block(irg);
 
+               last = sched_next(last);
                // last node must be a cfop, only exception is the start block
                assert(last     == startblock);
        }
@@ -235,6 +249,7 @@ void be_spill_phi(spill_env_t *env, ir_node *node) {
        // if we had a spill for the phi value before, then remove this spill from
        // schedule, as we will remove it in the insert spill/reload phase
        if(spill->spill != NULL && !is_Phi(spill->spill)) {
+               assert(spill->old_spill == NULL);
                spill->old_spill = spill->spill;
                spill->spill = NULL;
        }
@@ -344,11 +359,15 @@ static void spill_phi(spill_env_t *env, spill_info_t *spillinfo) {
        // rewire reloads from old_spill to phi
        if(spillinfo->old_spill != NULL) {
                const ir_edge_t *edge, *next;
-               foreach_out_edge_safe(spillinfo->old_spill, edge, next) {
+               ir_node *old_spill = spillinfo->old_spill;
+
+               foreach_out_edge_safe(old_spill, edge, next) {
                        ir_node* reload = get_edge_src_irn(edge);
                        assert(be_is_Reload(reload) || is_Phi(reload));
                        set_irn_n(reload, get_edge_src_pos(edge), spillinfo->spill);
                }
+               set_irn_n(old_spill, be_pos_Spill_val, new_Bad());
+               //sched_remove(old_spill);
                spillinfo->old_spill = NULL;
        }
 }
@@ -398,13 +417,18 @@ static int is_value_available(spill_env_t *env, ir_node *arg, ir_node *reloader)
        if(arg == get_irg_frame(env->chordal_env->irg))
                return 1;
 
+       // hack for now (happens when command should be inserted at end of block)
+       if(is_Block(reloader)) {
+               return 0;
+       }
+
        /* the following test does not work while spilling,
         * because the liveness info is not adapted yet to the effects of the
         * additional spills/reloads.
         *
         * So we can only do this test for ignore registers (of our register class)
         */
-       if(arch_get_irn_reg_class(env->arch_env, arg, -1) == env->chordal_env->cls
+       if(arch_get_irn_reg_class(env->arch_env, arg, -1) == env->cls
           && arch_irn_is(env->arch_env, arg, ignore)) {
                int i, arity;
 
@@ -413,7 +437,7 @@ static int is_value_available(spill_env_t *env, ir_node *arg, ir_node *reloader)
                 *   - it interferes with the reloaders result
                 *   - or it is (last-) used by reloader itself
                 */
-               if (values_interfere(env->chordal_env->lv, reloader, arg)) {
+               if (values_interfere(env->birg->lv, reloader, arg)) {
                        return 1;
                }
 
@@ -513,9 +537,15 @@ static int check_remat_conditions(spill_env_t *env, ir_node *spilled, ir_node *r
 static ir_node *do_remat(spill_env_t *env, ir_node *spilled, ir_node *reloader) {
        int i, arity;
        ir_node *res;
-       ir_node *bl = get_nodes_block(reloader);
+       ir_node *bl;
        ir_node **ins;
 
+       if(is_Block(reloader)) {
+               bl = reloader;
+       } else {
+               bl = get_nodes_block(reloader);
+       }
+
        ins = alloca(get_irn_arity(spilled) * sizeof(ins[0]));
        for(i = 0, arity = get_irn_arity(spilled); i < arity; ++i) {
                ir_node *arg = get_irn_n(spilled, i);
@@ -539,7 +569,6 @@ static ir_node *do_remat(spill_env_t *env, ir_node *spilled, ir_node *reloader)
        DBG((env->dbg, LEVEL_1, "Insert remat %+F before reloader %+F\n", res, reloader));
 
        /* insert in schedule */
-       assert(!is_Block(reloader));
        sched_add_before(reloader, res);
 
        return res;
@@ -616,7 +645,7 @@ void be_insert_spills_reloads(spill_env_t *env) {
                if(pset_count(values) > 0) {
                        /* introduce copies, rewire the uses */
                        pset_insert_ptr(values, si->spilled_node);
-                       be_ssa_constr_set_ignore(env->chordal_env->dom_front, env->chordal_env->lv, values, env->mem_phis);
+                       be_ssa_constr_set_ignore(env->birg->dom_front, env->birg->lv, values, env->mem_phis);
                }
 
                del_pset(values);
@@ -631,5 +660,6 @@ void be_insert_spills_reloads(spill_env_t *env) {
        }
 
        be_remove_dead_nodes_from_schedule(env->chordal_env->irg);
-       be_liveness_recompute(env->chordal_env->lv);
+       //be_liveness_recompute(env->birg->lv);
+       be_invalidate_liveness(env->birg);
 }