no unnecessary and cryptic abreviations: rename vrfy to verify
[cparser] / driver / firm_opt.c
index 261dbd2..1459134 100644 (file)
  *
  * @file firm_opt.c -- Firm-generating back end optimizations.
  *
- * (C) 2005-2007  Michael Beck   beck@ipd.info.uni-karlsruhe.de
+ * (C) 2005-2010  Michael Beck   beck@ipd.info.uni-karlsruhe.de
  *
  * $Id$
  */
+
+#include <config.h>
+
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
+#include <assert.h>
 #include <libfirm/firm.h>
-#include <libfirm/be.h>
-
 
 #include "firm_opt.h"
 #include "firm_codegen.h"
 #include "firm_cmdline.h"
 #include "firm_timing.h"
+#include "ast2firm.h"
 
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
-
-#if defined(_DEBUG) || defined(FIRM_DEBUG)
-#define DBG(x)  dbg_printf x
-#else
-#define DBG(x)
-#endif /* _DEBUG || FIRM_DEBUG */
-
+static ir_timer_t *t_vcg_dump;
+static ir_timer_t *t_verify;
+static ir_timer_t *t_all_opt;
+static bool do_irg_opt(ir_graph *irg, const char *name);
 
 /** dump all the graphs depending on cond */
-#define DUMP_ALL(cond, suffix)                             \
-  do {                                                     \
-    if (cond) {                                            \
-      timer_push(TV_VCG_DUMP);                             \
-      if (firm_dump.no_blocks)                             \
-        dump_all_ir_graphs(dump_ir_graph, suffix);         \
-      else if (firm_dump.extbb)                            \
-        dump_all_ir_graphs(dump_ir_extblock_graph, suffix);\
-      else                                                 \
-        dump_all_ir_graphs(dump_ir_block_graph, suffix);   \
-      timer_pop();                                         \
-    }                                                      \
-  } while (0)
-
-/** dump all control flow graphs depending on cond */
-#define DUMP_ALL_CFG(cond, suffix)                      \
-  do {                                                  \
-    if (cond) {                                         \
-      timer_push(TV_VCG_DUMP);                          \
-        dump_all_ir_graphs(dump_cfg, suffix);           \
-      timer_pop();                                      \
-    }                                                   \
-  } while (0)
-
-/** check all graphs depending on cond */
-#define CHECK_ALL(cond)                                 \
-  do {                                                  \
-    if (cond) {                                         \
-      int ii;                                           \
-      timer_push(TV_VERIFY);                            \
-      for (ii = get_irp_n_irgs() - 1; ii >= 0; --ii)    \
-        irg_verify(get_irp_irg(ii), VRFY_ENFORCE_SSA);  \
-      timer_pop();                                      \
-    }                                                   \
-  } while (0)
-
-
-
-/** dump graphs irg depending on cond */
-#define DUMP_ONE(cond, irg, suffix)                     \
-  do {                                                  \
-    if (cond) {                                         \
-      timer_push(TV_VCG_DUMP);                          \
-      if (firm_dump.no_blocks)                          \
-        dump_ir_graph(irg, suffix);                     \
-      else if (firm_dump.extbb)                         \
-        dump_ir_extblock_graph(irg, suffix);            \
-      else                                              \
-        dump_ir_block_graph(irg, suffix);               \
-      timer_pop();                                      \
-    }                                                   \
-  } while (0)
-
-/** dump control flow graph irg depending on cond */
-#define DUMP_ONE_CFG(cond, irg, suffix)                 \
-  do {                                                  \
-    if (cond) {                                         \
-      timer_push(TV_VCG_DUMP);                          \
-      dump_cfg(irg, suffix);                            \
-      timer_pop();                                      \
-    }                                                   \
-  } while (0)
-
-/** check a graph irg depending on cond */
-#define CHECK_ONE(cond, irg)                            \
-  do {                                                  \
-    if (cond) {                                         \
-      timer_push(TV_VERIFY);                            \
-        irg_verify(irg, VRFY_ENFORCE_SSA);              \
-      timer_pop();                                      \
-    }                                                   \
-  } while (0)
 
+static void dump_all(const char *suffix)
+{
+       if (!firm_dump.ir_graph)
+               return;
+
+       timer_push(t_vcg_dump);
+       dump_all_ir_graphs(suffix);
+       timer_pop(t_vcg_dump);
+}
 
 /* set by the backend parameters */
-static const ir_settings_arch_dep_t *ad_param = NULL;
-static create_intrinsic_fkt *arch_create_intrinsic = NULL;
-static void *create_intrinsic_ctx = NULL;
-static const ir_settings_if_conv_t *if_conv_info = NULL;
-
-ir_mode *firm_imm_fp_mode = NULL;
+static const ir_settings_arch_dep_t *ad_param              = NULL;
+static create_intrinsic_fkt         *arch_create_intrinsic = NULL;
+static void                         *create_intrinsic_ctx  = NULL;
+static const ir_settings_if_conv_t  *if_conv_info          = NULL;
 
 /* entities of runtime functions */
 ir_entity_ptr rts_entities[rts_max];
@@ -119,685 +53,539 @@ ir_entity_ptr rts_entities[rts_max];
  */
 static const ir_settings_arch_dep_t *arch_factory(void)
 {
-  static const ir_settings_arch_dep_t param = {
-      1,   /* also use subs */
-      4,   /* maximum shifts */
-     31,   /* maximum shift amount */
-     NULL, /* use default evaluator */
-
-      1, /* allow Mulhs */
-      1, /* allow Mulus */
-     32  /* Mulh allowed up to 32 bit */
-  };
-
-  return ad_param ? ad_param : &param;
+       static const ir_settings_arch_dep_t param = {
+               1,   /* also use subs */
+               4,   /* maximum shifts */
+               31,   /* maximum shift amount */
+               NULL, /* use default evaluator */
+
+               1, /* allow Mulhs */
+               1, /* allow Mulus */
+               32  /* Mulh allowed up to 32 bit */
+       };
+
+       return ad_param ? ad_param : &param;
 }
 
 /**
  * Map runtime functions.
  */
