output estimated cost statistics to statfile

[libfirm] / ir / be / bespill.c

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 4d6c9a5..0da8e6e 100644 (file)
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -34,6 +34,8 @@
 #include "bechordal_t.h"
 #include "bejavacoal.h"
 #include "benodesets.h"
+#include "bespilloptions.h"
+#include "bestatevent.h"
 
 // only rematerialise when costs are less than REMAT_COST_LIMIT
 // TODO determine a good value here...
@@ -144,7 +146,7 @@ void be_delete_spill_env(spill_env_t *env) {
        free(env);
 }
 
-/**
+/*
  *  ____  _                  ____      _                 _
  * |  _ \| | __ _  ___ ___  |  _ \ ___| | ___   __ _  __| |___
  * | |_) | |/ _` |/ __/ _ \ | |_) / _ \ |/ _ \ / _` |/ _` / __|
@@ -157,7 +159,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);
@@ -197,7 +198,15 @@ static ir_node *get_reload_insertion_point(ir_node *block, int pos) {
                last = sched_prev(last);
                assert(!sched_is_end(last));
        }
-       assert(is_cfop(last));
+
+       if(!is_cfop(last)) {
+               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);
+       }
 
        // add the reload before the (cond-)jump
        return last;
@@ -389,6 +398,11 @@ 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.
@@ -504,9 +518,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);
@@ -530,7 +550,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;
@@ -539,10 +558,12 @@ static ir_node *do_remat(spill_env_t *env, ir_node *spilled, ir_node *reloader)
 int be_get_reload_costs(spill_env_t *env, ir_node *to_spill, ir_node *before) {
        spill_info_t *spill_info;
 
-       // is the node rematerializable?
-       int costs = check_remat_conditions_costs(env, to_spill, before, 0);
-       if(costs < REMAT_COST_LIMIT)
-               return costs;
+       if(be_do_remats) {
+               // is the node rematerializable?
+               int costs = check_remat_conditions_costs(env, to_spill, before, 0);
+               if(costs < REMAT_COST_LIMIT)
+                       return costs;
+       }
 
        // do we already have a spill?
        spill_info = find_spillinfo(env, to_spill);
@@ -569,6 +590,9 @@ int be_get_reload_costs_on_edge(spill_env_t *env, ir_node *to_spill, ir_node *bl
 void be_insert_spills_reloads(spill_env_t *env) {
        const arch_env_t *arch_env = env->arch_env;
        spill_info_t *si;
+       int remats = 0;
+       int reloads = 0;
+       int spills = 0;
 
        /* process each spilled node */
        for(si = set_first(env->spills); si; si = set_next(env->spills)) {
@@ -580,14 +604,19 @@ void be_insert_spills_reloads(spill_env_t *env) {
                for(rld = si->reloaders; rld; rld = rld->next) {
                        ir_node *new_val;
 
-                       if (check_remat_conditions(env, si->spilled_node, rld->reloader)) {
+                       if (be_do_remats && check_remat_conditions(env, si->spilled_node, rld->reloader)) {
                                new_val = do_remat(env, si->spilled_node, rld->reloader);
+                               remats++;
                        } else {
                                /* make sure we have a spill */
-                               spill_node(env, si);
+                               if(si->spill == NULL) {
+                                       spill_node(env, si);
+                                       spills++;
+                               }
 
-                               /* do a reload */
+                               /* create a reload */
                                new_val = be_reload(arch_env, env->cls, rld->reloader, mode, si->spill);
+                               reloads++;
                        }
 
                        DBG((env->dbg, LEVEL_1, " %+F of %+F before %+F\n", new_val, si->spilled_node, rld->reloader));
@@ -605,6 +634,12 @@ void be_insert_spills_reloads(spill_env_t *env) {
                si->reloaders = NULL;
        }
 
+       if(be_stat_ev_is_active()) {
+               be_stat_ev("spill_spills", spills);
+               be_stat_ev("spill_reloads", reloads);
+               be_stat_ev("spill_remats", remats);
+       }
+
        be_remove_dead_nodes_from_schedule(env->chordal_env->irg);
        be_liveness_recompute(env->chordal_env->lv);
 }