reduce code size
[libfirm] / ir / be / belistsched.c
index 890248a..5252a61 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.
  *
 #include "bestat.h"
 #include "beirg_t.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 {
@@ -90,16 +94,12 @@ static list_sched_options_t list_sched_options = {
        BE_SCHED_PREP_NONE,       /* no scheduling preparation */
 };
 
-
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
-
 /* 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 },
@@ -127,7 +127,6 @@ static const lc_opt_table_entry_t list_sched_option_table[] = {
        LC_OPT_ENT_ENUM_PTR("select", "node selector",          &sched_select_var),
        LC_OPT_LAST
 };
-#endif /* WITH_LIBCORE */
 
 /**
  * All scheduling info needed per node.
@@ -413,48 +412,6 @@ static void add_to_sched(block_sched_env_t *env, ir_node *irn)
        make_users_ready(env, irn);
 }
 
-#ifdef SCHEDULE_PROJS
-/**
- * Add the proj nodes of a tuple-mode irn to the schedule immediately
- * after the tuple-moded irn. By pinning the projs after the irn, no
- * other nodes can create a new lifetime between the tuple-moded irn and
- * one of its projs. This should render a realistic image of a
- * tuple-moded irn, which in fact models a node which defines multiple
- * values.
- *
- * @param irn The tuple-moded irn.
- */
-static void add_tuple_projs(block_sched_env_t *env, ir_node *irn)
-{
-       const ir_edge_t *edge;
-
-       assert(get_irn_mode(irn) == mode_T && "Mode of node must be tuple");
-
-       if (is_Bad(irn))
-               return;
-
-
-       /* non-proj nodes can have dependency edges to tuple nodes. */
-       foreach_out_edge_kind(irn, edge, EDGE_KIND_DEP) {
-               ir_node *out = get_edge_src_irn(edge);
-               make_ready(env, irn, out);
-       }
-
-       /* schedule the normal projs */
-       foreach_out_edge(irn, edge) {
-               ir_node *out = get_edge_src_irn(edge);
-
-               assert(is_Proj(out) && "successor of a modeT node must be a proj");
-
-               if (get_irn_mode(out) == mode_T) {
-                       add_tuple_projs(env, out);
-               } else {
-                       add_to_sched(env, out);
-               }
-       }
-}
-#endif
-
 /**
  * Perform list scheduling on a block.
  *
@@ -495,14 +452,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)) {
                        /*
@@ -520,7 +492,7 @@ static void list_sched_block(ir_node *block, void *env_ptr)
                }
                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 */
@@ -567,11 +539,6 @@ static void list_sched_block(ir_node *block, void *env_ptr)
                /* Add the node to the schedule. */
                add_to_sched(&be, irn);
 
-#ifdef SCHEDULE_PROJS
-               if (get_irn_mode(irn) == mode_T)
-                       add_tuple_projs(&be, irn);
-#endif
-
                /* remove the scheduled node from the ready list. */
                ir_nodeset_remove(&be.cands, irn);
        }
@@ -586,7 +553,7 @@ static void list_sched_block(ir_node *block, void *env_ptr)
 /* List schedule a graph. */
 void list_sched(be_irg_t *birg, be_options_t *be_opts)
 {
-       const arch_env_t *arch_env = birg->main_env->arch_env;
+       const arch_env_t *arch_env = &birg->main_env->arch_env;
        ir_graph         *irg      = birg->irg;
 
        int num_nodes;
@@ -598,24 +565,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
@@ -652,7 +609,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);
@@ -670,7 +627,7 @@ void list_sched(be_irg_t *birg, be_options_t *be_opts)
 void list_sched_single_block(const be_irg_t *birg, ir_node *block,
                              be_options_t *be_opts)
 {
-       const arch_env_t *arch_env = birg->main_env->arch_env;
+       const arch_env_t *arch_env = &birg->main_env->arch_env;
        ir_graph         *irg      = birg->irg;
 
        int num_nodes;
@@ -681,24 +638,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 */
@@ -717,7 +664,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);
@@ -732,12 +679,11 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block,
  * Register list scheduler options.
  */
 void be_init_listsched(void) {
-#ifdef WITH_LIBCORE
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        lc_opt_entry_t *sched_grp = lc_opt_get_grp(be_grp, "listsched");
 
        lc_opt_add_table(sched_grp, list_sched_option_table);
-#endif
+
        FIRM_DBG_REGISTER(dbg, "firm.be.sched");
 }