-static void rts_map(void) {
-  static const struct {
-    ir_entity_ptr *ent; /**< address of the rts entity */
-    i_mapper_func func; /**< mapper function. */
-  } mapper[] = {
-    /* integer */
-    { &rts_entities[rts_abs],     i_mapper_abs },
-    { &rts_entities[rts_labs],    i_mapper_abs },
-    { &rts_entities[rts_llabs],   i_mapper_abs },
-    { &rts_entities[rts_imaxabs], i_mapper_abs },
-
-    /* double -> double */
-    { &rts_entities[rts_fabs],    i_mapper_abs },
-    { &rts_entities[rts_sqrt],    i_mapper_sqrt },
-    { &rts_entities[rts_cbrt],    i_mapper_cbrt },
-    { &rts_entities[rts_pow],     i_mapper_pow },
-    { &rts_entities[rts_exp],     i_mapper_exp },
-    { &rts_entities[rts_exp2],    i_mapper_exp },
-    { &rts_entities[rts_exp10],   i_mapper_exp },
-    { &rts_entities[rts_log],     i_mapper_log },
-    { &rts_entities[rts_log2],    i_mapper_log2 },
-    { &rts_entities[rts_log10],   i_mapper_log10 },
-    { &rts_entities[rts_sin],     i_mapper_sin },
-    { &rts_entities[rts_cos],     i_mapper_cos },
-    { &rts_entities[rts_tan],     i_mapper_tan },
-    { &rts_entities[rts_asin],    i_mapper_asin },
-    { &rts_entities[rts_acos],    i_mapper_acos },
-    { &rts_entities[rts_atan],    i_mapper_atan },
-    { &rts_entities[rts_sinh],    i_mapper_sinh },
-    { &rts_entities[rts_cosh],    i_mapper_cosh },
-    { &rts_entities[rts_tanh],    i_mapper_tanh },
-
-    /* float -> float */
-    { &rts_entities[rts_fabsf],   i_mapper_abs },
-    { &rts_entities[rts_sqrtf],   i_mapper_sqrt },
-    { &rts_entities[rts_cbrtf],   i_mapper_cbrt },
-    { &rts_entities[rts_powf],    i_mapper_pow },
-    { &rts_entities[rts_expf],    i_mapper_exp },
-    { &rts_entities[rts_exp2f],   i_mapper_exp },
-    { &rts_entities[rts_exp10f],  i_mapper_exp },
-    { &rts_entities[rts_logf],    i_mapper_log },
-    { &rts_entities[rts_log2f],   i_mapper_log2 },
-    { &rts_entities[rts_log10f],  i_mapper_log10 },
-    { &rts_entities[rts_sinf],    i_mapper_sin },
-    { &rts_entities[rts_cosf],    i_mapper_cos },
-    { &rts_entities[rts_tanf],    i_mapper_tan },
-    { &rts_entities[rts_asinf],   i_mapper_asin },
-    { &rts_entities[rts_acosf],   i_mapper_acos },
-    { &rts_entities[rts_atanf],   i_mapper_atan },
-    { &rts_entities[rts_sinhf],   i_mapper_sinh },
-    { &rts_entities[rts_coshf],   i_mapper_cosh },
-    { &rts_entities[rts_tanhf],   i_mapper_tanh },
-
-    /* long double -> long double */
-    { &rts_entities[rts_fabsl],   i_mapper_abs },
-    { &rts_entities[rts_sqrtl],   i_mapper_sqrt },
-    { &rts_entities[rts_cbrtl],   i_mapper_cbrt },
-    { &rts_entities[rts_powl],    i_mapper_pow },
-    { &rts_entities[rts_expl],    i_mapper_exp },
-    { &rts_entities[rts_exp2l],   i_mapper_exp },
-    { &rts_entities[rts_exp10l],  i_mapper_exp },
-    { &rts_entities[rts_logl],    i_mapper_log },
-    { &rts_entities[rts_log2l],   i_mapper_log2 },
-    { &rts_entities[rts_log10l],  i_mapper_log10 },
-    { &rts_entities[rts_sinl],    i_mapper_sin },
-    { &rts_entities[rts_cosl],    i_mapper_cos },
-    { &rts_entities[rts_tanl],    i_mapper_tan },
-    { &rts_entities[rts_asinl],   i_mapper_asin },
-    { &rts_entities[rts_acosl],   i_mapper_acos },
-    { &rts_entities[rts_atanl],   i_mapper_atan },
-    { &rts_entities[rts_sinhl],   i_mapper_sinh },
-    { &rts_entities[rts_coshl],   i_mapper_cosh },
-    { &rts_entities[rts_tanhl],   i_mapper_tanh },
-
-    /* string */
-    { &rts_entities[rts_memcpy],  i_mapper_memcpy },
-    { &rts_entities[rts_memset],  i_mapper_memset },
-    { &rts_entities[rts_strcmp],  i_mapper_strcmp },
-    { &rts_entities[rts_strncmp], i_mapper_strncmp },
-    { &rts_entities[rts_strlen],  i_mapper_strlen }
-  };
-  i_record rec[sizeof(mapper)/sizeof(mapper[0])];
-  unsigned i, n_map;
-
-  for (i = n_map = 0; i < sizeof(mapper)/sizeof(mapper[0]); ++i)
-    if (*mapper[i].ent != NULL) {
-      rec[n_map].i_call.kind     = INTRINSIC_CALL;
-      rec[n_map].i_call.i_ent    = *mapper[i].ent;
-      rec[n_map].i_call.i_mapper = mapper[i].func;
-      rec[n_map].i_call.ctx      = NULL;
-      rec[n_map].i_call.link     = NULL;
-      ++n_map;
-  }  /* if */
-  if (n_map > 0)
-    lower_intrinsics(rec, n_map, /* part_block_used=*/0);
-}  /* rts_map */
+static void rts_map(void)
+{
+       static const struct {
+               ir_entity_ptr *ent; /**< address of the rts entity */
+               i_mapper_func func; /**< mapper function. */
+       } mapper[] = {
+               /* integer */
+               { &rts_entities[rts_abs],     i_mapper_abs },
+               { &rts_entities[rts_labs],    i_mapper_abs },
+               { &rts_entities[rts_llabs],   i_mapper_abs },
+               { &rts_entities[rts_imaxabs], i_mapper_abs },
+
+               /* double -> double */
+               { &rts_entities[rts_fabs],    i_mapper_abs },
+               { &rts_entities[rts_sqrt],    i_mapper_sqrt },
+               { &rts_entities[rts_cbrt],    i_mapper_cbrt },
+               { &rts_entities[rts_pow],     i_mapper_pow },
+               { &rts_entities[rts_exp],     i_mapper_exp },
+               { &rts_entities[rts_exp2],    i_mapper_exp },
+               { &rts_entities[rts_exp10],   i_mapper_exp },
+               { &rts_entities[rts_log],     i_mapper_log },
+               { &rts_entities[rts_log2],    i_mapper_log2 },
+               { &rts_entities[rts_log10],   i_mapper_log10 },
+               { &rts_entities[rts_sin],     i_mapper_sin },
+               { &rts_entities[rts_cos],     i_mapper_cos },
+               { &rts_entities[rts_tan],     i_mapper_tan },
+               { &rts_entities[rts_asin],    i_mapper_asin },
+               { &rts_entities[rts_acos],    i_mapper_acos },
+               { &rts_entities[rts_atan],    i_mapper_atan },
+               { &rts_entities[rts_sinh],    i_mapper_sinh },
+               { &rts_entities[rts_cosh],    i_mapper_cosh },
+               { &rts_entities[rts_tanh],    i_mapper_tanh },
+
+               /* float -> float */
+               { &rts_entities[rts_fabsf],   i_mapper_abs },
+               { &rts_entities[rts_sqrtf],   i_mapper_sqrt },
+               { &rts_entities[rts_cbrtf],   i_mapper_cbrt },
+               { &rts_entities[rts_powf],    i_mapper_pow },
+               { &rts_entities[rts_expf],    i_mapper_exp },
+               { &rts_entities[rts_exp2f],   i_mapper_exp },
+               { &rts_entities[rts_exp10f],  i_mapper_exp },
+               { &rts_entities[rts_logf],    i_mapper_log },
+               { &rts_entities[rts_log2f],   i_mapper_log2 },
+               { &rts_entities[rts_log10f],  i_mapper_log10 },
+               { &rts_entities[rts_sinf],    i_mapper_sin },
+               { &rts_entities[rts_cosf],    i_mapper_cos },
+               { &rts_entities[rts_tanf],    i_mapper_tan },
+               { &rts_entities[rts_asinf],   i_mapper_asin },
+               { &rts_entities[rts_acosf],   i_mapper_acos },
+               { &rts_entities[rts_atanf],   i_mapper_atan },
+               { &rts_entities[rts_sinhf],   i_mapper_sinh },
+               { &rts_entities[rts_coshf],   i_mapper_cosh },
+               { &rts_entities[rts_tanhf],   i_mapper_tanh },
+
+               /* long double -> long double */
+               { &rts_entities[rts_fabsl],   i_mapper_abs },
+               { &rts_entities[rts_sqrtl],   i_mapper_sqrt },
+               { &rts_entities[rts_cbrtl],   i_mapper_cbrt },
+               { &rts_entities[rts_powl],    i_mapper_pow },
+               { &rts_entities[rts_expl],    i_mapper_exp },
+               { &rts_entities[rts_exp2l],   i_mapper_exp },
+               { &rts_entities[rts_exp10l],  i_mapper_exp },
+               { &rts_entities[rts_logl],    i_mapper_log },
+               { &rts_entities[rts_log2l],   i_mapper_log2 },
+               { &rts_entities[rts_log10l],  i_mapper_log10 },
+               { &rts_entities[rts_sinl],    i_mapper_sin },
+               { &rts_entities[rts_cosl],    i_mapper_cos },
+               { &rts_entities[rts_tanl],    i_mapper_tan },
+               { &rts_entities[rts_asinl],   i_mapper_asin },
+               { &rts_entities[rts_acosl],   i_mapper_acos },
+               { &rts_entities[rts_atanl],   i_mapper_atan },
+               { &rts_entities[rts_sinhl],   i_mapper_sinh },
+               { &rts_entities[rts_coshl],   i_mapper_cosh },
+               { &rts_entities[rts_tanhl],   i_mapper_tanh },
+
+               /* string */
+               { &rts_entities[rts_strcmp],  i_mapper_strcmp },
+               { &rts_entities[rts_strncmp], i_mapper_strncmp },
+               { &rts_entities[rts_strcpy],  i_mapper_strcpy },
+               { &rts_entities[rts_strlen],  i_mapper_strlen },
+               { &rts_entities[rts_memcpy],  i_mapper_memcpy },
+               { &rts_entities[rts_mempcpy], i_mapper_mempcpy },
+               { &rts_entities[rts_memmove], i_mapper_memmove },
+               { &rts_entities[rts_memset],  i_mapper_memset },
+               { &rts_entities[rts_memcmp],  i_mapper_memcmp }
+       };
+       i_record rec[sizeof(mapper)/sizeof(mapper[0])];
+       unsigned i, n_map;
+
+       for (i = n_map = 0; i < sizeof(mapper)/sizeof(mapper[0]); ++i) {
+               if (*mapper[i].ent != NULL) {
+                       rec[n_map].i_call.kind     = INTRINSIC_CALL;
+                       rec[n_map].i_call.i_ent    = *mapper[i].ent;
+                       rec[n_map].i_call.i_mapper = mapper[i].func;
+                       rec[n_map].i_call.ctx      = NULL;
+                       rec[n_map].i_call.link     = NULL;
+                       ++n_map;
+               }
+       }
+
+       if (n_map > 0)
+               lower_intrinsics(rec, n_map, /* part_block_used=*/0);
+}
 
 static int *irg_dump_no;
+static int firm_const_exists;
 
-static void dump_graph_count(ir_graph *const irg, const char *const suffix)
+static void do_optimize_funccalls(void)
 {
-  char name[64];
-  snprintf(name, sizeof(name), "-%02d_%s", irg_dump_no[get_irg_idx(irg)]++, suffix);
-  DUMP_ONE(1, irg, name);
+       optimize_funccalls(firm_const_exists, NULL);
 }
 
-static void dump_graph_cfg_count(ir_graph *const irg, const char *const suffix)
+static void do_gcse(ir_graph *irg)
 {
-  char name[64];
-  snprintf(name, sizeof(name), "-%02d_%s", irg_dump_no[get_irg_idx(irg)]++, suffix);
-  DUMP_ONE_CFG(1, irg, name);
+       set_opt_global_cse(1);
+       optimize_graph_df(irg);
+       place_code(irg);
+       set_opt_global_cse(0);
 }
 
-static void dump_all_count(const char *const suffix)
+static void do_lower_highlevel(ir_graph *irg)
 {
-  const int n_irgs = get_irp_n_irgs();
-  int i;
+       lower_highlevel_graph(irg, firm_opt.lower_bitfields);
+}
 
