Remove the unused attribute const arch_env_t *arch_env from struct phi_handler and...
[libfirm] / ir / be / bemain.c
index 01b1905..cbca78d 100644 (file)
@@ -24,9 +24,7 @@
  * @date        25.11.2004
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -89,6 +87,7 @@ static be_options_t be_options = {
        BE_TIME_OFF,                       /* no timing */
        0,                                 /* no opt profile */
        0,                                 /* try to omit frame pointer */
+       0,                                 /* try to omit leaf frame pointer */
        0,                                 /* create PIC code */
        0,                                 /* create gprof compatible profiling code */
        BE_VRFY_WARN,                      /* verification level: warn */
@@ -150,19 +149,20 @@ static lc_opt_enum_int_var_t sched_var = {
 };
 
 static const lc_opt_table_entry_t be_main_options[] = {
-       LC_OPT_ENT_STR      ("config",   "read another config file containing backend options", config_file, sizeof(config_file)),
-       LC_OPT_ENT_ENUM_MASK("dump",     "dump irg on several occasions",                       &dump_var),
-       LC_OPT_ENT_BOOL     ("omitfp",   "omit frame pointer",                                  &be_options.omit_fp),
-       LC_OPT_ENT_BOOL     ("pic",      "create PIC code",                                     &be_options.pic),
-       LC_OPT_ENT_BOOL     ("gprof",    "create gprof profiling code",                         &be_options.gprof),
-       LC_OPT_ENT_ENUM_PTR ("vrfy",     "verify the backend irg",                              &vrfy_var),
-       LC_OPT_ENT_BOOL     ("time",     "get backend timing statistics",                       &be_options.timing),
-       LC_OPT_ENT_BOOL     ("profile",  "instrument the code for execution count profiling",   &be_options.opt_profile),
-       LC_OPT_ENT_ENUM_PTR ("sched",    "select a scheduler",                                  &sched_var),
-       LC_OPT_ENT_STR      ("os",       "specify target operating system",                     &be_options.target_os, sizeof(be_options.target_os)),
+       LC_OPT_ENT_STR      ("config",     "read another config file containing backend options", config_file, sizeof(config_file)),
+       LC_OPT_ENT_ENUM_MASK("dump",       "dump irg on several occasions",                       &dump_var),
+       LC_OPT_ENT_BOOL     ("omitfp",     "omit frame pointer",                                  &be_options.omit_fp),
+       LC_OPT_ENT_BOOL     ("omitleaffp", "omit frame pointer in leaf routines",                 &be_options.omit_leaf_fp),
+       LC_OPT_ENT_BOOL     ("pic",        "create PIC code",                                     &be_options.pic),
+       LC_OPT_ENT_BOOL     ("gprof",      "create gprof profiling code",                         &be_options.gprof),
+       LC_OPT_ENT_ENUM_PTR ("vrfy",       "verify the backend irg",                              &vrfy_var),
+       LC_OPT_ENT_BOOL     ("time",       "get backend timing statistics",                       &be_options.timing),
+       LC_OPT_ENT_BOOL     ("profile",    "instrument the code for execution count profiling",   &be_options.opt_profile),
+       LC_OPT_ENT_ENUM_PTR ("sched",      "select a scheduler",                                  &sched_var),
+       LC_OPT_ENT_STR      ("os",         "specify target operating system",                     &be_options.target_os, sizeof(be_options.target_os)),
 #ifdef FIRM_STATISTICS
-       LC_OPT_ENT_BOOL     ("statev",   "dump statistic events",                               &be_options.statev),
-       LC_OPT_ENT_STR      ("filtev",   "filter for stat events (regex if support is active",  &be_options.filtev, sizeof(be_options.filtev)),
+       LC_OPT_ENT_BOOL     ("statev",     "dump statistic events",                               &be_options.statev),
+       LC_OPT_ENT_STR      ("filtev",     "filter for stat events (regex if support is active",  &be_options.filtev, sizeof(be_options.filtev)),
 #endif
 
 #ifdef WITH_ILP
@@ -174,6 +174,136 @@ static const lc_opt_table_entry_t be_main_options[] = {
 
 static be_module_list_entry_t *isa_ifs = NULL;
 
+
+unsigned short asm_constraint_flags[256];
+
+void be_init_default_asm_constraint_flags(void)
+{
+       asm_constraint_flags['?'] = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+       asm_constraint_flags['!'] = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+       asm_constraint_flags['&'] = ASM_CONSTRAINT_FLAG_NO_SUPPORT
+               | ASM_CONSTRAINT_FLAG_MODIFIER_EARLYCLOBBER;
+       asm_constraint_flags['%'] = ASM_CONSTRAINT_FLAG_NO_SUPPORT
+               | ASM_CONSTRAINT_FLAG_MODIFIER_COMMUTATIVE;
+       asm_constraint_flags['!'] = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+
+       asm_constraint_flags['='] = ASM_CONSTRAINT_FLAG_MODIFIER_WRITE
+               | ASM_CONSTRAINT_FLAG_MODIFIER_NO_READ;
+       asm_constraint_flags['+'] = ASM_CONSTRAINT_FLAG_MODIFIER_READ
+               | ASM_CONSTRAINT_FLAG_MODIFIER_WRITE;
+
+       asm_constraint_flags['i'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['s'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['E'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['F'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['G'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['H'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['I'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['J'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['K'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['L'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['M'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['N'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['O'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+       asm_constraint_flags['P'] = ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+
+       asm_constraint_flags['m'] = ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP;
+       asm_constraint_flags['o'] = ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP;
+       asm_constraint_flags['V'] = ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP;
+       asm_constraint_flags['<'] = ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP;
+       asm_constraint_flags['>'] = ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP;
+
+       asm_constraint_flags['p'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['0'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['1'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['2'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['3'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['4'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['5'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['6'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['7'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['8'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+       asm_constraint_flags['9'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER;
+
+       asm_constraint_flags['X'] = ASM_CONSTRAINT_FLAG_SUPPORTS_REGISTER
+               | ASM_CONSTRAINT_FLAG_SUPPORTS_MEMOP
+               | ASM_CONSTRAINT_FLAG_SUPPORTS_IMMEDIATE;
+
+       /* these should have been catched by the parsing code already */
+       asm_constraint_flags['#']  = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+       asm_constraint_flags['*']  = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+       asm_constraint_flags[' ']  = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+       asm_constraint_flags['\t'] = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+       asm_constraint_flags['\n'] = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+       asm_constraint_flags['\r'] = ASM_CONSTRAINT_FLAG_NO_SUPPORT;
+}
+
+asm_constraint_flags_t be_parse_asm_constraints(const char *constraint)
+{
+       asm_constraint_flags_t  flags = 0;
+       const char             *c;
+       asm_constraint_flags_t  tflags;
+
+       for (c = constraint; *c != '\0'; ++c) {
+               switch (*c) {
+               case '#':
+                       /* 'comment' stuff */
+                       while(*c != 0 && *c != ',')
+                               ++c;
+                       break;
+               case '*':
+                       /* 'comment' character */
+                       ++c;
+                       break;
+               case ' ':
+               case '\t':
+               case '\n':
+               case '\r':
+                       break;
+               default:
+                       tflags = asm_constraint_flags[(int) *c];
+                       if (tflags != 0) {
+                               flags |= tflags;
+                       } else {
+                               flags |= isa_if->parse_asm_constraint(isa_if, &c);
+                       }
+                       break;
+               }
+       }
+
+       if ((
+               flags & ASM_CONSTRAINT_FLAG_MODIFIER_WRITE &&
+               flags & ASM_CONSTRAINT_FLAG_MODIFIER_NO_WRITE
+           ) || (
+               flags & ASM_CONSTRAINT_FLAG_MODIFIER_READ &&
+               flags & ASM_CONSTRAINT_FLAG_MODIFIER_NO_READ
+           )) {
+               flags |= ASM_CONSTRAINT_FLAG_INVALID;
+       }
+       if (!(flags & (ASM_CONSTRAINT_FLAG_MODIFIER_READ     |
+                      ASM_CONSTRAINT_FLAG_MODIFIER_WRITE    |
+                      ASM_CONSTRAINT_FLAG_MODIFIER_NO_WRITE |
+                      ASM_CONSTRAINT_FLAG_MODIFIER_NO_READ)
+           )) {
+               flags |= ASM_CONSTRAINT_FLAG_MODIFIER_READ;
+       }
+
+       return flags;
+}
+
+int be_is_valid_clobber(const char *clobber)
+{
+       /* memory is a valid clobber. (the frontend has to detect this case too,
+        * because it has to add memory edges to the asm) */
+       if (strcmp(clobber, "memory") == 0)
+               return 1;
+       /* cc (condition code) is always valid */
+       if (strcmp(clobber, "cc") == 0)
+               return 1;
+
+       return isa_if->is_valid_clobber(isa_if, clobber);
+}
+
 void be_register_isa_if(const char *name, const arch_isa_if_t *isa)
 {
        if (isa_if == NULL)
@@ -214,12 +344,14 @@ int be_parse_arg(const char *arg) {
 /** The be parameters returned by default, all off. */
 static const backend_params be_params = {
        0,    /* need dword lowering */
-       0,    /* don't support inlien assembler yet */
+       0,    /* don't support inline assembler yet */
+       0,     /* no immediate floating point mode. */
        NULL, /* no additional opcodes */
        NULL, /* will be set later */
        NULL, /* but yet no creator function */
        NULL, /* context for create_intrinsic_fkt */
        NULL, /* no if conversion settings */
+       NULL   /* no immediate fp mode */
 };
 
 /* Perform schedule verification if requested. */
@@ -231,12 +363,22 @@ static void be_sched_vrfy(be_irg_t *birg, int vrfy_opt) {
        }
 }
 
-/* Initialize the Firm backend. Must be run BEFORE init_firm()! */
-const backend_params *be_init(void)
+/* Initialize the Firm backend. Must be run first in init_firm()! */
+void firm_be_init(void)
 {
        be_opt_register();
        be_init_modules();
+}
+
+/* Finalize the Firm backend. */
+void firm_be_finish(void)
+{
+       be_quit_modules();
+}
 
+/* Returns the backend parameter */
+const backend_params *be_get_backend_param(void)
+{
        if (isa_if->get_params)
                return isa_if->get_params();
        return &be_params;
@@ -261,20 +403,10 @@ static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
        remove_irp_type(env->pic_symbols_type);
        set_class_final(env->pic_trampolines_type, 1);
 
-       arch_env_init(&env->arch_env, isa_if, file_handle, env);
-
-       /* Register the irn handler of the architecture */
-       if (arch_isa_get_irn_handler(env->arch_env.isa))
-               arch_env_push_irn_handler(&env->arch_env, arch_isa_get_irn_handler(env->arch_env.isa));
+       memset(asm_constraint_flags, 0, sizeof(asm_constraint_flags));
+       env->arch_env = arch_env_init(isa_if, file_handle, env);
 
-       /*
-        * Register the node handler of the back end infrastructure.
-        * This irn handler takes care of the platform independent
-        * spill, reload and perm nodes.
-        */
-       arch_env_push_irn_handler(&env->arch_env, &be_node_irn_handler);
-       env->phi_handler = be_phi_handler_new(&env->arch_env);
-       arch_env_push_irn_handler(&env->arch_env, env->phi_handler);
+       be_phi_handler_new();
 
        be_dbg_open();
        return env;
@@ -285,9 +417,9 @@ static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
  */
 static void be_done_env(be_main_env_t *env)
 {
-       env->arch_env.isa->impl->done(env->arch_env.isa);
+       arch_env_done(env->arch_env);
        be_dbg_close();
-       be_phi_handler_free(env->phi_handler);
+       be_phi_handler_free();
 
        pmap_destroy(env->ent_trampoline_map);
        pmap_destroy(env->ent_pic_symbol_map);
@@ -325,9 +457,6 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
 
        dump(DUMP_INITIAL, irg, "-begin", dump_ir_block_graph);
 
-       be_stat_init_irg(&env->arch_env, irg);
-       be_do_stat_nodes(irg, "01 Begin");
-
        /* set the current graph (this is important for several firm functions) */
        current_ir_graph = irg;
 
@@ -339,7 +468,7 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
        normalize_n_returns(irg);
 
        /* Remove critical edges */
-       remove_critical_cf_edges(irg);
+       remove_critical_cf_edges_ex(irg, /*ignore_exception_edges=*/0);
 
        /* Ensure, that the ir_edges are computed. */
        edges_assure(irg);
@@ -386,53 +515,54 @@ ir_timer_t *t_ra_other;
 static void be_main_loop(FILE *file_handle, const char *cup_name)
 {
        int i;
-       arch_isa_t *isa;
        be_main_env_t env;
        char prof_filename[256];
        static const char suffix[] = ".prof";
        be_irg_t *birgs;
        int num_birgs;
        ir_graph **irg_list, **backend_irg_list;
+       arch_env_t *arch_env;
 
        be_timing = (be_options.timing == BE_TIME_ON);
 
        if (be_timing) {
-               t_abi        = ir_timer_register("time_beabi",       "be abi introduction");
-               t_codegen    = ir_timer_register("time_codegen",     "codegeneration");
-               t_sched      = ir_timer_register("time_sched",       "scheduling");
-               t_constr     = ir_timer_register("time_constr",      "assure constraints");
-               t_finish     = ir_timer_register("time_finish",      "graph finish");
-               t_emit       = ir_timer_register("time_emiter",      "code emiter");
-               t_verify     = ir_timer_register("time_verify",      "graph verification");
-               t_other      = ir_timer_register("time_other",       "other");
-               t_heights    = ir_timer_register("time_heights",     "heights");
-               t_live       = ir_timer_register("time_liveness",    "be liveness");
-               t_execfreq   = ir_timer_register("time_execfreq",    "execfreq");
-               t_ssa_constr = ir_timer_register("time_ssa_constr",  "ssa reconstruction");
-               t_ra_prolog  = ir_timer_register("time_ra_prolog",   "regalloc prolog");
-               t_ra_epilog  = ir_timer_register("time_ra_epilog",   "regalloc epilog");
-               t_ra_constr  = ir_timer_register("time_ra_constr",   "regalloc constraints");
-               t_ra_spill   = ir_timer_register("time_ra_spill",    "spiller");
+               t_abi        = ir_timer_register("bemain_time_beabi",       "be abi introduction");
+               t_codegen    = ir_timer_register("bemain_time_codegen",     "codegeneration");
+               t_sched      = ir_timer_register("bemain_time_sched",       "scheduling");
+               t_constr     = ir_timer_register("bemain_time_constr",      "assure constraints");
+               t_finish     = ir_timer_register("bemain_time_finish",      "graph finish");
+               t_emit       = ir_timer_register("bemain_time_emiter",      "code emiter");
+               t_verify     = ir_timer_register("bemain_time_verify",      "graph verification");
+               t_other      = ir_timer_register("bemain_time_other",       "other");
+               t_heights    = ir_timer_register("bemain_time_heights",     "heights");
+               t_live       = ir_timer_register("bemain_time_liveness",    "be liveness");
+               t_execfreq   = ir_timer_register("bemain_time_execfreq",    "execfreq");
+               t_ssa_constr = ir_timer_register("bemain_time_ssa_constr",  "ssa reconstruction");
+               t_ra_prolog  = ir_timer_register("bemain_time_ra_prolog",   "regalloc prolog");
+               t_ra_epilog  = ir_timer_register("bemain_time_ra_epilog",   "regalloc epilog");
+               t_ra_constr  = ir_timer_register("bemain_time_ra_constr",   "regalloc constraints");
+               t_ra_spill   = ir_timer_register("bemain_time_ra_spill",    "spiller");
                t_ra_spill_apply
-                       = ir_timer_register("time_ra_spill_apply", "apply spills");
-               t_ra_color   = ir_timer_register("time_ra_color",    "graph coloring");
-               t_ra_ifg     = ir_timer_register("time_ra_ifg",      "interference graph");
-               t_ra_copymin = ir_timer_register("time_ra_copymin",  "copy minimization");
-               t_ra_ssa     = ir_timer_register("time_ra_ssadestr", "ssa destruction");
-               t_ra_other   = ir_timer_register("time_ra_other",    "regalloc other");
+                       = ir_timer_register("bemain_time_ra_spill_apply", "apply spills");
+               t_ra_color   = ir_timer_register("bemain_time_ra_color",    "graph coloring");
+               t_ra_ifg     = ir_timer_register("bemain_time_ra_ifg",      "interference graph");
+               t_ra_copymin = ir_timer_register("bemain_time_ra_copymin",  "copy minimization");
+               t_ra_ssa     = ir_timer_register("bemain_time_ra_ssadestr", "ssa destruction");
+               t_ra_other   = ir_timer_register("bemain_time_ra_other",    "regalloc other");
        }
 
        be_init_env(&env, file_handle);
        env.cup_name = cup_name;
 
-       isa = arch_env_get_isa(&env.arch_env);
-
        be_dbg_so(cup_name);
        be_dbg_types();
 
-       /* backend may provide an ordered list of irgs where code should be generated for */
+       arch_env = env.arch_env;
+
+       /* backend may provide an ordered list of irgs where code should be
+        * generated for */
        irg_list         = NEW_ARR_F(ir_graph *, 0);
-       backend_irg_list = arch_isa_get_backend_irg_list(isa, &irg_list);
+       backend_irg_list = arch_env_get_backend_irg_list(arch_env, &irg_list);
 
        /* we might need 1 birg more for instrumentation constructor */
        num_birgs = backend_irg_list ? ARR_LEN(backend_irg_list) : get_irp_n_irgs();
@@ -478,9 +608,13 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                be_sched_init_phase(irg);
 
                /* reset the phi handler. */
-               be_phi_handler_reset(env.phi_handler);
+               be_phi_handler_reset();
 
-               stat_ev_ctx_push_fobj("bemain_irg", irg);
+               stat_ev_if {
+                       stat_ev_ctx_push_fobj("bemain_irg", irg);
+                       be_stat_ev("bemain_insns_start", be_count_insns(irg));
+                       be_stat_ev("bemain_blocks_start", be_count_blocks(irg));
+               }
 
                /* stop and reset timers */
                BE_TIMER_PUSH(t_other);   /* t_other */
@@ -497,7 +631,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                BE_TIMER_POP(t_verify);
 
                /* Get the code generator interface. */
-               cg_if = isa->impl->get_code_generator_if(isa);
+               cg_if = arch_env_get_code_generator_if(arch_env);
 
                /* get a code generator for this graph. */
                birg->cg = cg_if->init(birg);
@@ -511,7 +645,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                BE_TIMER_POP(t_abi);
 
                dump(DUMP_ABI, irg, "-abi", dump_ir_block_graph);
-               be_do_stat_nodes(irg, "02 Abi");
 
                if (be_options.vrfy_option == BE_VRFY_WARN) {
                        be_check_dominance(irg);
@@ -522,16 +655,12 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                }
 
                /* generate code */
-               stat_ev_ctx_push_str("bemain_phase", "prepare");
                BE_TIMER_PUSH(t_codegen);
                arch_code_generator_prepare_graph(birg->cg);
                BE_TIMER_POP(t_codegen);
-               stat_ev_ctx_pop("bemain_phase");
 
                /* reset the phi handler. */
-               be_phi_handler_reset(env.phi_handler);
-
-               be_do_stat_nodes(irg, "03 Prepare");
+               be_phi_handler_reset();
 
                dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
 
@@ -549,8 +678,12 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                 */
                if (ir_profile_has_data())
                        birg->exec_freq = ir_create_execfreqs_from_profile(irg);
-               else
+               else {
+                       /* TODO: edges are corrupt for EDGE_KIND_BLOCK after the local
+                        * optimize graph phase merges blocks in the x86 backend */
+                       edges_deactivate(irg);
                        birg->exec_freq = compute_execfreq(irg, 10);
+               }
                BE_TIMER_POP(t_execfreq);
 
 
@@ -558,11 +691,9 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                /* be_live_chk_compare(birg); */
 
                /* let backend prepare scheduling */
-               stat_ev_ctx_push_str("bemain_phase", "before_sched");
                BE_TIMER_PUSH(t_codegen);
                arch_code_generator_before_sched(birg->cg);
                BE_TIMER_POP(t_codegen);
-               stat_ev_ctx_pop("bemain_phase");
 
                /* schedule the irg */
                BE_TIMER_PUSH(t_sched);
@@ -587,8 +718,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                be_sched_vrfy(birg, be_options.vrfy_option);
                BE_TIMER_POP(t_verify);
 
-               be_do_stat_nodes(irg, "04 Schedule");
-
                /* introduce patterns to assure constraints */
                BE_TIMER_PUSH(t_constr);
                /* we switch off optimizations here, because they might cause trouble */
@@ -597,15 +726,12 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                set_opt_normalize(0);
                set_opt_cse(0);
 
-               assert(!get_opt_cse());
-
                /* add Keeps for should_be_different constrained nodes  */
                /* beware: needs schedule due to usage of be_ssa_constr */
                assure_constraints(birg);
                BE_TIMER_POP(t_constr);
 
                dump(DUMP_SCHED, irg, "-assured", dump_ir_block_graph_sched);
-               be_do_stat_nodes(irg, "05 Constraints");
 
                /* stuff needs to be done after scheduling but before register allocation */
                BE_TIMER_PUSH(t_codegen);
@@ -624,22 +750,21 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                be_sched_vrfy(birg, be_options.vrfy_option);
                BE_TIMER_POP(t_verify);
 
-               /* do some statistics */
-               //be_do_stat_reg_pressure(birg);
-
-#ifdef FIRM_STATISTICS
-               stat_ev_dbl("costs_before_ra", be_estimate_irg_costs(irg, &env.arch_env, birg->exec_freq));
-#endif
+               stat_ev_if {
+                       stat_ev_dbl("bemain_costs_before_ra",
+                                       be_estimate_irg_costs(irg, birg->exec_freq));
+                       be_stat_ev("bemain_insns_before_ra", be_count_insns(irg));
+                       be_stat_ev("bemain_blocks_before_ra", be_count_blocks(irg));
+               }
 
                /* Do register allocation */
                be_allocate_registers(birg);
 
 #ifdef FIRM_STATISTICS
-               stat_ev_dbl("costs_before_ra", be_estimate_irg_costs(irg, &env.arch_env, birg->exec_freq));
+               stat_ev_dbl("bemain_costs_before_ra", be_estimate_irg_costs(irg, birg->exec_freq));
 #endif
 
                dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
-               be_do_stat_nodes(irg, "06 Register Allocation");
 
                /* let the code generator prepare the graph for emitter */
                BE_TIMER_PUSH(t_finish);
@@ -661,6 +786,11 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 
                dump(DUMP_FINAL, irg, "-finish", dump_ir_block_graph_sched);
 
+               stat_ev_if {
+                       be_stat_ev("bemain_insns_finish", be_count_insns(irg));
+                       be_stat_ev("bemain_blocks_finish", be_count_blocks(irg));
+               }
+
                /* check schedule and register allocation */
                BE_TIMER_PUSH(t_verify);
                if (be_options.vrfy_option == BE_VRFY_WARN) {
@@ -691,7 +821,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                be_abi_free(birg->abi);
                BE_TIMER_POP(t_abi);
 
-               be_do_stat_nodes(irg, "07 Final");
                restore_optimization_state(&state);
 
                BE_TIMER_POP(t_other);
@@ -739,14 +868,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                be_sched_free_phase(irg);
 
                be_free_birg(birg);
-
-        /* switched off due to statistics (statistic module needs all irgs) */
-#if 0   /* STA needs irgs */
-#ifdef FIRM_STATISTICS
-               if (! stat_is_active())
-#endif /* FIRM_STATISTICS */
-                       free_ir_graph(irg);
-#endif /* if 0 */
                stat_ev_ctx_pop("bemain_irg");
        }
        ir_profile_free();
@@ -759,10 +880,10 @@ void be_main(FILE *file_handle, const char *cup_name)
        ir_timer_t *t = NULL;
 
        /* The user specified another config file to read. do that now. */
-       if(strlen(config_file) > 0) {
+       if (config_file[0] != '\0') {
                FILE *f;
 
-               if((f = fopen(config_file, "rt")) != NULL) {
+               if ((f = fopen(config_file, "rt")) != NULL) {
                        lc_opt_from_file(config_file, f, NULL);
                        fclose(f);
                }
@@ -788,6 +909,7 @@ void be_main(FILE *file_handle, const char *cup_name)
 
                be_options.statev = 1;
                stat_ev_begin(buf, be_options.filtev);
+               stat_ev_ctx_push_str("bemain_compilation_unit", cup_name);
        }
 #endif
 
@@ -802,15 +924,17 @@ void be_main(FILE *file_handle, const char *cup_name)
                ir_timer_stop(t);
                ir_timer_leave_high_priority();
                stat_ev_if {
-                       stat_ev_dbl("backend_time", ir_timer_elapsed_msec(t));
+                       stat_ev_dbl("bemain_backend_time", ir_timer_elapsed_msec(t));
                } else {
                        printf("%-20s: %lu msec\n", "BEMAINLOOP", ir_timer_elapsed_msec(t));
                }
        }
 
 #ifdef FIRM_STATISTICS
-       if (be_options.statev)
+       if (be_options.statev) {
+               stat_ev_ctx_pop("bemain_compilation_unit");
                stat_ev_end();
+       }
 #endif
 }
 
@@ -822,7 +946,7 @@ unsigned be_put_ignore_regs(const be_irg_t *birg, const arch_register_class_t *c
                bitset_clear_all(bs);
 
        assert(bitset_size(bs) == (unsigned)cls->n_regs);
-       arch_put_non_ignore_regs(&birg->main_env->arch_env, cls, bs);
+       arch_put_non_ignore_regs(cls, bs);
        bitset_flip_all(bs);
        be_abi_put_ignore_regs(birg->abi, cls, bs);