remove #ifdef HAVE_CONFIG_Hs
[libfirm] / ir / be / belistsched.c
index 21770ca..3718953 100644 (file)
@@ -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.
  *
@@ -24,9 +24,7 @@
  * @date        20.10.2004
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdarg.h>
 #include "bestat.h"
 #include "beirg_t.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL);
 
 #define BE_SCHED_NODE(irn) (be_is_Keep(irn) || be_is_CopyKeep(irn) || be_is_RegParams(irn))
 
 enum {
-       BE_SCHED_SELECT_TRIVIAL  = 0,
-       BE_SCHED_SELECT_REGPRESS = 1,
-       BE_SCHED_SELECT_MUCHNIK  = 2,
-       BE_SCHED_SELECT_HEUR     = 3,
-       BE_SCHED_SELECT_HMUCHNIK = 4,
-       BE_SCHED_SELECT_RANDOM   = 5
+       BE_SCHED_SELECT_TRIVIAL,
+       BE_SCHED_SELECT_REGPRESS,
+       BE_SCHED_SELECT_MUCHNIK,
+       BE_SCHED_SELECT_HEUR,
+       BE_SCHED_SELECT_HMUCHNIK,
+       BE_SCHED_SELECT_RANDOM,
+       BE_SCHED_SELECT_NORMAL,
 };
 
 enum {
@@ -89,15 +88,16 @@ typedef struct _list_sched_options_t {
 } list_sched_options_t;
 
 static list_sched_options_t list_sched_options = {
-       BE_SCHED_SELECT_HEUR,     /* mueller heuristic selector */
+       BE_SCHED_SELECT_NORMAL,   /* mueller heuristic selector */
        BE_SCHED_PREP_NONE,       /* no scheduling preparation */
 };
 
 /* schedule selector options. */
 static const lc_opt_enum_int_items_t sched_select_items[] = {
        { "trivial",  BE_SCHED_SELECT_TRIVIAL  },
-       { "random",   BE_SCHED_SELECT_RANDOM },
+       { "random",   BE_SCHED_SELECT_RANDOM   },
        { "regpress", BE_SCHED_SELECT_REGPRESS },
+       { "normal",   BE_SCHED_SELECT_NORMAL   },
        { "muchnik",  BE_SCHED_SELECT_MUCHNIK  },
        { "heur",     BE_SCHED_SELECT_HEUR     },
        { "hmuchnik", BE_SCHED_SELECT_HMUCHNIK },
@@ -227,7 +227,7 @@ static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn
 
                /* if irn is an End we have keep-alives and op might be a block, skip that */
                if (is_Block(op)) {
-                       assert(get_irn_op(irn) == op_End);
+                       assert(is_End(irn));
                        continue;
                }
 
@@ -450,14 +450,29 @@ static void list_sched_block(ir_node *block, void *env_ptr)
 
        /* Then one can add all nodes are ready to the set. */
        foreach_out_edge(block, edge) {
-               ir_node *irn = get_edge_src_irn(edge);
+               ir_node   *irn = get_edge_src_irn(edge);
+               ir_opcode code = get_irn_opcode(irn);
+               int users;
 
-               /* Skip the end node because of keepalive edges. */
-               if (get_irn_opcode(irn) == iro_End)
+               if (code == iro_End) {
+                       /* Skip the end node because of keep-alive edges. */
+                       continue;
+               } else if (code == iro_Block) {
+                       /* A Block-Block edge. This should be the MacroBlock
+                        * edge, ignore it. */
+                       assert(get_Block_MacroBlock(irn) == block && "Block-Block edge found");
                        continue;
+               }
 
-               if (get_irn_n_edges(irn) == 0)
+               users = get_irn_n_edges(irn);
+               if (users == 0)
                        continue;
+               else if (users == 1) { /* ignore nodes that are only hold by the anchor */
+                       const ir_edge_t *edge = get_irn_out_edge_first_kind(irn, EDGE_KIND_NORMAL);
+                       ir_node *user = get_edge_src_irn(edge);
+                       if (is_Anchor(user))
+                               continue;
+               }
 
                if (is_Phi(irn)) {
                        /*
@@ -469,13 +484,10 @@ static void list_sched_block(ir_node *block, void *env_ptr)
                else if (irn == start_node) {
                        /* The start block will be scheduled as the first node */
                        add_to_sched(&be, irn);
-#ifdef SCHEDULE_PROJS
-                       add_tuple_projs(&be, irn);
-#endif
                }
                else {
                        /* Other nodes must have all operands in other blocks to be made
-                       * ready */
+                        * ready */
                        int ready = 1;
 
                        /* Check, if the operands of a node are not local to this block */
@@ -502,8 +514,6 @@ static void list_sched_block(ir_node *block, void *env_ptr)
        /* Iterate over all remaining nodes */
        while (ir_nodeset_size(&be.cands) > 0) {
                ir_nodeset_iterator_t iter;
-               /* collect statistics about amount of ready nodes */
-               be_do_stat_sched_ready(block, &be.cands);
 
                /* Keeps must be scheduled immediately */
                foreach_ir_nodeset(&be.cands, irn, iter) {
@@ -548,24 +558,14 @@ void list_sched(be_irg_t *birg, be_options_t *be_opts)
 
        /* Select a scheduler based on backend options */
        switch (list_sched_options.select) {
-               case BE_SCHED_SELECT_TRIVIAL:
-                       memcpy(&sel, trivial_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_RANDOM:
-                       memcpy(&sel, random_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_REGPRESS:
-                       memcpy(&sel, reg_pressure_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_MUCHNIK:
-                       memcpy(&sel, muchnik_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_HEUR:
-                       memcpy(&sel, heuristic_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_HMUCHNIK:
+               case BE_SCHED_SELECT_TRIVIAL:  sel = trivial_selector;      break;
+               case BE_SCHED_SELECT_RANDOM:   sel = random_selector;       break;
+               case BE_SCHED_SELECT_REGPRESS: sel = reg_pressure_selector; break;
+               case BE_SCHED_SELECT_MUCHNIK:  sel = muchnik_selector;      break;
+               case BE_SCHED_SELECT_HEUR:     sel = heuristic_selector;    break;
+               case BE_SCHED_SELECT_NORMAL:   sel = normal_selector;       break;
                default:
-                       memcpy(&sel, trivial_selector, sizeof(sel));
+               case BE_SCHED_SELECT_HMUCHNIK: sel = trivial_selector;      break;
        }
 
 #if 1
@@ -594,7 +594,7 @@ void list_sched(be_irg_t *birg, be_options_t *be_opts)
 
        /* initialize environment for list scheduler */
        memset(&env, 0, sizeof(env));
-       env.selector   = arch_env->isa->impl->get_list_sched_selector(arch_env->isa, &sel);
+       env.selector   = arch_env_get_list_sched_selector(arch_env, &sel);
        env.arch_env   = arch_env;
        env.irg        = irg;
        env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
@@ -602,7 +602,7 @@ void list_sched(be_irg_t *birg, be_options_t *be_opts)
        memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0]));
 
        if (env.selector->init_graph)
-               env.selector_env = env.selector->init_graph(env.selector, arch_env, irg);
+               env.selector_env = env.selector->init_graph(env.selector, birg);
 
        /* Schedule each single block. */
        irg_block_walk_graph(irg, list_sched_block, NULL, &env);
@@ -631,24 +631,14 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block,
 
        /* Select a scheduler based on backend options */
        switch (list_sched_options.select) {
-               case BE_SCHED_SELECT_TRIVIAL:
-                       memcpy(&sel, trivial_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_RANDOM:
-                       memcpy(&sel, random_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_REGPRESS:
-                       memcpy(&sel, reg_pressure_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_MUCHNIK:
-                       memcpy(&sel, muchnik_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_HEUR:
-                       memcpy(&sel, heuristic_selector, sizeof(sel));
-                       break;
-               case BE_SCHED_SELECT_HMUCHNIK:
+               case BE_SCHED_SELECT_TRIVIAL:  sel = trivial_selector;      break;
+               case BE_SCHED_SELECT_RANDOM:   sel = random_selector;       break;
+               case BE_SCHED_SELECT_REGPRESS: sel = reg_pressure_selector; break;
+               case BE_SCHED_SELECT_MUCHNIK:  sel = muchnik_selector;      break;
+               case BE_SCHED_SELECT_HEUR:     sel = heuristic_selector;    break;
+               case BE_SCHED_SELECT_NORMAL:   sel = normal_selector;       break;
                default:
-                       memcpy(&sel, trivial_selector, sizeof(sel));
+               case BE_SCHED_SELECT_HMUCHNIK: sel = trivial_selector;      break;
        }
 
        /* Assure, that the out edges are computed */
@@ -659,7 +649,7 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block,
 
        /* initialize environment for list scheduler */
        memset(&env, 0, sizeof(env));
-       env.selector   = arch_env->isa->impl->get_list_sched_selector(arch_env->isa, &sel);
+       env.selector   = arch_env_get_list_sched_selector(arch_env, &sel);
        env.arch_env   = arch_env;
        env.irg        = irg;
        env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
@@ -667,7 +657,7 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block,
        memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0]));
 
        if (env.selector->init_graph)
-               env.selector_env = env.selector->init_graph(env.selector, arch_env, irg);
+               env.selector_env = env.selector->init_graph(env.selector, birg);
 
        /* Schedule block. */
        list_sched_block(block, &env);