-  for (i = 0; i < n_irgs; ++i)
-    dump_graph_count(get_irp_irg(i), suffix);
+static void do_if_conv(ir_graph *irg)
+{
+       opt_if_conv(irg, if_conv_info);
 }
 
-#define DUMP_ONE_C(cond, irg, suffix)    \
-  do {                                   \
-    if (cond) {                          \
-      dump_graph_count((irg), (suffix)); \
-    }                                    \
-  } while (0)
-
-#define DUMP_ONE_CFG_C(cond, irg, suffix)    \
-  do {                                       \
-    if (cond) {                              \
-      dump_graph_cfg_count((irg), (suffix)); \
-    }                                        \
-  } while (0)
-
-#define DUMP_ALL_C(cond, suffix) \
-  do {                           \
-    if (cond) {                  \
-      dump_all_count((suffix));  \
-    }                            \
-  } while (0)
+static void do_stred(ir_graph *irg)
+{
+       opt_osr(irg, osr_flag_default | osr_flag_keep_reg_pressure | osr_flag_ignore_x86_shift);
+}
 
-/**
- * run all the Firm optimizations
- *
- * @param input_filename     the name of the (main) source file
- * @param firm_const_exists  non-zero, if the const attribute was used on functions
- */
-static void do_firm_optimizations(const char *input_filename, int firm_const_exists)
+static void after_inline_opt(ir_graph *irg)
 {
-  int      i;
-  ir_graph *irg;
-  unsigned aa_opt;
-
-  /* FIXME: cloning might ADD new graphs. */
-  irg_dump_no = calloc(get_irp_last_idx(), sizeof(*irg_dump_no));
-
-  set_opt_strength_red(firm_opt.strength_red);
-  set_opt_scalar_replacement(firm_opt.scalar_replace);
-  set_opt_auto_create_sync(firm_opt.auto_sync);
-  set_opt_alias_analysis(firm_opt.alias_analysis);
-
-  aa_opt = aa_opt_no_opt;
-  if (firm_opt.strict_alias)
-    aa_opt |= aa_opt_type_based | aa_opt_byte_type_may_alias;
-  if (firm_opt.no_alias)
-    aa_opt = aa_opt_no_alias;
-
-  set_irp_memory_disambiguator_options(aa_opt);
-
-  timer_start(TV_ALL_OPT);
-
-  if (firm_opt.remove_unused) {
-       ir_entity **keep_methods;
-       int         arr_len;
-
-    /* Analysis that finds the free methods,
-       i.e. methods that are dereferenced.
-       Optimizes polymorphic calls :-). */
-    cgana(&arr_len, &keep_methods);
-
-    /* Remove methods that are never called. */
-    gc_irgs(arr_len, keep_methods);
-
-    free(keep_methods);
-  }
-
-  if (! firm_opt.freestanding) {
-    rts_map();
-    DUMP_ALL_C(firm_dump.ir_graph && firm_dump.all_phases, "rts");
-    CHECK_ALL(firm_opt.check_all);
-  }
-
-  /* first step: kill dead code */
-  for (i = 0; i < get_irp_n_irgs(); i++) {
-    irg = current_ir_graph = get_irp_irg(i);
-    /* Confirm construction currently can only handle blocks with only one control
-       flow predecessor. Calling optimize_cf here removes Bad predecessors and help
-       the optimization of switch constructs. */
-    timer_push(TV_CF_OPT);
-      optimize_graph_df(irg);
-      optimize_cf(irg);
-    timer_pop();
-  }
-
-  if (firm_opt.func_calls) {
-    timer_push(TV_REAL_FUNC_CALL);
-      optimize_funccalls(firm_const_exists, NULL);
-    timer_pop();
-    DUMP_ALL_C(firm_dump.ir_graph && firm_dump.all_phases, "func_call");
-    CHECK_ALL(firm_opt.check_all);
-  }
-
-  /* do lowering on the const code irg */
-  lower_const_code();
-
-  for (i = 0; i < get_irp_n_irgs(); i++) {
-    irg = current_ir_graph = get_irp_irg(i);
-
-#ifdef FIRM_EXT_GRS
-  /* If SIMD optimization is on, make sure we have only 1 return */
-  if (firm_ext_grs.create_pattern || firm_ext_grs.simd_opt)
-    normalize_one_return(irg);
-#endif
+       do_irg_opt(irg, "scalar-replace");
+       do_irg_opt(irg, "local");
+       do_irg_opt(irg, "control-flow");
+       do_irg_opt(irg, "combo");
+}
 
+static void do_inline(void)
+{
+       inline_functions(firm_opt.inline_maxsize, firm_opt.inline_threshold,
+                        after_inline_opt);
+}
 
-#if 0
-    if (firm_opt.modes) {
-      /* convert all modes into integer if possible */
-      arch_mode_conversion(irg, predefs.mode_uint);
-    }
-#endif
-    timer_push(TV_SCALAR_REPLACE);
-      scalar_replacement_opt(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "scalar");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    timer_push(TV_LOCAL_OPT);
-      optimize_graph_df(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "lopt");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    timer_push(TV_REASSOCIATION);
-      optimize_reassociation(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "reassoc");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    compute_doms(irg);
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    if (firm_opt.gcse) {
-      timer_push(TV_CODE_PLACE);
-        set_opt_global_cse(1);
-        optimize_graph_df(irg);
-        place_code(irg);
-        set_opt_global_cse(0);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "place");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-
-    if (firm_opt.confirm) {
-      /* Confirm construction currently can only handle blocks with only one control
-         flow predecessor. Calling optimize_cf here removes Bad predecessors and help
-         the optimization of switch constructs. */
-      timer_push(TV_CF_OPT);
-      optimize_cf(irg);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "cfopt");
-      CHECK_ONE(firm_opt.check_all, irg);
-      timer_push(TV_CONFIRM_CREATE);
-        construct_confirms(irg);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "confirms");
-      CHECK_ONE(firm_opt.check_all, irg);
-
-      timer_push(TV_LOCAL_OPT);
-        optimize_graph_df(irg);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "lopt");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-
-    if (firm_opt.luffig) {
-      opt_ldst2(irg);
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "ldst2");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-
-    timer_push(TV_CF_OPT);
-      optimize_cf(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "cfopt");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    if (firm_opt.load_store) {
-      timer_push(TV_LOAD_STORE);
-        optimize_load_store(irg);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "ldst");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-
-    lower_highlevel_graph(irg, firm_opt.lower_bitfields);
-
-    if (firm_opt.deconv) {
-      timer_push(TV_DECONV);
-        conv_opt(irg);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "deconv");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-
-    if (firm_opt.cond_eval) {
-      timer_push(TV_COND_EVAL);
-        opt_cond_eval(irg);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "cond_eval");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-
-    /* should we really remove the Confirm here? */
-    if (firm_opt.confirm) {
-      timer_push(TV_CONFIRM_CREATE);
-      remove_confirms(irg);
-      timer_pop();
-    }
-
-    if (firm_opt.gvn_pre) {
-      do_gvn_pre(irg);
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "pre");
-      CHECK_ONE(firm_opt.check_all, irg);
-      irg_verify(irg, VRFY_ENFORCE_SSA);
-    }
-
-    if (! firm_opt.gcse) {
-      timer_push(TV_CODE_PLACE);
-        optimize_graph_df(irg);
-        place_code(irg);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "place");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-
-    compute_doms(irg);
-    compute_postdoms(irg);
-    DUMP_ONE_CFG_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "dom");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    construct_backedges(irg);
-
-    timer_push(TV_CF_OPT);
-      optimize_cf(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "cfopt");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    if (firm_opt.if_conversion) {
-      timer_push(TV_IF_CONV);
-        opt_if_conv(current_ir_graph, if_conv_info);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "if");
-      CHECK_ONE(firm_opt.check_all, current_ir_graph);
-
-      timer_push(TV_LOCAL_OPT);
-        optimize_graph_df(current_ir_graph);
-      timer_pop();
-      timer_push(TV_CF_OPT);
-        optimize_cf(current_ir_graph);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "after_if");
-      CHECK_ONE(firm_opt.check_all, current_ir_graph);
-    }
-
-    if (firm_opt.bool_opt) {
-      opt_bool(irg);
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "bool");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-
-    timer_push(TV_OSR);
-      opt_osr(current_ir_graph, osr_flag_default | osr_flag_keep_reg_pressure | osr_flag_ignore_x86_shift);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "stred");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    timer_push(TV_LOCAL_OPT);
-      optimize_graph_df(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "lopt");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    edges_deactivate(irg);
-    timer_push(TV_DEAD_NODE);
-      dead_node_elimination(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "dead");
-    CHECK_ONE(firm_opt.check_all, irg);
-  }
-
-  if (firm_opt.do_inline) {
-    inline_functions(500, 50);
-    DUMP_ALL_C(firm_dump.ir_graph && firm_dump.all_phases, "inl");
-    CHECK_ALL(firm_opt.check_all);
-  }
-  if (firm_opt.cloning) {
-    proc_cloning((float)firm_opt.clone_threshold);
-    DUMP_ALL_C(firm_dump.ir_graph && firm_dump.all_phases, "clone");
-    CHECK_ALL(firm_opt.check_all);
-  }
-  if (firm_opt.tail_rec) {
-    timer_push(TV_TAIL_REC);
-      opt_tail_recursion();
-    timer_pop();
-
-    DUMP_ALL_C(firm_dump.ir_graph && firm_dump.all_phases, "tail_rec");
-    CHECK_ALL(firm_opt.check_all);
-  }
-
-  if (firm_opt.cond_eval) {
-    for (i = 0; i < get_irp_n_irgs(); i++) {
-      irg = get_irp_irg(i);
-      timer_push(TV_COND_EVAL);
-        opt_cond_eval(irg);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "cond_eval");
-      CHECK_ONE(firm_opt.check_all, irg);
-    }
-  }
-
-  /* final run of local optimizations */
-  for (i = 0; i < get_irp_n_irgs(); i++) {
-    irg = get_irp_irg(i);
-    timer_push(TV_LOCAL_OPT);
-      optimize_graph_df(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "local_opt");
-    CHECK_ONE(firm_opt.check_all, irg);
-
-    timer_push(TV_CF_OPT);
-      optimize_cf(irg);
-    timer_pop();
-    DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, irg, "cfopt");
-    CHECK_ONE(firm_opt.check_all, irg);
-  }
-
-  if (firm_dump.ir_graph) {
-    /* recompute backedges for nicer dumps */
-    for (i = 0; i < get_irp_n_irgs(); i++)
-      construct_cf_backedges(get_irp_irg(i));
-  }
-
-  if (firm_opt.remove_unused) {
-    ir_entity **keep_methods;
-    int arr_len;
-
-    /* Analysis that finds the free methods,
-       i.e. methods that are dereferenced.
-       Optimizes polymorphic calls :-). */
-    cgana(&arr_len, &keep_methods);
-
-    /* Remove methods that are never called. */
-    gc_irgs(arr_len, keep_methods);
-
-    free(keep_methods);
-  }
-
-
-  DUMP_ALL(firm_dump.ir_graph, "-opt");
-
-  /* verify optimized graphs */
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-    ir_graph *irg = get_irp_irg(i);
-    irg_verify(irg, VRFY_ENFORCE_SSA);
-  }
-
-  if (firm_dump.statistic & STAT_AFTER_OPT)
-    stat_dump_snapshot(input_filename, "opt");
-
-  timer_stop(TV_ALL_OPT);
-}  /* do_firm_optimizations */
+static void do_cloning(void)
+{
+       proc_cloning((float) firm_opt.clone_threshold);
+}
+
+static void do_lower_switch(ir_graph *irg)
+{
+       lower_switch(irg, firm_opt.spare_size);
+}
+
+static void do_lower_mux(ir_graph *irg)
+{
+       lower_mux(irg, NULL);
+}
+
+static void do_lower_dw_ops(void)
+{
+       lwrdw_param_t init = {
+               1,
+               1,
+               get_atomic_mode(ATOMIC_TYPE_LONGLONG),
+               get_atomic_mode(ATOMIC_TYPE_ULONGLONG),
+               get_atomic_mode(ATOMIC_TYPE_INT),
+               get_atomic_mode(ATOMIC_TYPE_UINT),
+               def_create_intrinsic_fkt,
+               NULL
+       };
+
+       if (arch_create_intrinsic) {
+               init.create_intrinsic = arch_create_intrinsic;
+               init.ctx              = create_intrinsic_ctx;
+       }
+       lower_dw_ops(&init);
+}
+
+static void do_vrp(ir_graph *irg)
+{
+       set_vrp_data(irg);
+}
+
+typedef enum opt_target {
+       OPT_TARGET_IRG, /**< optimization function works on a single graph */
+       OPT_TARGET_IRP  /**< optimization function works on the complete program */
+} opt_target_t;
+
+typedef enum opt_flags {
+       OPT_FLAG_NONE         = 0,
+       OPT_FLAG_ENABLED      = 1 << 0, /**< enable the optimization */
+       OPT_FLAG_NO_DUMP      = 1 << 1, /**< don't dump after transformation */
+       OPT_FLAG_NO_VERIFY    = 1 << 2, /**< don't verify after transformation */
+       OPT_FLAG_HIDE_OPTIONS = 1 << 3, /**< do not automatically process
+                                            -foptions for this transformation */
+       OPT_FLAG_ESSENTIAL    = 1 << 4, /**< output won't work without this pass
+                                            so we need it even with -O0 */
+} opt_flags_t;
+
+typedef void (*transform_irg_func)(ir_graph *irg);
+typedef void (*transform_irp_func)(void);
+
+typedef struct {
+       opt_target_t  target;
+       const char   *name;
+       union {
+               transform_irg_func transform_irg;
+               transform_irp_func transform_irp;
+       } u;
+       const char   *description;
+       opt_flags_t   flags;
+} opt_config_t;
+
+static opt_config_t opts[] = {
+#define IRG(a, b, c, d) { OPT_TARGET_IRG, a, .u.transform_irg = (transform_irg_func)b, c, d }
+#define IRP(a, b, c, d) { OPT_TARGET_IRP, a, .u.transform_irp = b,                     c, d }
+       IRG("bool",              opt_bool,                 "bool simplification",                                   OPT_FLAG_NONE),
+       IRG("combo",             combo,                    "combined CCE, UCE and GVN",                             OPT_FLAG_NONE),
+       IRG("confirm",           construct_confirms,       "confirm optimisation",                                  OPT_FLAG_HIDE_OPTIONS),
+       IRG("control-flow",      optimize_cf,              "optimization of control-flow",                          OPT_FLAG_HIDE_OPTIONS),
+       IRG("dead",              dead_node_elimination,    "dead node elimination",                                 OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_NO_DUMP | OPT_FLAG_NO_VERIFY),
+       IRG("deconv",            conv_opt,                 "conv node elimination",                                 OPT_FLAG_NONE),
+       IRG("fp-vrp",            fixpoint_vrp,             "fixpoint value range propagation",                      OPT_FLAG_NONE),
+       IRG("frame",             opt_frame_irg,            "remove unused frame entities",                          OPT_FLAG_NONE),
+       IRG("gcse",              do_gcse,                  "global common subexpression elimination",               OPT_FLAG_NONE),
+       IRG("gvn-pre",           do_gvn_pre,               "global value numbering partial redundancy elimination", OPT_FLAG_NONE),
+       IRG("if-conversion",     do_if_conv,               "if-conversion",                                         OPT_FLAG_NONE),
+       IRG("invert-loops",      do_loop_inversion,        "loop inversion",                                        OPT_FLAG_NONE),
+       IRG("ivopts",            do_stred,                 "induction variable strength reduction",                 OPT_FLAG_NONE),
+       IRG("local",             optimize_graph_df,        "local graph optimizations",                             OPT_FLAG_HIDE_OPTIONS),
+       IRG("lower",             do_lower_highlevel,       "lowering",                                              OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_ESSENTIAL),
+       IRG("lower-mux",         do_lower_mux,             "mux lowering",                                          OPT_FLAG_NONE),
+       IRG("lower-switch",      do_lower_switch,          "switch lowering",                                       OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_ESSENTIAL),
+       IRG("one-return",        normalize_one_return,     "normalisation to 1 return",                             OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_NO_DUMP | OPT_FLAG_NO_VERIFY),
+       IRG("opt-load-store",    optimize_load_store,      "load store optimization",                               OPT_FLAG_NONE),
+       IRG("opt-tail-rec",      opt_tail_rec_irg,         "tail-recursion eliminiation",                           OPT_FLAG_NONE),
+       IRG("parallelize-mem",   opt_parallelize_mem,      "parallelize memory",                                    OPT_FLAG_NONE),
+       IRG("place",             place_code,               "code placement",                                        OPT_FLAG_NONE),
+       IRG("reassociation",     optimize_reassociation,   "reassociation",                                         OPT_FLAG_NONE),
+       IRG("remove-confirms",   remove_confirms,          "confirm removal",                                       OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_NO_DUMP | OPT_FLAG_NO_VERIFY),
+       IRG("remove-phi-cycles", remove_phi_cycles,        "removal of phi cycles",                                 OPT_FLAG_HIDE_OPTIONS),
+       IRG("scalar-replace",    scalar_replacement_opt,   "scalar replacement",                                    OPT_FLAG_NONE),
+       IRG("shape-blocks",      shape_blocks,             "block shaping",                                         OPT_FLAG_NONE),
+       IRG("thread-jumps",      opt_jumpthreading,        "path-sensitive jumpthreading",                          OPT_FLAG_NONE),
+       IRG("unroll-loops",      do_loop_unrolling,        "loop unrolling",                                        OPT_FLAG_NONE),
+       IRG("vrp",               do_vrp,                   "value range propagation",                               OPT_FLAG_NONE),
+       IRP("inline",            do_inline,                "inlining",                                              OPT_FLAG_NONE),
+       IRP("lower-const",       lower_const_code,         "lowering of constant code",                             OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_NO_DUMP | OPT_FLAG_NO_VERIFY | OPT_FLAG_ESSENTIAL),
+       IRP("lower-dw",          do_lower_dw_ops,          "lowering of doubleword operations",                     OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_ESSENTIAL),
+       IRP("opt-func-call",     do_optimize_funccalls,    "function call optimization",                            OPT_FLAG_NONE),
+       IRP("opt-proc-clone",    do_cloning,               "procedure cloning",                                     OPT_FLAG_NONE),
+       IRP("remove-unused",     garbage_collect_entities, "removal of unused functions/variables",                 OPT_FLAG_NO_DUMP | OPT_FLAG_NO_VERIFY),
+       IRP("rts",               rts_map,                  "optimization of known library functions",               OPT_FLAG_HIDE_OPTIONS),
+#undef IRP
+#undef IRG
+};
+static const int n_opts = sizeof(opts) / sizeof(opts[0]);
+ir_timer_t *timers[sizeof(opts)/sizeof(opts[0])];
+
+static opt_config_t *get_opt(const char *name)
+{
+       int i;
+       for (i = 0; i < n_opts; ++i) {
+               opt_config_t *config = &opts[i];
+               if (strcmp(config->name, name) == 0)
+                       return config;
+       }
+
+       return NULL;
+}
+
+static void set_opt_enabled(const char *name, bool enabled)
+{
+       opt_config_t *config = get_opt(name);
+       config->flags = (config->flags & ~OPT_FLAG_ENABLED)
+               | (enabled ? OPT_FLAG_ENABLED : 0);
+}
+
+static bool get_opt_enabled(const char *name)
+{
+       opt_config_t *config = get_opt(name);
+       return (config->flags & OPT_FLAG_ENABLED) != 0;
+}
 
 /**
- * compute the size of a type (do implicit lowering)
+ * perform an optimisation on a single graph
  *
- * @param ty   a Firm type
+ * @return  true if something changed, false otherwise
  */
