fix bad input register requirements
[libfirm] / ir / be / bechordal_main.c
index 07377fd..7850266 100644 (file)
@@ -22,7 +22,6 @@
  * @brief       Driver for the chordal register allocator.
  * @author      Sebastian Hack
  * @date        29.11.2005
- * @version     $Id$
  */
 #include "config.h"
 
@@ -33,7 +32,6 @@
 #include "pset.h"
 #include "list.h"
 #include "bitset.h"
-#include "iterator.h"
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
@@ -47,9 +45,9 @@
 #include "irdump.h"
 #include "irdom.h"
 #include "ircons.h"
-#include "irbitset.h"
 #include "irnode.h"
 #include "ircons.h"
+#include "irtools.h"
 #include "debug.h"
 #include "execfreq.h"
 #include "iredges_t.h"
 #include "bearch.h"
 #include "beifg.h"
 #include "benode.h"
-#include "bestatevent.h"
+#include "statev_t.h"
 #include "bestat.h"
 #include "bemodule.h"
 #include "be_t.h"
 #include "bera.h"
 #include "beirg.h"
-#include "bedump_minir.h"
+#include "bestack.h"
 
 #include "bespillslots.h"
 #include "bespill.h"
@@ -105,11 +103,7 @@ static const lc_opt_enum_int_items_t lower_perm_items[] = {
        { NULL, 0 }
 };
 
