Remove redundant assert.

[libfirm] / ir / be / beschedregpress.c

diff --git a/ir/be/beschedregpress.c b/ir/be/beschedregpress.c
index a1bfeed..f2767af 100644 (file)
--- a/ir/be/beschedregpress.c
+++ b/ir/be/beschedregpress.c
@@ -22,7 +22,6 @@
  * @brief       Register pressure node selector.
  * @author      Sebastian Hack
  * @date        29.08.2006
- * @version     $Id$
  */
 #include "config.h"
 
@@ -31,6 +30,7 @@
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irtools.h"
+#include "util.h"
 
 #include "besched.h"
 #include "belistsched.h"
@@ -152,8 +152,6 @@ static int compute_max_hops(reg_pressure_selector_env_t *env, ir_node *irn)
        ir_graph *irg = get_irn_irg(bl);
        int res       = 0;
 
-       const ir_edge_t *edge;
-
        foreach_out_edge(irn, edge) {
                ir_node *user       = get_edge_src_irn(edge);
                unsigned visited_nr = get_irg_visited(irg) + 1;
@@ -176,7 +174,6 @@ static void *reg_pressure_graph_init(ir_graph *irg)
 
 static void *reg_pressure_block_init(void *graph_env, ir_node *bl)
 {
-       ir_node *irn;
        reg_pressure_selector_env_t *env = XMALLOC(reg_pressure_selector_env_t);
        (void) graph_env;
 
@@ -188,21 +185,19 @@ static void *reg_pressure_block_init(void *graph_env, ir_node *bl)
        * Collect usage statistics.
        */
        sched_foreach(bl, irn) {
-               if (to_appear_in_schedule(irn)) {
-                       int i, n;
+               int i, n;
+               if (is_Proj(irn)
+                               || (arch_get_irn_flags(irn) & arch_irn_flags_not_scheduled))
+                       continue;
 
-                       for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
-                               //ir_node *op = get_irn_n(irn, i);
-                               if (to_appear_in_schedule(irn)) {
-                                       usage_stats_t *us = get_or_set_usage_stats(env, irn);
+               for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
+                       usage_stats_t *us = get_or_set_usage_stats(env, irn);
 #if 0 /* Liveness is not computed here! */
-                                       if (is_live_end(bl, op))
-                                               us->uses_in_block = 99999;
-                                       else
+                       if (is_live_end(bl, op))
+                               us->uses_in_block = 99999;
+                       else
 #endif
-                                               us->uses_in_block++;
-                               }
-                       }
+                               us->uses_in_block++;
                }
        }
 
@@ -226,8 +221,6 @@ static int get_result_hops_sum(reg_pressure_selector_env_t *env, ir_node *irn)
 {
        int res = 0;
        if (get_irn_mode(irn) == mode_T) {
-               const ir_edge_t *edge;
-
                foreach_out_edge(irn, edge)
                        res += get_result_hops_sum(env, get_edge_src_irn(edge));
        }
@@ -247,8 +240,11 @@ static inline int reg_pr_costs(reg_pressure_selector_env_t *env, ir_node *irn)
        for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
                ir_node *op = get_irn_n(irn, i);
 
-               if (to_appear_in_schedule(op))
-                       sum += compute_max_hops(env, op);
+               if (is_Proj(op)
+                   || (arch_get_irn_flags(op) & arch_irn_flags_not_scheduled))
+                       continue;
+
+               sum += compute_max_hops(env, op);
        }
 
        sum += get_result_hops_sum(env, irn);
@@ -256,19 +252,15 @@ static inline int reg_pr_costs(reg_pressure_selector_env_t *env, ir_node *irn)
        return sum;
 }
 
-static ir_node *reg_pressure_select(void *block_env, ir_nodeset_t *ready_set,
-                                    ir_nodeset_t *live_set)
+static ir_node *reg_pressure_select(void *block_env, ir_nodeset_t *ready_set)
 {
-       ir_nodeset_iterator_t iter;
        reg_pressure_selector_env_t *env = (reg_pressure_selector_env_t*)block_env;
-       ir_node *irn, *res     = NULL;
-       int curr_cost          = INT_MAX;
-       (void) live_set;
+       ir_node *res       = NULL;
+       int      curr_cost = INT_MAX;
 
        assert(ir_nodeset_size(ready_set) > 0);
 
-       ir_nodeset_iterator_init(&iter, ready_set);
-       while ( (irn = ir_nodeset_iterator_next(&iter)) != NULL) {
+       foreach_ir_nodeset(ready_set, irn, iter) {
                /*
                Ignore branch instructions for the time being.
                They should only be scheduled if there is nothing else.
@@ -288,9 +280,7 @@ static ir_node *reg_pressure_select(void *block_env, ir_nodeset_t *ready_set,
        */
 
        if (!res) {
-               ir_nodeset_iterator_init(&iter, ready_set);
-               res = ir_nodeset_iterator_next(&iter);
-
+               res = ir_nodeset_first(ready_set);
                assert(res && "There must be a node scheduled.");
        }
 
@@ -312,7 +302,7 @@ static void sched_reg_pressure(ir_graph *irg)
        be_list_sched_graph(irg, &reg_pressure_selector);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched_regpress);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched_regpress)
 void be_init_sched_regpress(void)
 {
        be_register_scheduler("regpress", sched_reg_pressure);