-static int compute_type_size(ir_type *ty)
+static bool do_irg_opt(ir_graph *irg, const char *name)
 {
-  optimization_state_t state;
-  unsigned             align_all = 1;
-  int                  n, size = 0, set = 0;
-  int                  i, dims, s;
-
-  if (get_type_state(ty) == layout_fixed) {
-    /* do not layout already layouted types again */
-    return 1;
-  }
-
-  if (is_Method_type(ty) || ty == get_glob_type()) {
-    /* no need for size calculation for method types or the global type */
-    return 1;
-  }
-
-  DBG(("compute type size visiting: %s\n", get_type_name(ty)));
-
-  switch (get_type_tpop_code(ty)) {
-  case tpo_class:
-  case tpo_struct:
-    for (i = 0, n = get_compound_n_members(ty); i < n; ++i) {
-      ir_entity *ent  = get_compound_member(ty, i);
-      ir_type *ent_ty = get_entity_type(ent);
-      unsigned align, misalign;
-
-      /* compute member types */
-      if (! compute_type_size(ent_ty))
-        return 0;
-
-      align     = get_type_alignment_bytes(ent_ty);
-      align_all = align > align_all ? align : align_all;
-      misalign  = (align ? size % align : 0);
-      size     += (misalign ? align - misalign : 0);
-
-      set_entity_offset(ent, size);
-      size += get_type_size_bytes(ent_ty);
-
-      DBG(("  member %s %s -> (size: %u, align: %u)\n",
-            get_type_name(ent_ty), get_entity_name(ent),
-            get_type_size_bytes(ent_ty), get_type_alignment_bytes(ent_ty)));
-    }
-    if (align_all > 0 && size % align_all) {
-       DBG(("align of the struct member: %u, type size: %d\n", align_all, size));
-       size += align_all - (size % align_all);
-       DBG(("correcting type-size to %d\n", size));
-    }
-    set_type_alignment_bytes(ty, align_all);
-    set = 1;
-    break;
-
-  case tpo_union:
-    for (i = 0, n = get_union_n_members(ty); i < n; ++i) {
-      ir_entity *ent = get_union_member(ty, i);
-
-      if (! compute_type_size(get_entity_type(ent)))
-        return 0;
-      s = get_type_size_bytes(get_entity_type(ent));
-
-      set_entity_offset(ent, 0);
-      size = (s > size ? s : size);
-    }
-    set = 1;
-    break;
-
-  case tpo_array:
-    dims = get_array_n_dimensions(ty);
-
-    if (! compute_type_size(get_array_element_type(ty)))
-      return 0;
-
-    size = 1;
-
-    save_optimization_state(&state);
-    set_optimize(1);
-    set_opt_constant_folding(1);
-       set_opt_algebraic_simplification(1);
-
-    for (i = 0; i < dims; ++i) {
-      ir_node *lower   = get_array_lower_bound(ty, i);
-      ir_node *upper   = get_array_upper_bound(ty, i);
-      ir_graph *rem    = current_ir_graph;
-      tarval  *tv_lower, *tv_upper;
-      long     val_lower, val_upper;
-
-      current_ir_graph = get_const_code_irg();
-      local_optimize_node(lower);
-      local_optimize_node(upper);
-      current_ir_graph = rem;
-
-      tv_lower = computed_value(lower);
-      tv_upper = computed_value(upper);
-
-      if (tv_lower == tarval_bad || tv_upper == tarval_bad) {
-        /*
-         * we cannot calculate the size of this array yet, it
-         * even might be unknown until the end, like argv[]
-         */
-        restore_optimization_state(&state);
-        return 0;
-      }
-
-      val_upper = get_tarval_long(tv_upper);
-      val_lower = get_tarval_long(tv_lower);
-      size     *= val_upper - val_lower;
-    }
-    restore_optimization_state(&state);
-
-    DBG(("array %s -> (elements: %d, element type size: %d)\n",
-          get_type_name(ty),
-          size, get_type_size_bytes(get_array_element_type(ty))));
-    size *= get_type_size_bytes(get_array_element_type(ty));
-    set = 1;
-    break;
-
-  default:
-    break;
-  }
-
-  if (set) {
-    set_type_size_bytes(ty, size);
-    set_type_state(ty, layout_fixed);
-  }
-
-  DBG(("size: %d\n", get_type_size_bytes(ty)));
-
-  return set;
-}  /* compute_type_size */
+       ir_graph     *old_irg;
+       opt_config_t *config = get_opt(name);
+       size_t        n      = config - opts;
+       assert(config != NULL);
+       assert(config->target == OPT_TARGET_IRG);
+       if (! (config->flags & OPT_FLAG_ENABLED))
+               return false;
+
+       old_irg          = current_ir_graph;
+       current_ir_graph = irg;
+
+       timer_push(timers[n]);
+       config->u.transform_irg(irg);
+       timer_pop(timers[n]);
+
+       if (firm_dump.all_phases && firm_dump.ir_graph) {
+               dump_ir_graph(irg, name);
+       }
+
+       if (firm_opt.check_all) {
+               timer_push(t_verify);
+               irg_verify(irg, VERIFY_ENFORCE_SSA);
+               timer_pop(t_verify);
+       }
+
+       current_ir_graph = old_irg;
+       return true;
+}
+
+static void do_irp_opt(const char *name)
+{
+       opt_config_t *config = get_opt(name);
+       size_t        n      = config - opts;
+       assert(config->target == OPT_TARGET_IRP);
+       if (! (config->flags & OPT_FLAG_ENABLED))
+               return;
+
+       timer_push(timers[n]);
+       config->u.transform_irp();
+       timer_pop(timers[n]);
+
+       if (firm_dump.ir_graph && firm_dump.all_phases) {
+               int i;
+               for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+                       ir_graph *irg = get_irp_irg(i);
+                       dump_ir_graph(irg, name);
+               }
+       }
+
+       if (firm_opt.check_all) {
+               int i;
+               timer_push(t_verify);
+               for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+                       irg_verify(get_irp_irg(i), VERIFY_ENFORCE_SSA);
+               }
+               timer_pop(t_verify);
+       }
+}
 
 /**
- * layout all non-frame types of the Firm graph
+ * Enable transformations which should be always safe (and cheap) to perform
  */