-static const lc_opt_enum_int_items_t lower_perm_stat_items[] = {
-       { NULL, 0 }
-};
-
-static const lc_opt_enum_int_items_t dump_items[] = {
+static const lc_opt_enum_mask_items_t dump_items[] = {
        { "none",       BE_CH_DUMP_NONE       },
        { "spill",      BE_CH_DUMP_SPILL      },
        { "live",       BE_CH_DUMP_LIVE       },
@@ -117,6 +111,7 @@ static const lc_opt_enum_int_items_t dump_items[] = {
        { "copymin",    BE_CH_DUMP_COPYMIN    },
        { "ssadestr",   BE_CH_DUMP_SSADESTR   },
        { "tree",       BE_CH_DUMP_TREE_INTV  },
+       { "split",      BE_CH_DUMP_SPLIT      },
        { "constr",     BE_CH_DUMP_CONSTR     },
        { "lower",      BE_CH_DUMP_LOWER      },
        { "spillslots", BE_CH_DUMP_SPILLSLOTS },
@@ -136,7 +131,7 @@ static lc_opt_enum_int_var_t lower_perm_var = {
        &options.lower_perm_opt, lower_perm_items
 };
 
-static lc_opt_enum_int_var_t dump_var = {
+static lc_opt_enum_mask_var_t dump_var = {
        &options.dump_flags, dump_items
 };
 
@@ -144,13 +139,10 @@ static lc_opt_enum_int_var_t be_ch_vrfy_var = {
        &options.vrfy_option, be_ch_vrfy_items
 };
 
-static char minir_file[256] = "";
-
 static const lc_opt_table_entry_t be_chordal_options[] = {
-       LC_OPT_ENT_ENUM_PTR ("perm",          "perm lowering options", &lower_perm_var),
+       LC_OPT_ENT_ENUM_INT ("perm",          "perm lowering options", &lower_perm_var),
        LC_OPT_ENT_ENUM_MASK("dump",          "select dump phases", &dump_var),
-       LC_OPT_ENT_ENUM_PTR ("verify",        "verify options", &be_ch_vrfy_var),
-       LC_OPT_ENT_STR      ("minirout",      "dump MinIR to file", minir_file, sizeof(minir_file)),
+       LC_OPT_ENT_ENUM_INT ("verify",        "verify options", &be_ch_vrfy_var),
        LC_OPT_LAST
 };
 
@@ -167,10 +159,7 @@ void be_register_chordal_coloring(const char *name, be_ra_chordal_coloring_t *co
 
 static void be_ra_chordal_coloring(be_chordal_env_t *env)
 {
-       assert(selected_coloring != NULL);
-       if (selected_coloring != NULL) {
-               selected_coloring->allocate(env);
-       }
+       selected_coloring->allocate(env);
 }
 
 static void dump(unsigned mask, ir_graph *irg,
@@ -189,13 +178,14 @@ static void dump(unsigned mask, ir_graph *irg,
 }
 
 /**
- * Checks for every reload if its user can perform the load on itself.
+ * Post-Walker: Checks for the given reload if has only one user that can perform the
+ * reload as part of its address mode.
+ * Fold the reload into the user it that is possible.
  */
 static void memory_operand_walker(ir_node *irn, void *env)
 {
-       const ir_edge_t  *edge, *ne;
-       ir_node          *block;
-       ir_node          *spill;
+       ir_node *block;
+       ir_node *spill;
 
        (void)env;
 
@@ -209,7 +199,7 @@ static void memory_operand_walker(ir_node *irn, void *env)
        spill = be_get_Reload_mem(irn);
        block = get_nodes_block(irn);
 
-       foreach_out_edge_safe(irn, edge, ne) {
+       foreach_out_edge_safe(irn, edge) {
                ir_node *src = get_edge_src_irn(edge);
                int     pos  = get_edge_src_pos(edge);
 
@@ -220,11 +210,13 @@ static void memory_operand_walker(ir_node *irn, void *env)
                }
        }
 
-       /* kill the Reload */
+       /* kill the Reload if it was folded */
        if (get_irn_n_edges(irn) == 0) {
+               ir_graph *irg = get_irn_irg(irn);
+               ir_mode  *frame_mode = get_irn_mode(get_irn_n(irn, n_be_Reload_frame));
                sched_remove(irn);
-               set_irn_n(irn, be_pos_Reload_mem, new_Bad());
-               set_irn_n(irn, be_pos_Reload_frame, new_Bad());
+               set_irn_n(irn, n_be_Reload_mem, new_r_Bad(irg, mode_X));
+               set_irn_n(irn, n_be_Reload_frame, new_r_Bad(irg, frame_mode));
        }
 }
 
@@ -246,20 +238,20 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
 {
        be_chordal_env_t *chordal_env = &pse->cenv;
        ir_graph         *irg         = pse->irg;
-       ir_exec_freq     *exec_freq   = be_get_irg_exec_freq(irg);
 
-       pse->cls                   = cls;
-       chordal_env->cls           = cls;
-       chordal_env->border_heads  = pmap_create();
-       chordal_env->ignore_colors = bitset_malloc(chordal_env->cls->n_regs);
+       pse->cls                      = cls;
+       chordal_env->cls              = cls;
+       chordal_env->border_heads     = pmap_create();
+       chordal_env->allocatable_regs = bitset_malloc(chordal_env->cls->n_regs);
 
-       be_assure_liveness(irg);
-       be_liveness_assure_chk(be_get_irg_liveness(irg));
+       be_assure_live_chk(irg);
 
-       stat_ev_do(pse->pre_spill_cost = be_estimate_irg_costs(irg, exec_freq));
+       if (stat_ev_enabled) {
+               pse->pre_spill_cost = be_estimate_irg_costs(irg);
+       }
 
        /* put all ignore registers into the ignore register set. */
-       be_put_ignore_regs(irg, pse->cls, chordal_env->ignore_colors);
+       be_put_allocatable_regs(irg, pse->cls, chordal_env->allocatable_regs);
 
        be_timer_push(T_RA_CONSTR);
        be_pre_spill_prepare_constr(irg, chordal_env->cls);
@@ -273,16 +265,13 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
  */
 static void post_spill(post_spill_env_t *pse, int iteration)
 {
-       be_chordal_env_t    *chordal_env = &pse->cenv;
-       ir_graph            *irg         = pse->irg;
-       ir_exec_freq        *exec_freq   = be_get_irg_exec_freq(irg);
-       int                  colors_n    = arch_register_class_n_regs(chordal_env->cls);
-       int             allocatable_regs
-               = colors_n - be_put_ignore_regs(irg, chordal_env->cls, NULL);
+       be_chordal_env_t *chordal_env = &pse->cenv;
+       ir_graph         *irg         = pse->irg;
+       int               allocatable_regs = be_get_n_allocatable_regs(irg, chordal_env->cls);
 
        /* some special classes contain only ignore regs, no work to be done */
        if (allocatable_regs > 0) {
-               stat_ev_dbl("bechordal_spillcosts", be_estimate_irg_costs(irg, exec_freq) - pse->pre_spill_cost);
+               stat_ev_dbl("bechordal_spillcosts", be_estimate_irg_costs(irg) - pse->pre_spill_cost);
 
                /*
                        If we have a backend provided spiller, post spill is
@@ -321,7 +310,7 @@ static void post_spill(post_spill_env_t *pse, int iteration)
                chordal_env->ifg = be_create_ifg(chordal_env);
                be_timer_pop(T_RA_IFG);
 
-               stat_ev_if {
+               if (stat_ev_enabled) {
                        be_ifg_stat_t   stat;
                        be_node_stats_t node_stats;
 
@@ -340,22 +329,6 @@ static void post_spill(post_spill_env_t *pse, int iteration)
                }
 
                be_timer_push(T_RA_COPYMIN);
-               if (minir_file[0] != '\0') {
-                       FILE *out;
-
-                       if (strcmp(minir_file, "-") == 0) {
-                               out = stdout;
-                       } else {
-                               out = fopen(minir_file, "w");
-                               if (out == NULL) {
-                                       panic("Cound't open minir output '%s'", minir_file);
-                               }
-                       }
-
-                       be_export_minir(out, irg);
-                       if (out != stdout)
-                               fclose(out);
-               }
                co_driver(chordal_env);
                be_timer_pop(T_RA_COPYMIN);
 
@@ -380,7 +353,7 @@ static void post_spill(post_spill_env_t *pse, int iteration)
 
        /* free some always allocated data structures */
        pmap_destroy(chordal_env->border_heads);
-       bitset_free(chordal_env->ignore_colors);
+       bitset_free(chordal_env->allocatable_regs);
 }
 
 /**
@@ -402,86 +375,59 @@ static void be_ra_chordal_main(ir_graph *irg)
 
        be_timer_push(T_RA_PROLOG);
 
-       be_assure_liveness(irg);
-
-       chordal_env.obst          = &obst;
-       chordal_env.opts          = &options;
-       chordal_env.irg           = irg;
-       chordal_env.border_heads  = NULL;
-       chordal_env.ifg           = NULL;
-       chordal_env.ignore_colors = NULL;
+       chordal_env.obst             = &obst;
+       chordal_env.opts             = &options;
+       chordal_env.irg              = irg;
+       chordal_env.border_heads     = NULL;
+       chordal_env.ifg              = NULL;
+       chordal_env.allocatable_regs = NULL;
 
        obstack_init(&obst);
 
        be_timer_pop(T_RA_PROLOG);
 
-       stat_ev_if {
+       if (stat_ev_enabled) {
                be_collect_node_stats(&last_node_stats, irg);
        }
 
-       if (! arch_code_generator_has_spiller(be_get_irg_cg(irg))) {
-               /* use one of the generic spiller */
-
-               /* Perform the following for each register class. */
-               for (j = 0, m = arch_env_get_n_reg_class(arch_env); j < m; ++j) {
-                       post_spill_env_t pse;
-                       const arch_register_class_t *cls
-                               = arch_env_get_reg_class(arch_env, j);
-
-                       if (arch_register_class_flags(cls) & arch_register_class_flag_manual_ra)
-                               continue;
-
+       /* use one of the generic spiller */
 
-                       stat_ev_ctx_push_str("bechordal_cls", cls->name);
+       /* Perform the following for each register class. */
+       for (j = 0, m = arch_env->n_register_classes; j < m; ++j) {
+               post_spill_env_t pse;
+               const arch_register_class_t *cls = &arch_env->register_classes[j];
 
-                       stat_ev_if {
-                               be_do_stat_reg_pressure(irg, cls);
-                       }
+               if (arch_register_class_flags(cls) & arch_register_class_flag_manual_ra)
+                       continue;
 
-                       memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env));
-                       pse.irg = irg;
-                       pre_spill(&pse, cls);
 
-                       be_timer_push(T_RA_SPILL);
-                       be_do_spill(irg, cls);
-                       be_timer_pop(T_RA_SPILL);
+               stat_ev_ctx_push_str("bechordal_cls", cls->name);
 
-                       dump(BE_CH_DUMP_SPILL, irg, pse.cls, "spill");
-
-                       post_spill(&pse, 0);
-
-                       stat_ev_if {
-                               be_node_stats_t node_stats;
+               if (stat_ev_enabled) {
+                       be_do_stat_reg_pressure(irg, cls);
+               }
 
-                               be_collect_node_stats(&node_stats, irg);
-                               be_subtract_node_stats(&node_stats, &last_node_stats);
-                               be_emit_node_stats(&node_stats, "bechordal_");
+               pse.cenv = chordal_env;
+               pse.irg = irg;
+               pre_spill(&pse, cls);
 
-                               be_copy_node_stats(&last_node_stats, &node_stats);
-                               stat_ev_ctx_pop("bechordal_cls");
-                       }
-               }
-       } else {
-               post_spill_env_t *pse;
+               be_timer_push(T_RA_SPILL);
+               be_do_spill(irg, cls);
+               be_timer_pop(T_RA_SPILL);
 
-               /* the backend has its own spiller */
-               m = arch_env_get_n_reg_class(arch_env);
+               dump(BE_CH_DUMP_SPILL, irg, pse.cls, "spill");
 
-               pse = ALLOCAN(post_spill_env_t, m);
+               post_spill(&pse, 0);
 
-               for (j = 0; j < m; ++j) {
-                       memcpy(&pse[j].cenv, &chordal_env, sizeof(chordal_env));
-                       pse[j].irg = irg;
-                       pre_spill(&pse[j], pse[j].cls);
-               }
+               if (stat_ev_enabled) {
+                       be_node_stats_t node_stats;
 
-               be_timer_push(T_RA_SPILL);
-               arch_code_generator_spill(be_get_irg_cg(irg), irg);
-               be_timer_pop(T_RA_SPILL);
-               dump(BE_CH_DUMP_SPILL, irg, NULL, "spill");
+                       be_collect_node_stats(&node_stats, irg);
+                       be_subtract_node_stats(&node_stats, &last_node_stats);
+                       be_emit_node_stats(&node_stats, "bechordal_");
 
-               for (j = 0; j < m; ++j) {
-                       post_spill(&pse[j], j);
+                       be_copy_node_stats(&last_node_stats, &node_stats);
+                       stat_ev_ctx_pop("bechordal_cls");
                }
        }
 
@@ -495,18 +441,17 @@ static void be_ra_chordal_main(ir_graph *irg)
        be_timer_pop(T_VERIFY);
 
        be_timer_push(T_RA_EPILOG);
-       lower_nodes_after_ra(irg,
-                            options.lower_perm_opt&BE_CH_LOWER_PERM_COPY ? 1 : 0);
+       lower_nodes_after_ra(irg, options.lower_perm_opt == BE_CH_LOWER_PERM_COPY);
        dump(BE_CH_DUMP_LOWER, irg, NULL, "belower-after-ra");
 
        obstack_free(&obst, NULL);
-       be_liveness_invalidate(be_get_irg_liveness(irg));
+       be_invalidate_live_sets(irg);
        be_timer_pop(T_RA_EPILOG);
 
        be_timer_pop(T_RA_OTHER);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main)
 void be_init_chordal_main(void)
 {
        static be_ra_t be_ra_chordal_allocator = {
@@ -520,5 +465,5 @@ void be_init_chordal_main(void)
        be_register_allocator("chordal", &be_ra_chordal_allocator);
 
        lc_opt_add_table(chordal_grp, be_chordal_options);
-       be_add_module_list_opt(chordal_grp, "coloring", "select coloring methode", &colorings, (void**) &selected_coloring);
+       be_add_module_list_opt(chordal_grp, "coloring", "select coloring method", &colorings, (void**) &selected_coloring);
 }