X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=driver%2Ffirm_opt.c;h=defb7aa8d18ffddcd867200670d980c19ec1d328;hb=b8f4fc13774d296a361e9e80e813a7eb906fc54b;hp=e7a94f280f76a692f83a6c585df8dae3a106fb58;hpb=afbab1f29cbc2b46c6f161b22c13e7e88c269ba6;p=cparser diff --git a/driver/firm_opt.c b/driver/firm_opt.c index e7a94f2..defb7aa 100644 --- a/driver/firm_opt.c +++ b/driver/firm_opt.c @@ -1,12 +1,9 @@ /** - * - * @file firm_opt.c -- Firm-generating back end optimizations. - * - * (C) 2005-2010 Michael Beck beck@ipd.info.uni-karlsruhe.de - * - * $Id$ + * (C) 2005-2010 + * @file + * @author Michael Beck, Matthias Braun + * @brief Firm-generating back end optimizations. */ - #include #include @@ -38,7 +35,6 @@ struct a_firm_opt { int clone_threshold; /**< The threshold value for procedure cloning. */ unsigned inline_maxsize; /**< Maximum function size for inlining. */ unsigned inline_threshold;/**< Inlining benefice threshold. */ - bool verify_edges; /**< verify edges */ }; /** statistic options */ @@ -55,8 +51,6 @@ typedef enum a_firmstat_selection_tag { struct a_firm_dump { bool debug_print; /**< enable debug print */ bool all_types; /**< dump the All_types graph */ - bool no_blocks; /**< dump non-blocked graph */ - bool extbb; /**< dumps extended basic blocks */ bool ir_graph; /**< dump all graphs */ bool all_phases; /**< dump the IR graph after all phases */ bool statistic; /**< Firm statistic setting */ @@ -85,15 +79,12 @@ static struct a_firm_opt firm_opt = { .clone_threshold = DEFAULT_CLONE_THRESHOLD, .inline_maxsize = 750, .inline_threshold = 0, - .verify_edges = false, }; /* dumping options */ static struct a_firm_dump firm_dump = { .debug_print = false, .all_types = false, - .no_blocks = false, - .extbb = false, .ir_graph = false, .all_phases = false, .statistic = STAT_NONE, @@ -141,14 +132,10 @@ static const struct params { { X("verify-report"), &firm_opt.verify, FIRM_VERIFICATION_REPORT, "node verification, report only" }, { X("check-all"), &firm_opt.check_all, 1, "enable checking all Firm phases" }, { X("no-check-all"), &firm_opt.check_all, 0, "disable checking all Firm phases" }, - { X("verify-edges-on"), &firm_opt.verify_edges, 1, "enable out edge verification" }, - { X("verify-edges-off"), &firm_opt.verify_edges, 0, "disable out edge verification" }, /* dumping */ { X("dump-ir"), &firm_dump.ir_graph, 1, "dump IR graph" }, { X("dump-all-types"), &firm_dump.all_types, 1, "dump graph of all types" }, - { X("dump-no-blocks"), &firm_dump.no_blocks, 1, "dump non-blocked graph" }, - { X("dump-extbb"), &firm_dump.extbb, 1, "dump extended basic blocks" }, { X("dump-all-phases"), &firm_dump.all_phases, 1, "dump graphs for all optimization phases" }, { X("dump-filter="), NULL, 0, "set dumper filter" }, @@ -167,6 +154,7 @@ static const struct params { static ir_timer_t *t_vcg_dump; static ir_timer_t *t_verify; static ir_timer_t *t_all_opt; +static ir_timer_t *t_backend; static bool do_irg_opt(ir_graph *irg, const char *name); /** dump all the graphs depending on cond */ @@ -182,7 +170,7 @@ static void dump_all(const char *suffix) } /* entities of runtime functions */ -ir_entity_ptr rts_entities[rts_max]; +ir_entity *rts_entities[rts_max]; /** * Map runtime functions. @@ -190,7 +178,7 @@ ir_entity_ptr rts_entities[rts_max]; static void rts_map(void) { static const struct { - ir_entity_ptr *ent; /**< address of the rts entity */ + ir_entity **ent; /**< address of the rts entity */ i_mapper_func func; /**< mapper function. */ } mapper[] = { /* integer */ @@ -273,10 +261,10 @@ static void rts_map(void) { &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; + i_record rec[lengthof(mapper)]; + size_t n_map = 0; - for (i = n_map = 0; i < sizeof(mapper)/sizeof(mapper[0]); ++i) { + for (size_t i = 0; i != lengthof(mapper); ++i) { if (*mapper[i].ent != NULL) { rec[n_map].i_call.kind = INTRINSIC_CALL; rec[n_map].i_call.i_ent = *mapper[i].ent; @@ -329,11 +317,6 @@ static void do_gcse(ir_graph *irg) set_opt_global_cse(0); } -static void lower_blockcopy(ir_graph *irg) -{ - lower_CopyB(irg, 128, 4); -} - typedef enum opt_target { OPT_TARGET_IRG, /**< optimization function works on a single graph */ OPT_TARGET_IRP /**< optimization function works on the complete program */ @@ -380,7 +363,7 @@ static opt_config_t opts[] = { IRG("if-conversion", opt_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("local", local_opts, "local graph optimizations", OPT_FLAG_HIDE_OPTIONS), IRG("lower", lower_highlevel_graph, "lowering", OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_ESSENTIAL), IRG("lower-mux", do_lower_mux, "mux lowering", OPT_FLAG_NONE), IRG("opt-load-store", optimize_load_store, "load store optimization", OPT_FLAG_NONE), @@ -398,7 +381,6 @@ static opt_config_t opts[] = { IRG("vrp", set_vrp_data, "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), - IRG("lower-blockcopy", lower_blockcopy, "replace small block copies with load/store sequences", OPT_FLAG_NO_DUMP), IRP("target-lowering", be_lower_for_target, "lowering necessary for target architecture", OPT_FLAG_HIDE_OPTIONS | OPT_FLAG_ESSENTIAL), IRP("opt-func-call", optimize_funccalls, "function call optimization", OPT_FLAG_NONE), IRP("opt-proc-clone", do_cloning, "procedure cloning", OPT_FLAG_NONE), @@ -414,7 +396,7 @@ static opt_config_t opts[] = { static opt_config_t *get_opt(const char *name) { FOR_EACH_OPT(config) { - if (strcmp(config->name, name) == 0) + if (streq(config->name, name)) return config; } @@ -515,7 +497,6 @@ static void enable_safe_defaults(void) set_opt_enabled("confirm", true); set_opt_enabled("opt-load-store", true); set_opt_enabled("lower", true); - set_opt_enabled("lower-blockcopy", true); set_opt_enabled("deconv", true); set_opt_enabled("remove-confirms", true); set_opt_enabled("ivopts", true); @@ -690,7 +671,6 @@ static void do_firm_lowering(const char *input_filename) for (i = get_irp_n_irgs() - 1; i >= 0; --i) { ir_graph *irg = get_irp_irg(i); - do_irg_opt(irg, "lower-blockcopy"); do_irg_opt(irg, "local"); do_irg_opt(irg, "deconv"); do_irg_opt(irg, "control-flow"); @@ -733,7 +713,8 @@ static void do_firm_lowering(const char *input_filename) */ void gen_firm_init(void) { - unsigned pattern = 0; + ir_init(); + enable_safe_defaults(); FOR_EACH_OPT(i) { i->timer = ir_timer_new(); @@ -745,6 +726,13 @@ void gen_firm_init(void) timer_register(t_vcg_dump, "Firm: vcg dumping"); t_all_opt = ir_timer_new(); timer_register(t_all_opt, "Firm: all optimizations"); + t_backend = ir_timer_new(); + timer_register(t_backend, "Firm: backend"); +} + +static void init_statistics(void) +{ + unsigned pattern = 0; if (firm_dump.stat_pattern) pattern |= FIRMSTAT_PATTERN_ENABLED; @@ -752,34 +740,9 @@ void gen_firm_init(void) 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); - - 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); - - /* 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.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); - - 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); } /** @@ -788,15 +751,20 @@ 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 */ -void gen_firm_finish(FILE *out, const char *input_filename) +void generate_code(FILE *out, const char *input_filename) { int i; + /* initialize implicit opts, just to be sure because really the frontend + * should have called it already before starting graph construction */ + init_implicit_optimizations(); + init_statistics(); + + do_node_verification((firm_verification_t) firm_opt.verify); + /* the general for dumping option must be set, or the others will not work*/ - firm_dump.ir_graph - = (bool) (firm_dump.ir_graph | firm_dump.all_phases | firm_dump.extbb); + firm_dump.ir_graph = (bool) (firm_dump.ir_graph | firm_dump.all_phases); ir_add_dump_flags(ir_dump_flag_keepalive_edges | ir_dump_flag_consts_local | ir_dump_flag_dominance); @@ -809,11 +777,6 @@ void gen_firm_finish(FILE *out, const char *input_filename) 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); @@ -827,7 +790,6 @@ void gen_firm_finish(FILE *out, const char *input_filename) for (i = get_irp_n_irgs() - 1; i >= 0; --i) { ir_graph *irg = get_irp_irg(i); do_irg_opt(irg, "control-flow"); - do_irg_opt(irg, "lower-blockcopy"); } if (firm_dump.statistic & STAT_BEFORE_OPT) { @@ -845,16 +807,19 @@ void gen_firm_finish(FILE *out, const char *input_filename) stat_dump_snapshot(input_filename, "final-ir"); /* run the code generator */ - ir_timer_t *timer = ir_timer_new(); - timer_register(timer, "Firm: backend"); - timer_start(timer); + timer_start(t_backend); be_main(out, input_filename); - timer_stop(timer); + timer_stop(t_backend); if (firm_dump.statistic & STAT_FINAL) stat_dump_snapshot(input_filename, "final"); } +void gen_firm_finish(void) +{ + ir_finish(); +} + static void disable_all_opts(void) { firm_opt.cse = false; @@ -865,6 +830,7 @@ static void disable_all_opts(void) firm_opt.alias_analysis = false; firm_opt.strict_alias = false; firm_opt.no_alias = false; + firm_opt.const_folding = false; FOR_EACH_OPT(config) { if (config->flags & OPT_FLAG_ESSENTIAL) { @@ -877,11 +843,8 @@ static void disable_all_opts(void) static bool firm_opt_option(const char *opt) { - bool enable = true; - if (strncmp(opt, "no-", 3) == 0) { - enable = false; - opt = opt + 3; - } + char const* const rest = strstart(opt, "no-"); + bool const enable = rest ? opt = rest, false : true; opt_config_t *config = get_opt(opt); if (config == NULL || (config->flags & OPT_FLAG_HIDE_OPTIONS)) @@ -894,8 +857,6 @@ static bool firm_opt_option(const char *opt) void firm_option_help(print_option_help_func print_option_help) { - print_option_help(firm_options[0].option, firm_options[0].description); - FOR_EACH_OPT(config) { char buf[1024]; char buf2[1024]; @@ -911,8 +872,7 @@ void firm_option_help(print_option_help_func print_option_help) print_option_help(buf, buf2); } - size_t const n_options = sizeof(firm_options)/sizeof(firm_options[0]); - for (size_t k = 0; k < n_options; ++k) { + for (size_t k = 0; k != lengthof(firm_options); ++k) { char buf[1024]; char buf2[1024]; snprintf(buf, sizeof(buf), "-f%s", firm_options[k].option); @@ -942,10 +902,9 @@ int firm_option(const char *const opt) } size_t const len = strlen(opt); - size_t const n_options = sizeof(firm_options)/sizeof(firm_options[0]); - for (size_t i = n_options; i != 0;) { + for (size_t i = lengthof(firm_options); i != 0;) { struct params const* const o = &firm_options[--i]; - if (len == o->opt_len && strncmp(opt, o->option, len) == 0) { + if (len == o->opt_len && memcmp(opt, o->option, len) == 0) { /* statistic options do accumulate */ if (o->flag == &firm_dump.statistic) *o->flag = (bool) (*o->flag | o->set); @@ -1005,13 +964,11 @@ void choose_optimization_pack(int level) } } -/** - * Do very early initializations - */ -void firm_early_init(void) +void init_implicit_optimizations(void) { - /* arg: need this here for command line options */ - be_opt_register(); - - enable_safe_defaults(); + 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); }