X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_inline.c;h=99c85184809662ea3640d1b770606f9a690c22c8;hb=db56911d21a286c880fea81364d3a658ad169bd3;hp=6c5e336c31d88dbcfcc8dcd68c062d22a12b7ba0;hpb=eb7ac83b870791219e7a50cc262f2f1ee9c01b39;p=libfirm diff --git a/ir/opt/opt_inline.c b/ir/opt/opt_inline.c index 6c5e336c3..99c851848 100644 --- a/ir/opt/opt_inline.c +++ b/ir/opt/opt_inline.c @@ -21,7 +21,6 @@ * @file * @brief Dead node elimination and Procedure Inlining. * @author Michael Beck, Goetz Lindenmaier - * @version $Id$ */ #include "config.h" @@ -63,7 +62,7 @@ #include "irtools.h" #include "iropt_dbg.h" #include "irpass_t.h" -#include "irphase_t.h" +#include "irnodemap.h" DEBUG_ONLY(static firm_dbg_module_t *dbg;) @@ -146,7 +145,13 @@ static void find_addr(ir_node *node, void *env) { bool *allow_inline = (bool*)env; - if (is_Sel(node)) { + if (is_Block(node) && get_Block_entity(node)) { + /** + * Currently we can't handle blocks whose address was taken correctly + * when inlining + */ + *allow_inline = false; + } else if (is_Sel(node)) { ir_graph *irg = current_ir_graph; if (get_Sel_ptr(node) == get_irg_frame(irg)) { /* access to frame */ @@ -155,6 +160,9 @@ static void find_addr(ir_node *node, void *env) /* access to value_type */ *allow_inline = false; } + if (is_parameter_entity(ent)) { + *allow_inline = false; + } } } else if (is_Alloc(node) && get_Alloc_where(node) == stack_alloc) { /* From GCC: @@ -291,6 +299,7 @@ static void copy_frame_entities(ir_graph *from, ir_graph *to) ir_entity *old_ent = get_class_member(from_frame, i); ir_entity *new_ent = copy_entity_own(old_ent, to_frame); set_entity_link(old_ent, new_ent); + assert (!is_parameter_entity(old_ent)); } } @@ -343,10 +352,10 @@ int inline_method(ir_node *call, ir_graph *called_graph) assert(get_irg_phase_state(irg) != phase_building); assert(get_irg_pinned(irg) == op_pin_state_pinned); assert(get_irg_pinned(called_graph) == op_pin_state_pinned); - set_irg_extblk_inconsistent(irg); - set_irg_doms_inconsistent(irg); + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE + | IR_GRAPH_PROPERTY_CONSISTENT_ENTITY_USAGE); set_irg_callee_info_state(irg, irg_callee_info_inconsistent); - set_irg_entity_usage_state(irg, ir_entity_usage_not_computed); + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_ENTITY_USAGE); edges_deactivate(irg); /* here we know we WILL inline, so inform the statistics */ @@ -656,8 +665,8 @@ static ir_graph *get_call_called_irg(ir_node *call) ir_node *addr; addr = get_Call_ptr(call); - if (is_Global(addr)) { - ir_entity *ent = get_Global_entity(addr); + if (is_SymConst_addr_ent(addr)) { + ir_entity *ent = get_SymConst_entity(addr); /* we don't know which function gets finally bound to a weak symbol */ if (get_entity_linkage(ent) & IR_LINKAGE_WEAK) return NULL; @@ -705,7 +714,6 @@ void inline_small_irgs(ir_graph *irg, int size) { ir_graph *rem = current_ir_graph; inline_env_t env; - call_entry *entry; current_ir_graph = irg; /* Handle graph state */ @@ -842,8 +850,8 @@ static void collect_calls2(ir_node *call, void *ctx) if (env->ignore_runtime) { ir_node *symc = get_Call_ptr(call); - if (is_Global(symc)) { - ir_entity *ent = get_Global_entity(symc); + if (is_SymConst_addr_ent(symc)) { + ir_entity *ent = get_SymConst_entity(symc); if (get_entity_additional_properties(ent) & mtp_property_runtime) return; @@ -880,9 +888,9 @@ static void collect_calls2(ir_node *call, void *ctx) /** * Returns TRUE if the number of callers is 0 in the irg's environment, - * hence this irg is a leave. + * hence this irg is a leaf. */ -inline static int is_leave(ir_graph *irg) +inline static int is_leaf(ir_graph *irg) { inline_irg_env *env = (inline_irg_env*)get_irg_link(irg); return env->n_call_nodes == 0; @@ -930,7 +938,7 @@ static call_entry *duplicate_call_entry(const call_entry *entry, */ static void append_call_list(inline_irg_env *dst, inline_irg_env *src, int loop_depth) { - call_entry *entry, *nentry; + call_entry *nentry; /* Note that the src list points to Call nodes in the inlined graph, but we need Call nodes in our graph. Luckily the inliner leaves this information @@ -944,15 +952,15 @@ static void append_call_list(inline_irg_env *dst, inline_irg_env *src, int loop_ } /* - * Inlines small leave methods at call sites where the called address comes + * Inlines small leaf methods at call sites where the called address comes * from a Const node that references the entity representing the called * method. * The size argument is a rough measure for the code size of the method: * Methods where the obstack containing the firm graph is smaller than * size are inlined. */ -void inline_leave_functions(unsigned maxsize, unsigned leavesize, - unsigned size, int ignore_runtime) +void inline_leaf_functions(unsigned maxsize, unsigned leafsize, + unsigned size, int ignore_runtime) { inline_irg_env *env; ir_graph *irg; @@ -960,8 +968,6 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, ir_graph *rem; int did_inline; wenv_t wenv; - call_entry *entry, *next; - const call_entry *centry; pmap *copied_graphs; pmap_entry *pm_entry; @@ -985,14 +991,16 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, assert(get_irg_phase_state(irg) != phase_building); free_callee_info(irg); - assure_cf_loop(irg); + assure_irg_properties(irg, + IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO); wenv.x = (inline_irg_env*)get_irg_link(irg); irg_walk_graph(irg, NULL, collect_calls2, &wenv); + confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_ALL); } /* -- and now inline. -- */ - /* Inline leaves recursively -- we might construct new leaves. */ + /* Inline leafs recursively -- we might construct new leafs. */ do { did_inline = 0; @@ -1019,8 +1027,8 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, continue; } - if (is_leave(callee) && ( - is_smaller(callee, leavesize) || prop >= irg_inline_forced)) { + if (is_leaf(callee) && ( + is_smaller(callee, leafsize) || prop >= irg_inline_forced)) { if (!phiproj_computed) { phiproj_computed = 1; collect_phiprojs(current_ir_graph); @@ -1063,7 +1071,7 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, list_for_each_entry_safe(call_entry, entry, next, &env->calls, list) { irg_inline_property prop; ir_graph *callee; - pmap_entry *e; + ir_graph *calleee; call = entry->call; callee = entry->callee; @@ -1073,13 +1081,13 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, continue; } - e = pmap_find(copied_graphs, callee); - if (e != NULL) { + calleee = pmap_get(ir_graph, copied_graphs, callee); + if (calleee != NULL) { /* * Remap callee if we have a copy. * FIXME: Should we do this only for recursive Calls ? */ - callee = (ir_graph*)e->value; + callee = calleee; } if (prop >= irg_inline_forced || @@ -1098,7 +1106,7 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, /* * No copy yet, create one. - * Note that recursive methods are never leaves, so it is sufficient + * Note that recursive methods are never leafs, so it is sufficient * to test this condition here. */ copy = create_irg_copy(callee); @@ -1112,7 +1120,8 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, callee_env = alloc_inline_irg_env(); set_irg_link(copy, callee_env); - assure_cf_loop(copy); + assure_irg_properties(copy, + IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO); wenv.x = callee_env; wenv.ignore_callers = 1; irg_walk_graph(copy, NULL, collect_calls2, &wenv); @@ -1194,44 +1203,44 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, current_ir_graph = rem; } -typedef struct inline_leave_functions_pass_t { +typedef struct inline_leaf_functions_pass_t { ir_prog_pass_t pass; unsigned maxsize; - unsigned leavesize; + unsigned leafsize; unsigned size; int ignore_runtime; -} inline_leave_functions_pass_t; +} inline_leaf_functions_pass_t; /** - * Wrapper to run inline_leave_functions() as a ir_prog pass. + * Wrapper to run inline_leaf_functions() as a ir_prog pass. */ -static int inline_leave_functions_wrapper(ir_prog *irp, void *context) +static int inline_leaf_functions_wrapper(ir_prog *irp, void *context) { - inline_leave_functions_pass_t *pass = (inline_leave_functions_pass_t*)context; + inline_leaf_functions_pass_t *pass = (inline_leaf_functions_pass_t*)context; (void)irp; - inline_leave_functions( - pass->maxsize, pass->leavesize, + inline_leaf_functions( + pass->maxsize, pass->leafsize, pass->size, pass->ignore_runtime); return 0; } -/* create a pass for inline_leave_functions() */ -ir_prog_pass_t *inline_leave_functions_pass( - const char *name, unsigned maxsize, unsigned leavesize, +/* create a pass for inline_leaf_functions() */ +ir_prog_pass_t *inline_leaf_functions_pass( + const char *name, unsigned maxsize, unsigned leafsize, unsigned size, int ignore_runtime) { - inline_leave_functions_pass_t *pass = XMALLOCZ(inline_leave_functions_pass_t); + inline_leaf_functions_pass_t *pass = XMALLOCZ(inline_leaf_functions_pass_t); pass->maxsize = maxsize; - pass->leavesize = leavesize; + pass->leafsize = leafsize; pass->size = size; pass->ignore_runtime = ignore_runtime; return def_prog_pass_constructor( &pass->pass, - name ? name : "inline_leave_functions", - inline_leave_functions_wrapper); + name ? name : "inline_leaf_functions", + inline_leaf_functions_wrapper); } /** @@ -1239,10 +1248,10 @@ ir_prog_pass_t *inline_leave_functions_pass( */ static unsigned calc_method_local_weight(ir_node *arg) { - int i, j, k; + int j; unsigned v, weight = 0; - for (i = get_irn_n_outs(arg) - 1; i >= 0; --i) { + for (unsigned i = get_irn_n_outs(arg); i-- > 0; ) { ir_node *succ = get_irn_out(arg, i); switch (get_irn_opcode(succ)) { @@ -1276,7 +1285,7 @@ static unsigned calc_method_local_weight(ir_node *arg) ir_node *pred = get_Tuple_pred(succ, j); if (pred == arg) { /* look for Proj(j) */ - for (k = get_irn_n_outs(succ) - 1; k >= 0; --k) { + for (unsigned k = get_irn_n_outs(succ); k-- > 0; ) { ir_node *succ_succ = get_irn_out(succ, k); if (is_Proj(succ_succ)) { if (get_Proj_proj(succ_succ) == j) { @@ -1307,7 +1316,6 @@ static void analyze_irg_local_weights(inline_irg_env *env, ir_graph *irg) ir_entity *ent = get_irg_entity(irg); ir_type *mtp; size_t nparams; - int i; long proj_nr; ir_node *irg_args, *arg; @@ -1323,7 +1331,7 @@ static void analyze_irg_local_weights(inline_irg_env *env, ir_graph *irg) assure_irg_outs(irg); irg_args = get_irg_args(irg); - for (i = get_irn_n_outs(irg_args) - 1; i >= 0; --i) { + for (unsigned i = get_irn_n_outs(irg_args); i-- > 0; ) { arg = get_irn_out(irg_args, i); proj_nr = get_Proj_proj(arg); env->local_weights[proj_nr] = calc_method_local_weight(arg); @@ -1357,10 +1365,12 @@ static int calc_inline_benefice(call_entry *entry, ir_graph *callee) { ir_node *call = entry->call; ir_entity *ent = get_irg_entity(callee); + ir_type *callee_frame; + size_t i, n_members, n_params; ir_node *frame_ptr; ir_type *mtp; int weight = 0; - int i, n_params, all_const; + int all_const; unsigned cc, v; irg_inline_property prop; @@ -1373,6 +1383,18 @@ static int calc_inline_benefice(call_entry *entry, ir_graph *callee) return entry->benefice = INT_MIN; } + callee_frame = get_irg_frame_type(callee); + n_members = get_class_n_members(callee_frame); + for (i = 0; i < n_members; ++i) { + ir_entity *frame_ent = get_class_member(callee_frame, i); + if (is_parameter_entity(frame_ent)) { + // TODO inliner should handle parameter entities by inserting Store operations + DB((dbg, LEVEL_2, "In %+F Call to %+F: inlining forbidden due to parameter entity\n", call, callee)); + set_irg_inline_property(callee, irg_inline_forbidden); + return entry->benefice = INT_MIN; + } + } + if (get_irg_additional_properties(callee) & mtp_property_noreturn) { DB((dbg, LEVEL_2, "In %+F Call to %+F: not inlining noreturn or weak\n", call, callee)); @@ -1385,7 +1407,7 @@ static int calc_inline_benefice(call_entry *entry, ir_graph *callee) cc = get_method_calling_convention(mtp); if (cc & cc_reg_param) { /* register parameter, smaller costs for register parameters */ - int max_regs = cc & ~cc_bits; + size_t max_regs = cc & ~cc_bits; if (max_regs < n_params) weight += max_regs * 2 + (n_params - max_regs) * 5; @@ -1438,7 +1460,7 @@ static int calc_inline_benefice(call_entry *entry, ir_graph *callee) if (callee_env->n_nodes < 30 && !callee_env->recursive) weight += 2000; - /* and finally for leaves: they do not increase the register pressure + /* and finally for leafs: they do not increase the register pressure because of callee safe registers */ if (callee_env->n_call_nodes == 0) weight += 400; @@ -1494,6 +1516,8 @@ static ir_graph **create_irg_list(void) callgraph_walk(NULL, callgraph_walker, &env); assert(n_irgs == env.last_irg); + free_callgraph(); + return env.irgs; } @@ -1538,7 +1562,6 @@ static void inline_into(ir_graph *irg, unsigned maxsize, { int phiproj_computed = 0; inline_irg_env *env = (inline_irg_env*)get_irg_link(irg); - call_entry *curr_call; wenv_t wenv; pqueue_t *pqueue; @@ -1569,9 +1592,8 @@ static void inline_into(ir_graph *irg, unsigned maxsize, ir_node *call_node = curr_call->call; inline_irg_env *callee_env = (inline_irg_env*)get_irg_link(callee); irg_inline_property prop = get_irg_inline_property(callee); + ir_graph *calleee; int loop_depth; - const call_entry *centry; - pmap_entry *e; if ((prop < irg_inline_forced) && env->n_nodes + callee_env->n_nodes > maxsize) { DB((dbg, LEVEL_2, "%+F: too big (%d) + %+F (%d)\n", irg, @@ -1579,8 +1601,8 @@ static void inline_into(ir_graph *irg, unsigned maxsize, continue; } - e = pmap_find(copied_graphs, callee); - if (e != NULL) { + calleee = pmap_get(ir_graph, copied_graphs, callee); + if (calleee != NULL) { int benefice = curr_call->benefice; /* * Reduce the weight for recursive function IFF not all arguments are const. @@ -1594,7 +1616,7 @@ static void inline_into(ir_graph *irg, unsigned maxsize, /* * Remap callee if we have a copy. */ - callee = (ir_graph*)e->value; + callee = calleee; callee_env = (inline_irg_env*)get_irg_link(callee); } @@ -1620,7 +1642,7 @@ static void inline_into(ir_graph *irg, unsigned maxsize, /* * No copy yet, create one. - * Note that recursive methods are never leaves, so it is + * Note that recursive methods are never leafs, so it is * sufficient to test this condition here. */ copy = create_irg_copy(callee); @@ -1634,7 +1656,7 @@ static void inline_into(ir_graph *irg, unsigned maxsize, callee_env = alloc_inline_irg_env(); set_irg_link(copy, callee_env); - assure_cf_loop(copy); + assure_irg_properties(copy, IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO); memset(&wenv, 0, sizeof(wenv)); wenv.x = callee_env; wenv.ignore_callers = 1; @@ -1746,7 +1768,7 @@ void inline_functions(unsigned maxsize, int inline_threshold, free_callee_info(irg); wenv.x = (inline_irg_env*)get_irg_link(irg); - assure_cf_loop(irg); + assure_loopinfo(irg); irg_walk_graph(irg, NULL, collect_calls2, &wenv); }