-static void compute_type_sizes(void)
+static void enable_safe_defaults(void)
 {
-  int i;
-  ir_type *tp;
-
-  /* all non-frame other types */
-  for (i = get_irp_n_types() - 1; i >= 0; --i) {
-    tp = get_irp_type(i);
-    compute_type_size(tp);
-
-    if (is_Method_type(tp)) {
-      tp = get_method_value_res_type(tp);
-
-      if (tp) {
-        /* we have a value result type for this method, lower */
-        compute_type_size(tp);
-      }
-    }
-  }
-}  /* compute_type_sizes */
+       set_opt_enabled("remove-unused", true);
+       set_opt_enabled("opt-tail-rec", true);
+       set_opt_enabled("opt-func-call", true);
+       set_opt_enabled("reassociation", true);
+       set_opt_enabled("control-flow", true);
+       set_opt_enabled("local", true);
+       set_opt_enabled("lower-const", true);
+       set_opt_enabled("scalar-replace", true);
+       set_opt_enabled("place", true);
+       set_opt_enabled("confirm", true);
+       set_opt_enabled("opt-load-store", true);
+       set_opt_enabled("lower", true);
+       set_opt_enabled("deconv", true);
+       set_opt_enabled("remove-confirms", true);
+       set_opt_enabled("ivopts", true);
+       set_opt_enabled("dead", true);
+       set_opt_enabled("lower-switch", true);
+       set_opt_enabled("remove-phi-cycles", true);
+       set_opt_enabled("frame", true);
+       set_opt_enabled("combo", true);
+       set_opt_enabled("invert-loops", true);
+}
 
 /**
- * layout all frame-types of the Firm graph
+ * run all the Firm optimizations
+ *
+ * @param input_filename     the name of the (main) source file
  */
