X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_inline.c;h=1eb9122a81e5d28e7fbe52f900c9f8abaddefb51;hb=04d455ab69c9d1549305ccbd6f97eb802db91ff4;hp=b100d62321cc21a7cf49910cd52977fff107c69e;hpb=f6b78c1b4c5885ac0c3e20ae0afca754cb3edbf9;p=libfirm diff --git a/ir/opt/opt_inline.c b/ir/opt/opt_inline.c index b100d6232..1eb9122a8 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" @@ -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 */ @@ -347,11 +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); - clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE - | IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS - | IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE); + 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); - clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE); + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_ENTITY_USAGE); edges_deactivate(irg); /* here we know we WILL inline, so inform the statistics */ @@ -661,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; @@ -710,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 */ @@ -847,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; @@ -885,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; @@ -935,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 @@ -949,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; @@ -965,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; @@ -990,14 +991,16 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, assert(get_irg_phase_state(irg) != phase_building); free_callee_info(irg); - assure_loopinfo(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; @@ -1024,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); @@ -1068,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; @@ -1078,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 || @@ -1103,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); @@ -1117,7 +1120,8 @@ void inline_leave_functions(unsigned maxsize, unsigned leavesize, callee_env = alloc_inline_irg_env(); set_irg_link(copy, callee_env); - assure_loopinfo(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); @@ -1199,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); } /** @@ -1457,7 +1461,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; @@ -1513,6 +1517,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; } @@ -1557,7 +1563,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; @@ -1588,9 +1593,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, @@ -1598,8 +1602,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. @@ -1613,7 +1617,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); } @@ -1639,7 +1643,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); @@ -1653,7 +1657,7 @@ static void inline_into(ir_graph *irg, unsigned maxsize, callee_env = alloc_inline_irg_env(); set_irg_link(copy, callee_env); - assure_loopinfo(copy); + assure_irg_properties(copy, IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO); memset(&wenv, 0, sizeof(wenv)); wenv.x = callee_env; wenv.ignore_callers = 1;