fehler109

[libfirm] / ir / be / bespill.c

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 04e801a..9f88ad5 100644 (file)
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.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.
  *
@@ -55,13 +55,13 @@
 #include "benode_t.h"
 #include "bechordal_t.h"
 #include "bejavacoal.h"
-#include "benodesets.h"
 #include "bespilloptions.h"
 #include "bestatevent.h"
 #include "bessaconstr.h"
 #include "beirg_t.h"
 #include "beintlive_t.h"
 #include "bemodule.h"
+#include "be_t.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -136,7 +136,7 @@ static int cmp_spillinfo(const void *x, const void *y, size_t size)
 static spill_info_t *get_spillinfo(const spill_env_t *env, ir_node *value)
 {
        spill_info_t info, *res;
-       int hash = nodeset_hash(value);
+       int hash = hash_irn(value);
 
        info.to_spill = value;
        res = set_find(env->spills, &info, sizeof(info), hash);
@@ -196,11 +196,13 @@ void be_delete_spill_env(spill_env_t *env)
 
 void be_add_spill(spill_env_t *env, ir_node *to_spill, ir_node *before)
 {
+#if 1
        spill_info_t *spill_info = get_spillinfo(env, to_spill);
        spill_t      *spill;
        spill_t      *s;
        spill_t      *last;
 
+       assert(! arch_irn_is(env->arch_env, to_spill, dont_spill));
        DB((dbg, LEVEL_1, "Add spill of %+F before %+F\n", to_spill, before));
 
        /* spills that are dominated by others are not needed */
@@ -231,6 +233,7 @@ void be_add_spill(spill_env_t *env, ir_node *to_spill, ir_node *before)
        spill->spill  = NULL;
 
        spill_info->spills = spill;
+#endif
 }
 
 void be_add_remat(spill_env_t *env, ir_node *to_spill, ir_node *before,
@@ -263,6 +266,8 @@ void be_add_reload2(spill_env_t *env, ir_node *to_spill, ir_node *before,
        spill_info_t *info;
        reloader_t *rel;
 
+       assert(! arch_irn_is(env->arch_env, to_spill, dont_spill));
+
        info = get_spillinfo(env, to_spill);
 
        if (is_Phi(to_spill)) {
@@ -316,6 +321,15 @@ ir_node *be_get_end_of_block_insertion_point(const ir_node *block)
        return last;
 }
 
+static ir_node *skip_keeps_phis(ir_node *node)
+{
+       node = sched_next(node);
+       while(is_Phi(node) || be_is_Keep(node)) {
+               node = sched_next(node);
+       }
+       return node;
+}
+
 /**
  * Returns the point at which you can insert a node that should be executed
  * before block @p block when coming from pred @p pos.
@@ -369,9 +383,18 @@ void be_spill_phi(spill_env_t *env, ir_node *node)
        spill = get_spillinfo(env, node);
        for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
                ir_node *arg        = get_irn_n(node, i);
-               ir_node *pred_block = get_Block_cfgpred_block(block, i);
-               ir_node *insert     = be_get_end_of_block_insertion_point(pred_block);
+               ir_node *insert;
                //get_spillinfo(env, arg);
+
+               /* some backends have virtual noreg/unknown nodes that are not scheduled
+                * and simply always available. */
+               if(!sched_is_scheduled(arg)) {
+                       ir_node *pred_block = get_Block_cfgpred_block(block, i);
+                       insert = be_get_end_of_block_insertion_point(pred_block);
+               } else {
+                       insert = skip_keeps_phis(arg);
+               }
+
                be_add_spill(env, arg, insert);
        }
 }
@@ -385,15 +408,6 @@ void be_spill_phi(spill_env_t *env, ir_node *node)
  *                                      |_|
  */
 
-static ir_node *skip_keeps_phis(ir_node *node)
-{
-       node = sched_next(node);
-       while(is_Phi(node) || be_is_Keep(node)) {
-               node = sched_next(node);
-       }
-       return node;
-}
-
 static void determine_spill_costs(spill_env_t *env, spill_info_t *spillinfo);
 
 /**
@@ -436,7 +450,7 @@ static void spill_irn(spill_env_t *env, spill_info_t *spillinfo)
 
                spill->spill    = be_spill(env->arch_env, block, to_spill);
                sched_add_before(before, spill->spill);
-               DB((dbg, LEVEL_1, "\t%+F before %+F,", spill->spill, before));
+               DB((dbg, LEVEL_1, "\t%+F before %+F\n", spill->spill, before));
 #ifdef FIRM_STATISTICS
                env->spill_count++;
 #endif
@@ -726,6 +740,19 @@ double be_get_spill_costs(spill_env_t *env, ir_node *to_spill, ir_node *before)
        return env->spill_cost * freq;
 }
 
+unsigned be_get_reload_costs_no_weight(spill_env_t *env, const ir_node *to_spill,
+                                       const ir_node *before)
+{
+       if(be_do_remats) {
+               /* is the node rematerializable? */
+               unsigned costs = check_remat_conditions_costs(env, to_spill, before, 0);
+               if(costs < (unsigned) env->reload_cost)
+                       return costs;
+       }
+
+       return env->reload_cost;
+}
+
 double be_get_reload_costs(spill_env_t *env, ir_node *to_spill, ir_node *before)
 {
        ir_node      *block = get_nodes_block(before);
@@ -860,6 +887,8 @@ void be_insert_spills_reloads(spill_env_t *env)
        ir_nodeset_iterator_t  iter;
        ir_node               *node;
 
+       BE_TIMER_PUSH(t_ra_spill_apply);
+
        env->new_nodes_idx = get_irg_last_idx(irg);
 
        /* create all phi-ms first, this is needed so, that phis, hanging on
@@ -1030,6 +1059,8 @@ void be_insert_spills_reloads(spill_env_t *env)
        be_liveness_invalidate(env->birg->lv);
 
        be_remove_dead_nodes_from_schedule(env->birg);
+
+       BE_TIMER_POP(t_ra_spill_apply);
 }
 
 void be_init_spill(void)