remove Load when using Cmp source AM

[libfirm] / ir / be / belistsched.c

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 5edf3a4..2255336 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -69,12 +69,13 @@ 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 {
@@ -96,8 +97,9 @@ static list_sched_options_t list_sched_options = {
 /* 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 },
@@ -410,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.
  *
@@ -564,11 +524,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);
        }
@@ -595,24 +550,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
@@ -649,7 +594,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);
@@ -678,24 +623,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 */
@@ -714,7 +649,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);