- make belady handle dont_spill nodes correctly again (was broken in my last commit)

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 66c1504..7640de5 100644 (file)
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -544,6 +544,10 @@ void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before) {
 
        assert(arch_irn_consider_in_reg_alloc(env->chordal_env->birg->main_env->arch_env, env->cls, to_spill));
 
+       if(is_Phi(to_spill)) {
+               be_spill_phi(env, to_spill);
+       }
+
        templ.spilled_node = to_spill;
        templ.reloaders    = NULL;
        res = set_insert(env->spills, &templ, sizeof(templ), HASH_PTR(to_spill));

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 0eaae3b..9536ea1 100644 (file)
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -206,14 +206,17 @@ static INLINE void *new_block_info(struct obstack *ob) {
 #define set_block_info(blk, info)      set_irn_link(blk, info)
 
 /**
- * @return The distance to the next use
- *         Or 0 if irn is an ignore node
+ * @return The distance to the next use or 0 if irn has dont_spill flag set
  */
-static INLINE unsigned get_distance(belady_env_t *bel, const ir_node *from, unsigned from_step, const ir_node *def, int skip_from_uses)
+static INLINE unsigned get_distance(belady_env_t *env, const ir_node *from, unsigned from_step, const ir_node *def, int skip_from_uses)
 {
-       unsigned dist = be_get_next_use(bel->uses, from, from_step, def, skip_from_uses);
+       int flags = arch_irn_get_flags(env->arch, def);
+       unsigned dist = be_get_next_use(env->uses, from, from_step, def, skip_from_uses);
 
-       assert(! (arch_irn_get_flags(bel->arch, def) & (arch_irn_flags_ignore | arch_irn_flags_dont_spill)));
+       assert(! (flags & arch_irn_flags_ignore));
+       // we have to keep nonspillable nodes in the workingset
+       if(flags & arch_irn_flags_dont_spill)
+               return 0;
 
        return dist;
 }
@@ -389,7 +392,7 @@ static block_info_t *compute_block_start_info(ir_node *blk, void *data) {
                if (!is_Phi(irn) || get_nodes_block(irn) != blk)
                        continue;
 
-               be_spill_phi(env->senv, irn);
+               //be_spill_phi(env->senv, irn);
        }
 
        obstack_free(&ob, NULL);

diff --git a/ir/be/bespillmorgan.c b/ir/be/bespillmorgan.c
index 86c0342..81422f6 100644 (file)
--- a/ir/be/bespillmorgan.c
+++ b/ir/be/bespillmorgan.c
@@ -11,19 +11,14 @@
 
 #include "bespillmorgan.h"
 
-#include "bechordal.h"
 #include "bechordal_t.h"
 #include "bespill.h"
-#include "belive.h"
 #include "belive_t.h"
 #include "irgwalk.h"
 #include "besched.h"
 #include "beutil.h"
-#include "irloop.h"
 #include "irloop_t.h"
-#include "irgraph.h"
 #include "irgraph_t.h"
-#include "irphase.h"
 #include "irphase_t.h"
 #include "irprintf.h"
 
@@ -136,6 +131,13 @@ static INLINE block_attr_t *get_block_attr(morgan_env_t *env, ir_node *block) {
 
 //---------------------------------------------------------------------------
 
+static INLINE int consider_for_spilling(const arch_env_t *env, const arch_register_class_t *cls, const ir_node *node) {
+       if(!arch_irn_has_reg_class(env, node, -1, cls))
+               return 0;
+
+       return !(arch_irn_get_flags(env, node) & (arch_irn_flags_ignore | arch_irn_flags_dont_spill));
+}
+
 /**
  * Determine edges going out of a loop (= edges that go to a block that is not inside
  * the loop or one of its subloops)
@@ -196,7 +198,7 @@ static bitset_t *construct_block_livethrough_unused(morgan_env_t* env, ir_node*
 
                if(!live_is_in(li) || !live_is_out(li))
                        continue;
-               if(!arch_irn_consider_in_reg_alloc(env->arch, env->cls, li->irn))
+               if(!consider_for_spilling(env->arch, env->cls, li->irn))
                        continue;
 
                node_idx = get_irn_idx(li->irn);
@@ -364,9 +366,6 @@ static int reduce_register_pressure_in_block(morgan_env_t *env, ir_node* block,
                        to_spill = get_idx_irn(env->irg, i);
                        foreach_block_succ(block, edge) {
                                DBG((dbg, DBG_PRESSURE, "Spilling node %+F around block %+F\n", to_spill, block));
-                               if(is_Phi(to_spill)) {
-                                       be_spill_phi(env->senv, to_spill);
-                               }
                                be_add_reload_on_edge(env->senv, to_spill, edge->src, edge->pos);
                        }
                }
@@ -430,10 +429,6 @@ static int reduce_register_pressure_in_loop(morgan_env_t *env, ir_loop *loop, in
                        ir_node *to_spill = get_idx_irn(env->irg, i);
 
                        for(edge = set_first(loop_attr->out_edges); edge != NULL; edge = set_next(loop_attr->out_edges)) {
-                               if(is_Phi(to_spill)) {
-                                       be_spill_phi(env->senv, to_spill);
-                               }
-
                                be_add_reload_on_edge(env->senv, to_spill, edge->block, edge->pos);
                        }
                }