-static void compute_frame_type_sizes(void)
+static void do_firm_optimizations(const char *input_filename)
 {
-  int i;
-  ir_graph *irg;
-
-  /* all frame types */
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-    irg = get_irp_irg(i);
-    /* do not optimize away variables in debug mode */
-    if (firm_opt.debug_mode == DBG_MODE_NONE)
-      opt_frame_irg(irg);
-    compute_type_size(get_irg_frame_type(irg));
-  }
-}  /* compute_frame_type_sizes */
+       int      i;
+       unsigned aa_opt;
+
+       set_opt_alias_analysis(firm_opt.alias_analysis);
+
+       aa_opt = aa_opt_no_opt;
+       if (firm_opt.strict_alias)
+               aa_opt |= aa_opt_type_based | aa_opt_byte_type_may_alias;
+       if (firm_opt.no_alias)
+               aa_opt = aa_opt_no_alias;
+
+       set_irp_memory_disambiguator_options(aa_opt);
+
+       /* parameter passing code should set them directly sometime... */
+       set_opt_enabled("rts", !firm_opt.freestanding);
+       set_opt_enabled("gcse", firm_opt.gcse);
+       set_opt_enabled("place", !firm_opt.gcse);
+       set_opt_enabled("confirm", firm_opt.confirm);
+       set_opt_enabled("remove-confirms", firm_opt.confirm);
+
+       /* osr supersedes remove_phi_cycles */
+       if (get_opt_enabled("ivopts"))
+               set_opt_enabled("remove-phi-cycles", false);
+
+       timer_start(t_all_opt);
+
+       do_irp_opt("rts");
+
+       /* first step: kill dead code */
+       for (i = 0; i < get_irp_n_irgs(); i++) {
+               ir_graph *irg = get_irp_irg(i);
+               do_irg_opt(irg, "combo");
+               do_irg_opt(irg, "local");
+               do_irg_opt(irg, "control-flow");
+       }
+
+       do_irp_opt("remove-unused");
+       for (i = 0; i < get_irp_n_irgs(); ++i) {
+               ir_graph *irg = get_irp_irg(i);
+               do_irg_opt(irg, "opt-tail-rec");
+       }
+       do_irp_opt("opt-func-call");
+       do_irp_opt("lower-const");
+
+       for (i = 0; i < get_irp_n_irgs(); i++) {
+               ir_graph *irg = get_irp_irg(i);
+
+               do_irg_opt(irg, "scalar-replace");
+               do_irg_opt(irg, "invert-loops");
+               do_irg_opt(irg, "unroll-loops");
+               do_irg_opt(irg, "local");
+               do_irg_opt(irg, "reassociation");
+               do_irg_opt(irg, "local");
+               do_irg_opt(irg, "gcse");
+
+               if (firm_opt.confirm) {
+                       /* Confirm construction currently can only handle blocks with only
+                          one control flow predecessor. Calling optimize_cf here removes
+                          Bad predecessors and help the optimization of switch constructs.
+                        */
+                       do_irg_opt(irg, "control-flow");
+                       do_irg_opt(irg, "confirm");
+                       do_irg_opt(irg, "vrp");
+                       do_irg_opt(irg, "local");
+               }
+
+               do_irg_opt(irg, "control-flow");
+               do_irg_opt(irg, "opt-load-store");
+               do_irg_opt(irg, "fp-vrp");
+               do_irg_opt(irg, "lower");
+               do_irg_opt(irg, "deconv");
+               do_irg_opt(irg, "thread-jumps");
+               do_irg_opt(irg, "remove-confirms");
+               do_irg_opt(irg, "gvn-pre");
+               do_irg_opt(irg, "place");
+               do_irg_opt(irg, "control-flow");
+
+               if (do_irg_opt(irg, "if-conversion")) {
+                       do_irg_opt(irg, "local");
+                       do_irg_opt(irg, "control-flow");
+               }
+               /* this doesn't make too much sense but tests the mux destruction... */
+               do_irg_opt(irg, "lower-mux");
+
+               do_irg_opt(irg, "bool");
+               do_irg_opt(irg, "shape-blocks");
+               do_irg_opt(irg, "lower-switch");
+               do_irg_opt(irg, "ivopts");
+               do_irg_opt(irg, "local");
+               do_irg_opt(irg, "dead");
+               do_irg_opt(irg, "frame");
+       }
+
+       do_irp_opt("inline");
+       do_irp_opt("opt-proc-clone");
+
+       for (i = 0; i < get_irp_n_irgs(); i++) {
+               ir_graph *irg = get_irp_irg(i);
+               do_irg_opt(irg, "local");
+               do_irg_opt(irg, "control-flow");
+               do_irg_opt(irg, "thread-jumps");
+               do_irg_opt(irg, "local");
+               do_irg_opt(irg, "control-flow");
+
+               if( do_irg_opt(irg, "vrp") ) { // if vrp is enabled
+                       do_irg_opt(irg, "local");
+                       do_irg_opt(irg, "vrp");
+                       do_irg_opt(irg, "local");
+                       do_irg_opt(irg, "vrp");
+               }
+       }
+
+       if (firm_dump.ir_graph) {
+               /* recompute backedges for nicer dumps */
+               for (i = 0; i < get_irp_n_irgs(); i++)
+                       construct_cf_backedges(get_irp_irg(i));
+       }
+
+       dump_all("opt");
+
+       if (firm_dump.statistic & STAT_AFTER_OPT)
+               stat_dump_snapshot(input_filename, "opt");
+
+       timer_stop(t_all_opt);
+}
 
 /**
  * do Firm lowering
@@ -806,254 +594,155 @@ static void compute_frame_type_sizes(void)
  */
 static void do_firm_lowering(const char *input_filename)
 {
-  int i;
-
-  /* do class lowering and vtbl creation */
-//  lower_classes_to_struct("vtbl", "m");
-
-#if 0
-  timer_push(TV_LOWER);
-  lower_highlevel();
-  timer_pop();
-#endif
-
-  if (firm_opt.lower_ll) {
-    lwrdw_param_t init = {
-      1,
-      1,
-      mode_Ls, mode_Lu,
-      mode_Is, mode_Iu,
-      def_create_intrinsic_fkt,
-      NULL
-    };
-
-
-    if (arch_create_intrinsic) {
-      init.create_intrinsic = arch_create_intrinsic;
-      init.ctx              = create_intrinsic_ctx;
-    }
-    timer_push(TV_DW_LOWER);
-      lower_dw_ops(&init);
-    timer_pop();
-  }
-
-  if (firm_dump.statistic & STAT_AFTER_LOWER)
-    stat_dump_snapshot(input_filename, "low");
-
-  /* verify lowered graphs */
-  timer_push(TV_VERIFY);
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i)
-    irg_verify(get_irp_irg(i), VRFY_ENFORCE_SSA);
-  timer_pop();
-
-  DUMP_ALL(firm_dump.ir_graph, "-low");
-
-  if (firm_opt.enabled) {
-    timer_start(TV_ALL_OPT);
-
-    /* run reassociation first on all graphs BEFORE the architecture dependent optimizations
-       are enabled */
-    for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-      current_ir_graph = get_irp_irg(i);
-
-      timer_push(TV_REASSOCIATION);
-        optimize_reassociation(current_ir_graph);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, current_ir_graph, "reassoc");
-      CHECK_ONE(firm_opt.check_all, current_ir_graph);
-    }
-
-    /* enable architecture dependent optimizations */
-    arch_dep_set_opts((arch_dep_opts_t)
-                      ((firm_opt.muls ? arch_dep_mul_to_shift : arch_dep_none) |
-                      (firm_opt.divs ? arch_dep_div_by_const : arch_dep_none) |
-                      (firm_opt.mods ? arch_dep_mod_by_const : arch_dep_none) ));
-
-    for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-      current_ir_graph = get_irp_irg(i);
-
-      if (firm_opt.gcse)
-        set_opt_global_cse(1);
-
-      timer_push(TV_LOCAL_OPT);
-        optimize_graph_df(current_ir_graph);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, current_ir_graph, "lopt");
-      if (! firm_opt.gcse)
-        CHECK_ONE(firm_opt.check_all, current_ir_graph);
-
-      if (firm_opt.gcse) {
-        timer_push(TV_CODE_PLACE);
-          place_code(current_ir_graph);
-          set_opt_global_cse(0);
-        timer_pop();
-        DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, current_ir_graph, "place");
-        CHECK_ONE(firm_opt.check_all, current_ir_graph);
-      }
-
-      timer_push(TV_LOAD_STORE);
-        optimize_load_store(current_ir_graph);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, current_ir_graph, "ldst");
-      CHECK_ONE(firm_opt.check_all, current_ir_graph);
-
-
-      timer_push(TV_LOCAL_OPT);
-        optimize_graph_df(current_ir_graph);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, current_ir_graph, "lopt");
-
-      timer_push(TV_CF_OPT);
-        optimize_cf(current_ir_graph);
-      timer_pop();
-      DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, current_ir_graph, "cf");
-      CHECK_ONE(firm_opt.check_all, current_ir_graph);
-
-      if (firm_opt.if_conversion) {
-        timer_push(TV_IF_CONV);
-          opt_if_conv(current_ir_graph, if_conv_info);
-        timer_pop();
-        DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, current_ir_graph, "if");
-        CHECK_ONE(firm_opt.check_all, current_ir_graph);
-
-        timer_push(TV_LOCAL_OPT);
-          optimize_graph_df(current_ir_graph);
-        timer_pop();
-        timer_push(TV_CF_OPT);
-          optimize_cf(current_ir_graph);
-        timer_pop();
-        DUMP_ONE_C(firm_dump.ir_graph && firm_dump.all_phases, current_ir_graph, "after_if");
-        CHECK_ONE(firm_opt.check_all, current_ir_graph);
-      }
-    }
-    timer_stop(TV_ALL_OPT);
-
-    DUMP_ALL(firm_dump.ir_graph, "-low-opt");
-  }
-
-  if (firm_opt.cc_opt)
-    mark_private_methods();
-
-  /* set the phase to low */
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i)
-    set_irg_phase_low(get_irp_irg(i));
-
-  /* all graphs are lowered, set the irp phase to low */
-  set_irp_phase_state(phase_low);
-
-  if (firm_dump.statistic & STAT_FINAL) {
-    stat_dump_snapshot(input_filename, "final");
-  }
-}  /* do_firm_lowering */
+       int i;
+
+       do_irp_opt("lower-dw");
+
+       if (firm_dump.statistic & STAT_AFTER_LOWER)
+               stat_dump_snapshot(input_filename, "low");
+
+       dump_all("low");
+
+       if (firm_opt.enabled) {
+               timer_start(t_all_opt);
+
+               /* run reassociation first on all graphs BEFORE the architecture
+                  dependent optimizations are enabled */
+               for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+                       ir_graph *irg = get_irp_irg(i);
+                       do_irg_opt(irg, "reassociation");
+               }
+
+               /* enable architecture dependent optimizations */
+               arch_dep_set_opts((arch_dep_opts_t)
+                               ((firm_opt.muls ? arch_dep_mul_to_shift : arch_dep_none) |
+                                (firm_opt.divs ? arch_dep_div_by_const : arch_dep_none) |
+                                (firm_opt.mods ? arch_dep_mod_by_const : arch_dep_none) ));
+
+               for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+                       ir_graph *irg = get_irp_irg(i);
+
+                       do_irg_opt(irg, "local");
+                       do_irg_opt(irg, "gcse");
+                       do_irg_opt(irg, "opt-load-store");
+                       do_irg_opt(irg, "local");
+                       do_irg_opt(irg, "control-flow");
+
+                       if (do_irg_opt(irg, "vrp")) {
+                               do_irg_opt(irg, "local");
+                               do_irg_opt(irg, "control-flow");
+                               do_irg_opt(irg, "vrp");
+                               do_irg_opt(irg, "local");
+                               do_irg_opt(irg, "control-flow");
+                       }
+
+                       if (do_irg_opt(irg, "if-conversion")) {
+                               do_irg_opt(irg, "local");
+                               do_irg_opt(irg, "control-flow");
+                       }
+
+                       do_irg_opt(irg, "parallelize-mem");
+               }
+               timer_stop(t_all_opt);
+
+               do_irp_opt("remove-unused");
+
+               dump_all("low-opt");
+       }
+
+       if (firm_opt.cc_opt)
+               mark_private_methods();
+
+       /* set the phase to low */
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+               ir_graph *irg = get_irp_irg(i);
+               set_irg_phase_state(irg, phase_low);
+       }
+       set_irp_phase_state(phase_low);
+
+       if (firm_dump.statistic & STAT_FINAL) {
+               stat_dump_snapshot(input_filename, "final");
+       }
+}
 
 /**
  * Initialize for the Firm-generating back end.
  */
 void gen_firm_init(void)
 {
-  firm_parameter_t params;
-  unsigned         pattern = 0;
-
-  /* the automatic state is only set if inlining is enabled */
-  firm_opt.auto_inline = firm_opt.do_inline;
-
-  if (firm_dump.stat_pattern)
-    pattern |= FIRMSTAT_PATTERN_ENABLED;
-
-  if (firm_dump.stat_dag)
-    pattern |= FIRMSTAT_COUNT_DAG;
-
-  memset(&params, 0, sizeof(params));
-  params.size                  = sizeof(params);
-  params.enable_statistics     = firm_dump.statistic == STAT_NONE ? 0 :
-    FIRMSTAT_ENABLED | FIRMSTAT_COUNT_STRONG_OP | FIRMSTAT_COUNT_CONSTS | pattern;
-  params.initialize_local_func = uninitialized_local_var;
-  params.cc_mask               = 0; /* no regparam, cdecl */
-  params.builtin_dbg           = NULL;
-
-  #ifdef FIRM_EXT_GRS
-  /* Activate Graph rewriting if SIMD optimization is turned on */
-  /* This has to be done before init_firm() is called! */
-  if (firm_ext_grs.simd_opt)
-    ext_grs_activate();
-#endif
-
-  init_firm(&params);
-
-  if (firm_be_opt.selection == BE_FIRM_BE) {
-    const backend_params *be_params = be_get_backend_param();
-
-    firm_opt.lower_ll       = (a_byte) be_params->do_dw_lowering;
-    params.arch_op_settings = be_params->arch_op_settings;
-
-    arch_create_intrinsic   = be_params->arch_create_intrinsic_fkt;
-    create_intrinsic_ctx    = be_params->create_intrinsic_ctx;
-
-    ad_param                = be_params->dep_param;
-    if_conv_info            = be_params->if_conv_info;
-
-    if (be_params->has_imm_fp_mode)
-      firm_imm_fp_mode = be_params->imm_fp_mode;
-  }
-  /* OS option must be set to the backend */
-  switch (firm_opt.os_support) {
-  case OS_SUPPORT_MINGW:
-    firm_be_option("ia32-gasmode=mingw");
-    break;
-  case OS_SUPPORT_MACHO:
-    firm_be_option("ia32-gasmode=macho");
-    break;
-  case OS_SUPPORT_LINUX:
-  default:
-    firm_be_option("ia32-gasmode=linux");
-    break;
-  }
-
-  dbg_init(NULL, NULL, dbg_snprint);
-  edges_init_dbg(firm_opt.vrfy_edges);
-  //cbackend_set_debug_retrieve(dbg_retrieve);
-
-  set_opt_precise_exc_context(firm_opt.precise_exc);
-  set_opt_fragile_ops(firm_opt.fragile_ops);
-
-  /* Sel node cannot produce NULL pointers */
-  set_opt_sel_based_null_check_elim(1);
-
-  /* dynamic dispatch works currently only if whole world scenarios */
-  set_opt_dyn_meth_dispatch(0);
-
-  arch_dep_init(arch_factory);
-
-  /* do not run architecture dependent optimizations in building phase */
-  arch_dep_set_opts(arch_dep_none);
-
-  do_node_verification((firm_verification_t) firm_opt.vrfy);
-  if (firm_dump.filter)
-    only_dump_method_with_name(new_id_from_str(firm_dump.filter));
-
-  if (firm_opt.enabled) {
-    set_optimize(1);
-    set_opt_constant_folding(firm_opt.const_folding);
-    set_opt_algebraic_simplification(firm_opt.const_folding);
-    set_opt_cse(firm_opt.cse);
-    set_opt_global_cse(0);
-    set_opt_unreachable_code(1);
-    set_opt_control_flow(firm_opt.control_flow);
-    set_opt_control_flow_weak_simplification(1);
-    set_opt_control_flow_strong_simplification(1);
-  } else {
-    set_optimize(0);
-  }
-
-  /* do not dump entity ld names */
-  dump_ld_names(0);
-
-#if 0
-  /* init the ycomp debugger extension */
-  if (firm_opt.ycomp_dbg)
-    firm_init_ycomp_debugger(firm_opt.ycomp_host, firm_opt.ycomp_port);
-#endif
-}  /* gen_firm_init */
+       unsigned pattern = 0;
+       int      i;
+
+       for (i = 0; i < n_opts; ++i) {
+               timers[i] = ir_timer_new();
+               timer_register(timers[i], opts[i].description);
+       }
+       t_verify = ir_timer_new();
+       timer_register(t_verify, "Firm: verify pass");
+       t_vcg_dump = ir_timer_new();
+       timer_register(t_vcg_dump, "Firm: vcg dumping");
+       t_all_opt = ir_timer_new();
+       timer_register(t_all_opt, "Firm: all optimizations");
+
+       if (firm_dump.stat_pattern)
+               pattern |= FIRMSTAT_PATTERN_ENABLED;
+
+       if (firm_dump.stat_dag)
+               pattern |= FIRMSTAT_COUNT_DAG;
+
+       ir_init(NULL);
+       firm_init_stat(firm_dump.statistic == STAT_NONE ?
+                       0 : FIRMSTAT_ENABLED | FIRMSTAT_COUNT_STRONG_OP
+                       | FIRMSTAT_COUNT_CONSTS | pattern);
+
+       if (firm_be_opt.selection == BE_FIRM_BE) {
+               const backend_params *be_params = be_get_backend_param();
+
+               if (be_params->do_dw_lowering)
+                       set_opt_enabled("lower-dw", true);
+
+               arch_create_intrinsic   = be_params->arch_create_intrinsic_fkt;
+               create_intrinsic_ctx    = be_params->create_intrinsic_ctx;
+
+               ad_param                = be_params->dep_param;
+               if_conv_info            = be_params->if_conv_info;
+       }
+
+       edges_init_dbg(firm_opt.verify_edges);
+
+       /* Sel node cannot produce NULL pointers */
+       set_opt_sel_based_null_check_elim(1);
+
+       /* dynamic dispatch works currently only if whole world scenarios */
+       set_opt_dyn_meth_dispatch(0);
+
+       arch_dep_init(arch_factory);
+
+       /* do not run architecture dependent optimizations in building phase */
+       arch_dep_set_opts(arch_dep_none);
+
+       do_node_verification((firm_verification_t) firm_opt.verify);
+       if (firm_dump.filter != NULL)
+               ir_set_dump_filter(firm_dump.filter);
+       if (firm_dump.extbb)
+               ir_add_dump_flags(ir_dump_flag_group_extbb);
+       if (firm_dump.no_blocks)
+               ir_remove_dump_flags(ir_dump_flag_blocks_as_subgraphs);
+
+       if (firm_opt.enabled) {
+               set_optimize(1);
+               set_opt_constant_folding(firm_opt.const_folding);
+               set_opt_algebraic_simplification(firm_opt.const_folding);
+               set_opt_cse(firm_opt.cse);
+               set_opt_global_cse(0);
+               set_opt_unreachable_code(1);
+               set_opt_control_flow(firm_opt.control_flow);
+               set_opt_control_flow_weak_simplification(1);
+               set_opt_control_flow_strong_simplification(1);
+       } else {
+               set_optimize(0);
+       }
+}
 
 /**
  * Called, after the Firm generation is completed,
@@ -1062,135 +751,149 @@ void gen_firm_init(void)
  * @param out                a file handle for the output, may be NULL
  * @param input_filename     the name of the (main) source file
  * @param c_mode             non-zero if "C" was compiled
- * @param firm_const_exists  non-zero, if the const attribute was used on functions
+ * @param new_firm_const_exists  non-zero, if the const attribute was used on functions
  */
