X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=7fa9c069b356ba0dc55e735276a187031a908e0e;hb=1b8713c0eca7389d9db2a74302e206d718edc902;hp=4be454229910b230a8e5049b56cb779dfb819ba4;hpb=8805e4fb65465abb2ed0ccde2377097c8f9d48c9;p=libfirm diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c index 4be454229..7fa9c069b 100644 --- a/ir/be/becopystat.c +++ b/ir/be/becopystat.c @@ -11,7 +11,9 @@ #include #include "irgraph.h" #include "irprog.h" +#include "iredges.h" #include "phiclass_t.h" +#include "beutil.h" #include "becopyopt.h" #include "becopystat.h" #include "xmalloc.h" @@ -21,9 +23,9 @@ #define DEBUG_LVL SET_LEVEL_1 static firm_dbg_module_t *dbg = NULL; -#define MAX_ARITY 10 -#define MAX_CLS_SIZE 10 -#define MAX_CLS_PHIS 10 +#define MAX_ARITY 20 +#define MAX_CLS_SIZE 20 +#define MAX_CLS_PHIS 20 /** * For an explanation of these values see the code of copystat_dump_pretty @@ -71,6 +73,8 @@ enum vals_t { I_COPIES_MAX, /* max possible costs of copies*/ I_COPIES_INIT, /* number of copies in initial allocation */ I_COPIES_HEUR, /* number of copies after heuristic */ + I_COPIES_5SEC, /* number of copies after ilp with max n sec */ + I_COPIES_30SEC, /* number of copies after ilp with max n sec */ I_COPIES_OPT, /* number of copies after ilp */ I_COPIES_IF, /* number of copies inevitable due to root-arg-interf */ @@ -85,6 +89,7 @@ int curr_vals[ASIZE]; static pset *all_phi_nodes; static pset *all_phi_classes; static pset *all_copy_nodes; +static ir_graph *last_irg; void copystat_init(void) { dbg = firm_dbg_register("ir.be.copystat"); @@ -93,7 +98,6 @@ void copystat_init(void) { all_phi_nodes = pset_new_ptr_default(); all_phi_classes = pset_new_ptr_default(); all_copy_nodes = pset_new_ptr_default(); - phi_class_init(); } void copystat_reset(void) { @@ -118,17 +122,43 @@ static void irg_stat_walker(ir_node *node, void *env) { if (is_Block(node)) /* count all blocks */ curr_vals[I_BLOCKS]++; - if (is_Phi(node) && mode_is_datab(get_irn_mode(node))) /* collect phis */ + if (is_Reg_Phi(node)) /* collect phis */ pset_insert_ptr(all_phi_nodes, node); - if (is_Copy(arch_env, node)) + if (is_Perm_Proj(arch_env, node)) pset_insert_ptr(all_copy_nodes, node); + + /* TODO: Add 2-Addr-Code nodes */ } -void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) { +static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) { irg_walk_graph(irg, irg_stat_walker, NULL, arch_env); - curr_vals[I_BLOCKS] -= 2; /* substract 2 for start and end block */ all_phi_classes = phi_class_compute_by_phis(all_phi_nodes); + last_irg = irg; +} + +/** + * @return 1 if the block at pos @p pos removed a critical edge + * 0 else + */ +static INLINE int was_edge_critical(const ir_node *bl, int pos) { + const ir_edge_t *edge; + const ir_node *bl_at_pos, *bl_before; + assert(is_Block(bl)); + + /* Does bl have several predecessors ?*/ + if (get_irn_arity(bl) <= 1) + return 0; + + /* Does the pred have exactly one predecessor */ + bl_at_pos = get_irn_n(bl, pos); + if (get_irn_arity(bl_at_pos) != 1) + return 0; + + /* Does the pred of the pred have several sucsecessors */ + bl_before = get_irn_n(bl_at_pos, 0); + edge = get_block_succ_first(bl_before); + return get_block_succ_next(bl_before, edge) ? 1 : 0; } /** @@ -136,6 +166,7 @@ void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) { */ static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) { int arity, i; + ir_node *phi_bl; assert(is_Phi(phi)); /* count all phi phis */ @@ -149,10 +180,11 @@ static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) { else curr_vals[I_PHI_ARITY_S + arity]++; + phi_bl = get_nodes_block(phi); /* type of argument {self, const, pred, glob} */ for (i = 0; i < arity; i++) { ir_node *block_of_arg, *block_ith_pred; - ir_node *cfg_node, *arg = get_irn_n(phi, i); + ir_node *arg = get_irn_n(phi, i); if (arg == phi) { curr_vals[I_PHI_ARG_SELF]++; @@ -164,17 +196,12 @@ static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) { continue; } - block_of_arg = get_nodes_block(arg); - /* get the pred block skipping blocks on critical edges */ - cfg_node = get_irn_n(get_nodes_block(phi), i); - block_ith_pred = get_nodes_block(cfg_node); - if (get_irn_opcode(cfg_node) == iro_Jmp && get_irn_arity(block_ith_pred) == 1) { - /* Then cfg_node_block has exactly 1 pred and 1 succ block, - * thus it must have been inserted during remove_critical_edges */ + block_ith_pred = get_Block_cfgpred_block(phi_bl, i); + if (was_edge_critical(phi_bl, i)) block_ith_pred = get_Block_cfgpred_block(block_ith_pred, 0); - } + block_of_arg = get_nodes_block(arg); if (block_of_arg == block_ith_pred) { curr_vals[I_PHI_ARG_PRED]++; continue; @@ -215,8 +242,11 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, pset *pc) { /* get an array of all members for double iterating */ members = xmalloc(size * sizeof(*members)); - for (i = 0, p = pset_first(pc); p; p = pset_next(pc)) + DBG((dbg, LEVEL_2, "Phi-class:\n")); + for (i = 0, p = pset_first(pc); p; p = pset_next(pc)) { + DBG((dbg, LEVEL_2, " %+F\n", p)); members[i++] = p; + } assert(i == size); /* determine number of phis on this class */ @@ -246,12 +276,18 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, pset *pc) { } #define is_curr_reg_class(irn) \ - (arch_get_irn_reg_class(chordal_env->session_env->main_env->arch_env, irn, \ - arch_pos_make_out(0)) == chordal_env->cls) + (arch_get_irn_reg_class(chordal_env->main_env->arch_env, irn, \ + -1) == chordal_env->cls) void copystat_collect_cls(be_chordal_env_t *chordal_env) { ir_node *n; pset *pc; + ir_graph *irg = chordal_env->irg; + + if (last_irg != irg) { + copystat_reset(); + copystat_collect_irg(irg, chordal_env->main_env->arch_env); + } for (n = pset_first(all_phi_nodes); n; n = pset_next(all_phi_nodes)) if (is_curr_reg_class(n)) @@ -281,6 +317,12 @@ void copystat_add_init_costs(int costs) { void copystat_add_heur_costs(int costs) { curr_vals[I_COPIES_HEUR] += costs; } +void copystat_add_ilp_5_sec_costs(int costs) { + curr_vals[I_COPIES_5SEC] += costs; +} +void copystat_add_ilp_30_sec_costs(int costs) { + curr_vals[I_COPIES_30SEC] += costs; +} void copystat_add_opt_costs(int costs) { curr_vals[I_COPIES_OPT] += costs; }