remove irsimpletype stuff (unused/broken)
[libfirm] / ir / be / belistsched.c
index 4690990..4b04d64 100644 (file)
@@ -64,8 +64,6 @@
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL);
 
-#define BE_SCHED_NODE(irn) (be_is_Keep(irn) || be_is_CopyKeep(irn) || be_is_Start(irn))
-
 enum {
        BE_SCHED_SELECT_TRIVIAL,
        BE_SCHED_SELECT_REGPRESS,
@@ -82,7 +80,7 @@ enum {
        BE_SCHED_PREP_RSS  = 3
 };
 
-typedef struct _list_sched_options_t {
+typedef struct list_sched_options_t {
        int select;  /**< the node selector */
        int prep;    /**< schedule preparation */
 } list_sched_options_t;
@@ -129,7 +127,7 @@ static const lc_opt_table_entry_t list_sched_option_table[] = {
 /**
  * All scheduling info needed per node.
  */
-typedef struct _sched_irn_t {
+typedef struct sched_irn_t {
        unsigned num_not_sched_user; /**< The number of not yet scheduled users of this node */
        unsigned already_sched : 1;  /**< Set if this node is already scheduled */
 } sched_irn_t;
@@ -137,7 +135,7 @@ typedef struct _sched_irn_t {
 /**
  * Scheduling environment for the whole graph.
  */
-typedef struct _sched_env_t {
+typedef struct sched_env_t {
        sched_irn_t *sched_info;                    /**< scheduling info per node */
        const list_sched_selector_t *selector;      /**< The node selector. */
        void *selector_env;                         /**< A pointer to give to the selector. */
@@ -146,7 +144,7 @@ typedef struct _sched_env_t {
 /**
  * Environment for a block scheduler.
  */
-typedef struct _block_sched_env_t {
+typedef struct block_sched_env_t {
        sched_irn_t *sched_info;                    /**< scheduling info per node, copied from the global scheduler object */
        ir_nodeset_t cands;                         /**< the set of candidates */
        ir_node *block;                             /**< the current block */
@@ -156,24 +154,6 @@ typedef struct _block_sched_env_t {
        void *selector_block_env;
 } block_sched_env_t;
 
-/**
- * Returns non-zero if a node must be placed in the schedule.
- */
-static inline int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn)
-{
-       int res = -1;
-
-       /* if there are no uses, don't schedule */
-       if (get_irn_n_edges(irn) < 1)
-               return 0;
-
-       /* else ask the scheduler */
-       if (sel->to_appear_in_schedule)
-               res = sel->to_appear_in_schedule(block_env, irn);
-
-       return res >= 0 ? res : ((to_appear_in_schedule(irn) || BE_SCHED_NODE(irn)) && ! is_Unknown(irn));
-}
-
 /**
  * Returns non-zero if the node is already scheduled
  */
@@ -235,7 +215,7 @@ static inline int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn
                        return 0;
        }
 
-       if (! must_appear_in_schedule(env->selector, env, irn)) {
+       if (! to_appear_in_schedule(irn)) {
                add_to_sched(env, irn);
                DB((dbg, LEVEL_3, "\tmaking immediately available: %+F\n", irn));
        } else {
@@ -393,13 +373,13 @@ static void add_to_sched(block_sched_env_t *env, ir_node *irn)
 {
     /* If the node consumes/produces data, it is appended to the schedule
      * list, otherwise, it is not put into the list */
-    if (must_appear_in_schedule(env->selector, env->selector_block_env, irn)) {
+    if (to_appear_in_schedule(irn)) {
                update_sched_liveness(env, irn);
                sched_add_before(env->block, irn);
 
                DBG((dbg, LEVEL_2, "\tadding %+F\n", irn));
 
-               /* Remove the node from the ready set */
+               /* Remove the node from the ready set */
                ir_nodeset_remove(&env->cands, irn);
     }
 
@@ -459,11 +439,6 @@ static void list_sched_block(ir_node *block, void *env_ptr)
                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;
                }
 
                users = get_irn_n_edges(irn);
@@ -478,8 +453,8 @@ static void list_sched_block(ir_node *block, void *env_ptr)
 
                if (is_Phi(irn)) {
                        /*
-                               Phi functions are scheduled immediately, since they     only
-                               transfer data flow from the predecessors to this block.
+                          Phi functions are scheduled immediately, since they only
+                          transfer data flow from the predecessors to this block.
                        */
                        add_to_sched(&be, irn);
                } else if (be_is_Start(irn)) {
@@ -549,18 +524,18 @@ void list_sched(ir_graph *irg)
        int num_nodes;
        sched_env_t env;
        mris_env_t *mris = NULL;
-       list_sched_selector_t sel;
+       const list_sched_selector_t *selector;
 
        /* Select a scheduler based on backend options */
        switch (list_sched_options.select) {
-               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;
+               case BE_SCHED_SELECT_TRIVIAL:  selector = &trivial_selector;      break;
+               case BE_SCHED_SELECT_RANDOM:   selector = &random_selector;       break;
+               case BE_SCHED_SELECT_REGPRESS: selector = &reg_pressure_selector; break;
+               case BE_SCHED_SELECT_MUCHNIK:  selector = &muchnik_selector;      break;
+               case BE_SCHED_SELECT_HEUR:     selector = &heuristic_selector;    break;
+               case BE_SCHED_SELECT_NORMAL:   selector = &normal_selector;       break;
                default:
-               case BE_SCHED_SELECT_HMUCHNIK: sel = heuristic_selector;    break;
+               case BE_SCHED_SELECT_HMUCHNIK: selector = &heuristic_selector;    break;
        }
 
 #if 1
@@ -589,7 +564,7 @@ void list_sched(ir_graph *irg)
 
        /* initialize environment for list scheduler */
        memset(&env, 0, sizeof(env));
-       env.selector   = arch_env_get_list_sched_selector(be_get_irg_arch_env(irg), &sel);
+       env.selector   = selector;
        env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
 
        memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0]));
@@ -614,18 +589,18 @@ void list_sched_single_block(ir_graph *irg, ir_node *block)
 {
        int num_nodes;
        sched_env_t env;
-       list_sched_selector_t sel;
+       const list_sched_selector_t *selector;
 
        /* Select a scheduler based on backend options */
        switch (list_sched_options.select) {
-               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;
+               case BE_SCHED_SELECT_TRIVIAL:  selector = &trivial_selector;      break;
+               case BE_SCHED_SELECT_RANDOM:   selector = &random_selector;       break;
+               case BE_SCHED_SELECT_REGPRESS: selector = &reg_pressure_selector; break;
+               case BE_SCHED_SELECT_MUCHNIK:  selector = &muchnik_selector;      break;
+               case BE_SCHED_SELECT_HEUR:     selector = &heuristic_selector;    break;
+               case BE_SCHED_SELECT_NORMAL:   selector = &normal_selector;       break;
                default:
-               case BE_SCHED_SELECT_HMUCHNIK: sel = trivial_selector;      break;
+               case BE_SCHED_SELECT_HMUCHNIK: selector = &trivial_selector;      break;
        }
 
        /* Assure, that the out edges are computed */
@@ -636,7 +611,7 @@ void list_sched_single_block(ir_graph *irg, ir_node *block)
 
        /* initialize environment for list scheduler */
        memset(&env, 0, sizeof(env));
-       env.selector   = arch_env_get_list_sched_selector(be_get_irg_arch_env(irg), &sel);
+       env.selector   = selector;
        env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
 
        memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0]));