-void gen_firm_finish(FILE *out, const char *input_filename, int c_mode, int firm_const_exists)
+void gen_firm_finish(FILE *out, const char *input_filename,
+                     int new_firm_const_exists)
 {
-  int i;
-
-  /* the general for dumping option must be set, or the others will not work */
-  firm_dump.ir_graph
-      = (a_byte) (firm_dump.ir_graph | firm_dump.all_phases | firm_dump.extbb);
-
-  dump_keepalive_edges(1);
-  dump_consts_local(1);
-  dump_dominator_information(1);
-  dump_loop_information(0);
-
-  if (!firm_dump.edge_labels)
-    turn_off_edge_labels();
-
-  if (firm_dump.all_types) {
-    dump_all_types("");
-    if (! c_mode) {
-      dump_class_hierarchy(0, "");
-      dump_class_hierarchy(1, "-with-entities");
-    }
-  }
-
-  /* finalize all graphs */
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-    ir_graph *irg = get_irp_irg(i);
-
-    irg_finalize_cons(irg);
-    DUMP_ONE(firm_dump.ir_graph, irg, "");
-
-    /* verify the graph */
-    timer_push(TV_VERIFY);
-      irg_verify(irg, VRFY_ENFORCE_SSA);
-    timer_pop();
-  }
-
-  timer_push(TV_VERIFY);
-    tr_vrfy();
-  timer_pop();
-
-  /* all graphs are finalized, set the irp phase to high */
-  set_irp_phase_state(phase_high);
-
-  /* BEWARE: kill unreachable code before doing compound lowering */
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-    ir_graph *irg = get_irp_irg(i);
-    optimize_cf(irg);
-  }
-
-  /* lower all compound call return values */
-  lower_compound_params();
-
-  /* computes the sizes of all types that are still not computed */
-  compute_type_sizes();
-
-  /* lower copyb nodes */
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-    ir_graph *irg = get_irp_irg(i);
-    lower_CopyB(irg, 128, 4);
-  }
-
-  if (firm_dump.statistic & STAT_BEFORE_OPT) {
-    stat_dump_snapshot(input_filename, "noopt");
-  }
-
-  if (firm_opt.enabled) {
-    do_firm_optimizations(input_filename, firm_const_exists);
-    do_firm_optimizations(input_filename, firm_const_exists);
-    do_firm_optimizations(input_filename, firm_const_exists);
-  }
-
-  if (firm_dump.gen_firm_asm) {
-    timer_push(TV_FIRM_ASM);
-      gen_Firm_assembler(input_filename);
-    timer_pop();
-    return;
-  }
-
-  if (firm_opt.lower)
-    do_firm_lowering(input_filename);
-
-  /* computes the sizes of all frame types */
-  compute_frame_type_sizes();
-
-  /* set the phase to low */
-  for (i = get_irp_n_irgs() - 1; i >= 0; --i)
-    set_irg_phase_low(get_irp_irg(i));
-
-
-#ifdef FIRM_EXT_GRS
-  /** SIMD Optimization  Extensions **/
-
-  /* Pattern creation step. No code has to be generated, so
-     exit after pattern creation */
-  if (firm_ext_grs.create_pattern) {
-    ext_grs_create_pattern();
-    exit(0);
-  }
-
-  /* SIMD optimization step. Uses graph patterns to find
-     rich instructions and rewrite */
-  if (firm_ext_grs.simd_opt)
-    ext_grs_simd_opt();
+       int i;
+
+#if 0
+       if (firm_opt.enable_statev) {
+               char buf[1024];
+               snprintf(buf, sizeof(buf), "%s.ev", input_filename);
+               ir_stat_ev_begin(input_filename, firm_opt.statev_filter);
+               ir_stat_ev_compilation_unit(input_filename);
+       }
 #endif
 
