From f4e0c424e0306a178d298be505535dd387810ca2 Mon Sep 17 00:00:00 2001 From: Adam Szalkowski Date: Thu, 5 Oct 2006 13:08:41 +0000 Subject: [PATCH] enumaration of possible enum values is now done by libcore --- ir/be/bechordal_main.c | 10 +++++----- ir/be/becopyheur2.c | 6 +++--- ir/be/becopyheur3.c | 2 +- ir/be/becopyilp.c | 6 +++--- ir/be/becopyopt.c | 4 ++-- ir/be/belistsched.c | 4 ++-- ir/be/bemain.c | 2 +- ir/be/beschedrss.c | 2 +- ir/be/bespillremat.c | 12 ++++++------ 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index d2ebfa335..0483d6fb3 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -233,12 +233,12 @@ static lc_opt_enum_int_var_t be_ch_vrfy_var = { static const lc_opt_table_entry_t be_chordal_options[] = { LC_OPT_ENT_STR ("statfile", "the name of the statisctics file", stat_file_name, sizeof(stat_file_name)), - LC_OPT_ENT_BOOL ("spill.coal", "coalesce the spill slots (default: yes)", &coalesce_spill_slots), - LC_OPT_ENT_ENUM_INT ("spill", "spill method (belady, morgan or remat)", &spill_var), - LC_OPT_ENT_ENUM_PTR ("ifg", "interference graph flavour (std, fast, clique, pointer, list, check)", &ifg_flavor_var), - LC_OPT_ENT_ENUM_PTR ("perm", "perm lowering options (copy or swap)", &lower_perm_var), + LC_OPT_ENT_BOOL ("spill.coal", "coalesce the spill slots", &coalesce_spill_slots), + LC_OPT_ENT_ENUM_INT ("spill", "spill method", &spill_var), + LC_OPT_ENT_ENUM_PTR ("ifg", "interference graph flavour", &ifg_flavor_var), + LC_OPT_ENT_ENUM_PTR ("perm", "perm lowering options", &lower_perm_var), LC_OPT_ENT_ENUM_MASK("dump", "select dump phases", &dump_var), - LC_OPT_ENT_ENUM_PTR ("vrfy", "verify options (off, warn, assert)", &be_ch_vrfy_var), + LC_OPT_ENT_ENUM_PTR ("vrfy", "verify options", &be_ch_vrfy_var), LC_OPT_ENT_BOOL ("elrsplit", "enable extreme live range splitting", &be_elr_split), LC_OPT_ENT_INT ("loop_weight", "assumed amount of loop iterations for guessing the execution frequency", &be_loop_weight), { NULL } diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c index a456ccc72..51f23b4cf 100644 --- a/ir/be/becopyheur2.c +++ b/ir/be/becopyheur2.c @@ -62,10 +62,10 @@ static lc_opt_enum_mask_var_t dump_var = { }; static const lc_opt_table_entry_t options[] = { - LC_OPT_ENT_ENUM_MASK("dump", "dump ifg before, after or after each cloud", &dump_var), - LC_OPT_ENT_INT ("iter", "iterations for subtree nodes (standard: 3)", &subtree_iter), + LC_OPT_ENT_ENUM_MASK("dump", "dump ifg cloud", &dump_var), + LC_OPT_ENT_INT ("iter", "iterations for subtree nodes", &subtree_iter), LC_OPT_ENT_DBL ("cf", "factor of constraint importance (between 0.0 and 1.0)", &constr_factor), - LC_OPT_ENT_INT ("max", "maximum recursion depth (default 20)", &max_depth), + LC_OPT_ENT_INT ("max", "maximum recursion depth", &max_depth), { NULL } }; diff --git a/ir/be/becopyheur3.c b/ir/be/becopyheur3.c index 62320ae2b..a5a671d45 100644 --- a/ir/be/becopyheur3.c +++ b/ir/be/becopyheur3.c @@ -61,7 +61,7 @@ static lc_opt_enum_mask_var_t dump_var = { }; static const lc_opt_table_entry_t options[] = { - LC_OPT_ENT_ENUM_MASK("dump", "dump ifg before, after or after each cloud", &dump_var), + LC_OPT_ENT_ENUM_MASK("dump", "dump ifg cloud", &dump_var), LC_OPT_ENT_INT ("dbg", "debug level for the Java coalescer", &dbg_level), { NULL } }; diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c index d17de6e89..9ef100e5c 100644 --- a/ir/be/becopyilp.c +++ b/ir/be/becopyilp.c @@ -38,10 +38,10 @@ static lc_opt_enum_mask_var_t dump_var = { }; static const lc_opt_table_entry_t options[] = { - LC_OPT_ENT_INT ("limit", "time limit for solving in seconds (0 for unlimited, default 60)", &time_limit), - LC_OPT_ENT_BOOL ("net", "solve over the net (default: yes)", &solve_net), + LC_OPT_ENT_INT ("limit", "time limit for solving in seconds (0 for unlimited)", &time_limit), + LC_OPT_ENT_BOOL ("net", "solve over the net", &solve_net), LC_OPT_ENT_BOOL ("log", "show ilp solving log", &solve_log), - LC_OPT_ENT_ENUM_MASK("dump", "dump flags (ilp, sol)", &dump_var), + LC_OPT_ENT_ENUM_MASK("dump", "dump flags", &dump_var), { NULL } }; diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c index e2d165c44..2aa6f5a2c 100644 --- a/ir/be/becopyopt.c +++ b/ir/be/becopyopt.c @@ -116,8 +116,8 @@ static lc_opt_enum_func_ptr_var_t cost_func_var = { }; static const lc_opt_table_entry_t options[] = { - LC_OPT_ENT_ENUM_INT ("algo", "select copy optimization algo (heur, heur2, heur3, ilp)", &algo_var), - LC_OPT_ENT_ENUM_FUNC_PTR ("cost", "select a cost function (freq, loop, one)", &cost_func_var), + LC_OPT_ENT_ENUM_INT ("algo", "select copy optimization algo", &algo_var), + LC_OPT_ENT_ENUM_FUNC_PTR ("cost", "select a cost function", &cost_func_var), LC_OPT_ENT_ENUM_MASK ("dump", "dump ifg before or after copy optimization", &dump_var), LC_OPT_ENT_ENUM_MASK ("style", "dump style for ifg dumping", &style_var), LC_OPT_ENT_BOOL ("stats", "dump statistics after each optimization", &do_stats), diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c index 99de8dde7..6eadc3a9c 100644 --- a/ir/be/belistsched.c +++ b/ir/be/belistsched.c @@ -100,8 +100,8 @@ static lc_opt_enum_int_var_t sched_prep_var = { }; static const lc_opt_table_entry_t list_sched_option_table[] = { - LC_OPT_ENT_ENUM_PTR("prep", "schedule preparation (none, mris, rss)", &sched_prep_var), - LC_OPT_ENT_ENUM_PTR("select", "node selector (trivial, random, regpress, muchnik, heur, hmuchnik)", &sched_select_var), + LC_OPT_ENT_ENUM_PTR("prep", "schedule preparation", &sched_prep_var), + LC_OPT_ENT_ENUM_PTR("select", "node selector", &sched_select_var), { NULL } }; #endif /* WITH_LIBCORE */ diff --git a/ir/be/bemain.c b/ir/be/bemain.c index a9e2b242f..0243bc4dd 100644 --- a/ir/be/bemain.c +++ b/ir/be/bemain.c @@ -156,7 +156,7 @@ static const lc_opt_table_entry_t be_main_options[] = { LC_OPT_ENT_ENUM_PTR ("isa", "the instruction set architecture", &isa_var), LC_OPT_ENT_NEGBOOL ("noomitfp", "do not omit frame pointer", &be_options.omit_fp), LC_OPT_ENT_BOOL ("stabs", "enable stabs debug support", &be_options.stabs_debug_support), - LC_OPT_ENT_ENUM_PTR ("vrfy", "verify the backend irg (off, warn, assert)", &vrfy_var), + 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), diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c index 6dc0a9172..ed637e917 100644 --- a/ir/be/beschedrss.c +++ b/ir/be/beschedrss.c @@ -190,7 +190,7 @@ static lc_opt_enum_int_var_t dump_var = { }; static const lc_opt_table_entry_t rss_option_table[] = { - LC_OPT_ENT_ENUM_MASK("dump", "dump phases (none, cbc, pkg, kill, dvg, maxac, all)", &dump_var), + LC_OPT_ENT_ENUM_MASK("dump", "dump phases", &dump_var), { NULL } }; #endif /* WITH_LIBCORE */ diff --git a/ir/be/bespillremat.c b/ir/be/bespillremat.c index 0de1bdca1..576e93884 100644 --- a/ir/be/bespillremat.c +++ b/ir/be/bespillremat.c @@ -94,7 +94,7 @@ static int opt_remat_while_live = 1; static int opt_timeout = 300; static double opt_cost_reload = 8.0; static double opt_cost_memoperand = 7.0; -static double opt_cost_spill = 50.0; +static double opt_cost_spill = 15.0; static double opt_cost_remat = 1.0; @@ -136,17 +136,17 @@ static lc_opt_enum_mask_var_t remats_var = { }; static const lc_opt_table_entry_t options[] = { - LC_OPT_ENT_ENUM_MASK("keepalive", "keep alive remats, spills or reloads", &keep_alive_var), + LC_OPT_ENT_ENUM_MASK("keepalive", "keep alive inserted nodes", &keep_alive_var), LC_OPT_ENT_BOOL ("goodwin", "activate goodwin reduction", &opt_goodwin), LC_OPT_ENT_BOOL ("memcopies", "activate memcopy handling", &opt_memcopies), LC_OPT_ENT_BOOL ("memoperands", "activate memoperands", &opt_memoperands), - LC_OPT_ENT_ENUM_INT ("remats", "type of remats to insert (none, briggs, noinverse or all)",&remats_var), + LC_OPT_ENT_ENUM_INT ("remats", "type of remats to insert", &remats_var), LC_OPT_ENT_BOOL ("repair_schedule", "repair the schedule by rematting once used nodes",&opt_repair_schedule), LC_OPT_ENT_BOOL ("no_enlage_liveness", "do not enlarge liveness of operands of remats",&opt_no_enlarge_liveness), LC_OPT_ENT_BOOL ("remat_while_live", "only remat where rematted value was live", &opt_remat_while_live), - LC_OPT_ENT_ENUM_MASK("dump", "dump problem, mps, solution, stats or pressure", &dump_var), + LC_OPT_ENT_ENUM_MASK("dump", "dump problem, solution or statistical data", &dump_var), LC_OPT_ENT_BOOL ("log", "activate the lpp log", &opt_log), LC_OPT_ENT_INT ("timeout", "ILP solver timeout", &opt_timeout), @@ -1564,8 +1564,6 @@ luke_endwalker(ir_node * bb, void * data) ir_snprintf(buf, sizeof(buf), "reg_out_%N_%N", irn, bb); spill->reg_out = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0); - /* if irn is used at the end of the block, then it is live anyway */ - //lpp_set_factor_fast(si->lpp, cst, spill->reg_out, 1.0); ir_snprintf(buf, sizeof(buf), "mem_out_%N_%N", irn, bb); spill->mem_out = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0); @@ -2292,6 +2290,7 @@ skip_one_must_die: #endif } } else { +#if 0 pset_foreach(defs, tmp) { op_t *tmp_op = get_irn_link(tmp); spill_t *spill = set_find_spill(spill_bb->ilp, tmp); @@ -2304,6 +2303,7 @@ skip_one_must_die: lpp_set_factor_fast(si->lpp, cst, tmp_op->attr.live_range.ilp, 1.0); lpp_set_factor_fast(si->lpp, cst, spill->spill, 1.0); } +#endif } -- 2.20.1