-  if (firm_dump.statistic & STAT_FINAL_IR)
-    stat_dump_snapshot(input_filename, "final-ir");
+       firm_const_exists = new_firm_const_exists;
 
-  /* run the code generator */
-  if (firm_be_opt.selection != BE_NONE)
-    do_codegen(out, input_filename);
+       /* the general for dumping option must be set, or the others will not work*/
+       firm_dump.ir_graph
+               = (a_byte) (firm_dump.ir_graph | firm_dump.all_phases | firm_dump.extbb);
 
-  if (firm_dump.statistic & STAT_FINAL)
-    stat_dump_snapshot(input_filename, "final");
+       ir_add_dump_flags(ir_dump_flag_keepalive_edges
+                       | ir_dump_flag_consts_local | ir_dump_flag_dominance);
+       ir_remove_dump_flags(ir_dump_flag_loops | ir_dump_flag_ld_names);
 
-#if 0
-  if (firm_opt.ycomp_dbg)
-    firm_finish_ycomp_debugger();
-#endif
-}  /* gen_firm_finish */
+       /* FIXME: cloning might ADD new graphs. */
+       irg_dump_no = calloc(get_irp_last_idx(), sizeof(*irg_dump_no));
+
+       if (firm_dump.all_types) {
+               dump_ir_prog_ext(dump_typegraph, "types.vcg");
+       }
+
+       /* finalize all graphs */
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+               ir_graph *irg = get_irp_irg(i);
+               irg_finalize_cons(irg);
+       }
+       dump_all("");
+
+       timer_push(t_verify);
+       tr_verify();
+       timer_pop(t_verify);
+
+       /* all graphs are finalized, set the irp phase to high */
+       set_irp_phase_state(phase_high);
+
+       /* BEWARE: kill unreachable code before doing compound lowering */
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+               ir_graph *irg = get_irp_irg(i);
+               do_irg_opt(irg, "control-flow");
+       }
+
+       /* lower all compound call return values */
+       lower_compound_params();
+
+       /* lower copyb nodes */
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+               ir_graph *irg = get_irp_irg(i);
+               lower_CopyB(irg, 128, 4);
+       }
+
+       if (firm_dump.statistic & STAT_BEFORE_OPT) {
+               stat_dump_snapshot(input_filename, "noopt");
+       }
+
+       if (firm_opt.enabled)
+               do_firm_optimizations(input_filename);
+
+       if (firm_opt.lower)
+               do_firm_lowering(input_filename);
+
+       /* set the phase to low */
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i)
+               set_irg_phase_low(get_irp_irg(i));
+
+       if (firm_dump.statistic & STAT_FINAL_IR)
+               stat_dump_snapshot(input_filename, "final-ir");
+
+       /* run the code generator */
+       if (firm_be_opt.selection != BE_NONE)
+               do_codegen(out, input_filename);
+
+       if (firm_dump.statistic & STAT_FINAL)
+               stat_dump_snapshot(input_filename, "final");
+}
+
+void disable_all_opts(void)
+{
+       for (int i = 0; i < n_opts; ++i) {
+               opt_config_t *config = &opts[i];
+               if (config->flags & OPT_FLAG_ESSENTIAL) {
+                       config->flags |= OPT_FLAG_ENABLED;
+               } else {
+                       config->flags &= ~OPT_FLAG_ENABLED;
+               }
+       }
+}
+
+int firm_opt_option(const char *opt)
+{
+       bool enable = true;
+       if (strncmp(opt, "no-", 3) == 0) {
+               enable = false;
+               opt = opt + 3;
+       }
+
+       opt_config_t *config = get_opt(opt);
+       if (config == NULL || (config->flags & OPT_FLAG_HIDE_OPTIONS))
+               return 0;
+
+       config->flags &= ~OPT_FLAG_ENABLED;
+       config->flags |= enable ? OPT_FLAG_ENABLED : 0;
+       return 1;
+}
+
+void firm_opt_option_help(void)
+{
+       int i;
+
+       for (i = 0; i < n_opts; ++i) {
+               char buf[1024];
+               char buf2[1024];
+
+               const opt_config_t *config = &opts[i];
+               if (config->flags & OPT_FLAG_HIDE_OPTIONS)
+                       continue;
+
+               snprintf(buf2, sizeof(buf2), "firm: enable %s", config->description);
+               print_option_help(config->name, buf2);
+               snprintf(buf, sizeof(buf), "no-%s", config->name);
+               snprintf(buf2, sizeof(buf2), "firm: disable %s", config->description);
+               print_option_help(buf, buf2);
+       }
+}
 
 /**
  * Do very early initializations
  */
-void firm_early_init(void) {
-  /* arg: need this here for command line options */
-  be_opt_register();
-  firm_init_options(NULL, 0, NULL);
-}  /* firm_early_init */
+void firm_early_init(void)
+{
+       /* arg: need this here for command line options */
+       be_opt_register();
+
+       enable_safe_defaults();
+}