X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Ftailrec.c;h=e1945ea418a54fc3862e187615907984842f791a;hb=22e6001fd6a89dafdeaf1f571538a42d44e82cd5;hp=de723b29805fac66a8d95a348864396f10201856;hpb=6730cf921d356d992d35526daf57f82af7ab0816;p=libfirm diff --git a/ir/opt/tailrec.c b/ir/opt/tailrec.c index de723b298..e1945ea41 100644 --- a/ir/opt/tailrec.c +++ b/ir/opt/tailrec.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -22,7 +22,6 @@ * @brief Tail-recursion call optimization. * @date 08.06.2004 * @author Michael Beck - * @version $Id$ */ #include "config.h" @@ -47,7 +46,7 @@ #include "ircons_t.h" #include "irpass.h" -DEBUG_ONLY(static firm_dbg_module_t *dbg); +DEBUG_ONLY(static firm_dbg_module_t *dbg;) /** * the environment for collecting data @@ -65,16 +64,16 @@ typedef struct collect_t { */ static void collect_data(ir_node *node, void *env) { - collect_t *data = env; + collect_t *data = (collect_t*)env; ir_node *pred; - ir_op *op; + ir_opcode opcode; switch (get_irn_opcode(node)) { case iro_Proj: pred = get_Proj_pred(node); - op = get_irn_op(pred); - if (op == op_Proj) { + opcode = (ir_opcode)get_irn_opcode(pred); + if (opcode == iro_Proj) { ir_node *start = get_Proj_pred(pred); if (is_Start(start)) { @@ -84,7 +83,7 @@ static void collect_data(ir_node *node, void *env) data->proj_data = node; } } - } else if (op == op_Start) { + } else if (opcode == iro_Start) { if (get_Proj_proj(node) == pn_Start_X_initial_exec) { /* found ProjX(Start) */ data->proj_X = node; @@ -97,7 +96,7 @@ static void collect_data(ir_node *node, void *env) /* * the first block has the initial exec as cfg predecessor */ - if (node != get_irg_start_block(current_ir_graph)) { + if (node != get_irg_start_block(get_irn_irg(node))) { for (i = 0; i < n_pred; ++i) { if (get_Block_cfgpred(node, i) == data->proj_X) { data->block = node; @@ -132,9 +131,8 @@ typedef struct tr_env { /** * do the graph reconstruction for tail-recursion elimination * - * @param irg the graph that will reconstructed - * @param rets linked list of all rets - * @param n_tail_calls number of tail-recursion calls + * @param irg the graph that will reconstructed + * @param env tail recursion environment */ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) { @@ -149,24 +147,11 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) int rem = get_optimize(); ir_entity *ent = get_irg_entity(irg); ir_type *method_tp = get_entity_type(ent); - ir_graph *old = current_ir_graph; - - current_ir_graph = irg; assert(env->n_tail_calls > 0); - /* we add new nodes, so the outs are inconsistent */ - set_irg_outs_inconsistent(irg); - /* we add new blocks and change the control flow */ - set_irg_doms_inconsistent(irg); - set_irg_extblk_inconsistent(irg); - - /* we add a new loop */ - set_irg_loopinfo_inconsistent(irg); - - /* calls are removed */ - set_trouts_inconsistent(); + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE); /* we must build some new nodes WITHOUT CSE */ set_optimize(0); @@ -180,7 +165,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) irg_walk_graph(irg, NULL, collect_data, &data); /* check number of arguments */ - call = get_irn_link(end_block); + call = (ir_node*)get_irn_link(end_block); n_params = get_Call_n_params(call); assert(data.proj_X && "Could not find initial exec from Start"); @@ -191,13 +176,15 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) /* allocate in's for phi and block construction */ NEW_ARR_A(ir_node *, in, env->n_tail_calls + 1); - in[0] = data.proj_X; + /* build a new header block for the loop we create */ + i = 0; + in[i++] = data.proj_X; /* turn Return's into Jmp's */ - for (i = 1, p = env->rets; p; p = n) { + for (p = env->rets; p; p = n) { ir_node *block = get_nodes_block(p); - n = get_irn_link(p); + n = (ir_node*)get_irn_link(p); in[i++] = new_r_Jmp(block); // exchange(p, new_r_Bad(irg)); @@ -206,9 +193,10 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) * the block to the keep-alive list */ add_End_keepalive(get_irg_end(irg), block); } + assert(i == env->n_tail_calls + 1); - /* create a new block at start */ - block = new_r_Block(irg, env->n_tail_calls + 1, in); + /* now create it */ + block = new_r_Block(irg, i, in); jmp = new_r_Jmp(block); /* the old first block is now the second one */ @@ -223,7 +211,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) set_irg_initial_mem(irg, in[i]); ++i; - for (calls = call; calls; calls = get_irn_link(calls)) { + for (calls = call; calls != NULL; calls = (ir_node*)get_irn_link(calls)) { in[i] = get_Call_mem(calls); ++i; } @@ -235,19 +223,18 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) if (n_params > 0) { ir_node *calls; ir_node *args; - ir_node *args_bl; NEW_ARR_A(ir_node **, call_params, env->n_tail_calls); /* collect all parameters */ - for (i = 0, calls = call; calls; calls = get_irn_link(calls)) { + for (i = 0, calls = call; calls != NULL; + calls = (ir_node*)get_irn_link(calls)) { call_params[i] = get_Call_param_arr(calls); ++i; } /* build new Proj's and Phi's */ args = get_irg_args(irg); - args_bl = get_nodes_block(args); for (i = 0; i < n_params; ++i) { ir_mode *mode = get_type_mode(get_method_param_type(method_tp, i)); @@ -268,16 +255,13 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) long proj = get_Proj_proj(p); assert(0 <= proj && proj < n_params); - n = get_irn_link(p); + n = (ir_node*)get_irn_link(p); exchange(p, phis[proj + 1]); } /* tail recursion was done, all info is invalid */ - set_irg_doms_inconsistent(irg); - set_irg_outs_inconsistent(irg); - set_irg_extblk_inconsistent(irg); - set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_inconsistent); - set_trouts_inconsistent(); + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE + | IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO); set_irg_callee_info_state(irg, irg_callee_info_inconsistent); set_optimize(rem); @@ -285,49 +269,48 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) /* check if we need new values */ n_locs = 0; for (i = 0; i < env->n_ress; ++i) { - if (env->variants[i] != TR_DIRECT) + if (env->variants[i] != TR_DIRECT) { ++n_locs; + break; + } } if (n_locs > 0) { - ir_node *bad, *start_block; + ir_node *start_block; ir_node **in; ir_mode **modes; - NEW_ARR_A(ir_node *, in, n_locs); - NEW_ARR_A(ir_mode *, modes, n_locs); - ssa_cons_start(irg, n_locs); + NEW_ARR_A(ir_node *, in, env->n_ress); + NEW_ARR_A(ir_mode *, modes, env->n_ress); + ssa_cons_start(irg, env->n_ress); start_block = get_irg_start_block(irg); - set_cur_block(start_block); + set_r_cur_block(irg, start_block); + /* set the neutral elements for the iteration start */ for (i = 0; i < env->n_ress; ++i) { ir_type *tp = get_method_res_type(method_tp, i); ir_mode *mode = get_type_mode(tp); modes[i] = mode; if (env->variants[i] == TR_ADD) { - set_value(i, new_r_Const(irg, get_mode_null(mode))); + set_r_value(irg, i, new_r_Const(irg, get_mode_null(mode))); } else if (env->variants[i] == TR_MUL) { - set_value(i, new_r_Const(irg, get_mode_one(mode))); + set_r_value(irg, i, new_r_Const(irg, get_mode_one(mode))); } } mature_immBlock(start_block); /* no: we can kill all returns */ - bad = get_irg_bad(irg); - for (p = env->rets; p; p = n) { ir_node *block = get_nodes_block(p); - ir_node *call, *mem, *jmp, *tuple; - - set_cur_block(block); - n = get_irn_link(p); + ir_node *jmp, *tuple; - call = skip_Proj(get_Return_mem(p)); - assert(is_Call(call)); + set_r_cur_block(irg, block); + n = (ir_node*)get_irn_link(p); - mem = get_Call_mem(call); + ir_node *const call = skip_Proj(get_Return_mem(p)); + ir_node *const mem = get_Call_mem(call); /* create a new jump, free of CSE */ set_optimize(0); @@ -335,30 +318,30 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) set_optimize(rem); for (i = 0; i < env->n_ress; ++i) { + ir_mode *mode = modes[i]; if (env->variants[i] != TR_DIRECT) { - in[i] = get_value(i, modes[i]); + in[i] = get_r_value(irg, i, mode); } else { - in[i] = bad; + in[i] = new_r_Bad(irg, mode); } } /* create a new tuple for the return values */ tuple = new_r_Tuple(block, env->n_ress, in); - turn_into_tuple(call, pn_Call_max); - set_Tuple_pred(call, pn_Call_M, mem); - set_Tuple_pred(call, pn_Call_X_regular, jmp); - set_Tuple_pred(call, pn_Call_X_except, bad); - set_Tuple_pred(call, pn_Call_T_result, tuple); - set_Tuple_pred(call, pn_Call_P_value_res_base, bad); + turn_into_tuple(call, pn_Call_max+1); + set_Tuple_pred(call, pn_Call_M, mem); + set_Tuple_pred(call, pn_Call_X_regular, jmp); + set_Tuple_pred(call, pn_Call_X_except, new_r_Bad(irg, mode_X)); + set_Tuple_pred(call, pn_Call_T_result, tuple); for (i = 0; i < env->n_ress; ++i) { ir_node *res = get_Return_res(p, i); if (env->variants[i] != TR_DIRECT) { - set_value(i, res); + set_r_value(irg, i, res); } } - exchange(p, bad); + exchange(p, new_r_Bad(irg, mode_X)); } /* finally fix all other returns */ @@ -372,7 +355,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) continue; block = get_nodes_block(ret); - set_cur_block(block); + set_r_cur_block(irg, block); for (j = 0; j < env->n_ress; ++j) { ir_node *pred = get_Return_res(ret, j); ir_node *n; @@ -382,13 +365,13 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) continue; case TR_ADD: - n = get_value(j, modes[j]); + n = get_r_value(irg, j, modes[j]); n = new_r_Add(block, n, pred, modes[j]); set_Return_res(ret, j, n); break; case TR_MUL: - n = get_value(j, modes[j]); + n = get_r_value(irg, j, modes[j]); n = new_r_Mul(block, n, pred, modes[j]); set_Return_res(ret, j, n); break; @@ -400,15 +383,14 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) } ssa_cons_finish(irg); } else { - ir_node *bad = get_irg_bad(irg); + ir_node *bad = new_r_Bad(irg, mode_X); /* no: we can kill all returns */ for (p = env->rets; p; p = n) { - n = get_irn_link(p); + n = (ir_node*)get_irn_link(p); exchange(p, bad); } } - current_ir_graph = old; } /** @@ -574,25 +556,34 @@ static tail_rec_variants find_variant(ir_node *irn, ir_node *call) /* * convert simple tail-calls into loops */ -int opt_tail_rec_irg(ir_graph *irg) +void opt_tail_rec_irg(ir_graph *irg) { - tr_env env; - ir_node *end_block; - int i, n_ress, n_tail_calls = 0; - ir_node *rets = NULL; - ir_type *mtd_type, *call_type; - ir_entity *ent; + tr_env env; + ir_node *end_block; + int i, n_ress, n_tail_calls = 0; + ir_node *rets = NULL; + ir_type *mtd_type, *call_type; + ir_entity *ent; + ir_graph *rem; + + assure_irg_properties(irg, + IR_GRAPH_PROPERTY_MANY_RETURNS + | IR_GRAPH_PROPERTY_NO_BADS + | IR_GRAPH_PROPERTY_CONSISTENT_OUTS); FIRM_DBG_REGISTER(dbg, "firm.opt.tailrec"); - assure_irg_outs(irg); + if (! check_lifetime_of_locals(irg)) { + confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_ALL); + return; + } - if (! check_lifetime_of_locals(irg)) - return 0; + rem = current_ir_graph; + current_ir_graph = irg; ent = get_irg_entity(irg); mtd_type = get_entity_type(ent); - n_ress = get_method_n_ress(mtd_type); + n_ress = get_method_n_ress(mtd_type); env.variants = NULL; env.n_ress = n_ress; @@ -604,11 +595,7 @@ int opt_tail_rec_irg(ir_graph *irg) env.variants[i] = TR_DIRECT; } - /* - * This tail recursion optimization works best - * if the Returns are normalized. - */ - normalize_n_returns(irg); + ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); end_block = get_irg_end_block(irg); set_irn_link(end_block, NULL); @@ -635,10 +622,10 @@ int opt_tail_rec_irg(ir_graph *irg) /* check if it's a recursive call */ call_ptr = get_Call_ptr(call); - if (! is_Global(call_ptr)) + if (! is_SymConst_addr_ent(call_ptr)) continue; - ent = get_Global_entity(call_ptr); + ent = get_SymConst_entity(call_ptr); if (!ent || get_entity_irg(ent) != irg) continue; @@ -655,11 +642,7 @@ int opt_tail_rec_irg(ir_graph *irg) * This can happen in C when no prototype is given * or K&R style is used. */ -#if 0 - printf("Warning: Tail recursion fails because of different method and call types:\n"); - dump_type(mtd_type); - dump_type(call_type); -#endif + DB((dbg, LEVEL_3, " tail recursion fails because of call type mismatch: %+F != %+F\n", mtd_type, call_type)); continue; } @@ -672,12 +655,14 @@ int opt_tail_rec_irg(ir_graph *irg) /* cannot be transformed */ break; } - if (var == TR_DIRECT) + if (var == TR_DIRECT) { var = env.variants[j]; - else if (env.variants[j] == TR_DIRECT) + } else if (env.variants[j] == TR_DIRECT) { env.variants[j] = var; + } if (env.variants[j] != var) { /* not compatible */ + DB((dbg, LEVEL_3, " tail recursion fails for %d return value of %+F\n", j, ret)); break; } } @@ -695,24 +680,26 @@ int opt_tail_rec_irg(ir_graph *irg) } /* now, end_block->link contains the list of all tail calls */ - if (n_tail_calls <= 0) - return 0; + if (n_tail_calls > 0) { + DB((dbg, LEVEL_2, " Performing tail recursion for graph %s and %d Calls\n", + get_entity_ld_name(get_irg_entity(irg)), n_tail_calls)); - DB((dbg, LEVEL_2, " Performing tail recursion for graph %s and %d Calls\n", - get_entity_ld_name(get_irg_entity(irg)), n_tail_calls)); + hook_tail_rec(irg, n_tail_calls); - hook_tail_rec(irg, n_tail_calls); - - env.n_tail_calls = n_tail_calls; - env.rets = rets; - do_opt_tail_rec(irg, &env); - - return n_tail_calls; + env.n_tail_calls = n_tail_calls; + env.rets = rets; + do_opt_tail_rec(irg, &env); + confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_NONE); + } else { + confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_ALL); + } + ir_free_resources(irg, IR_RESOURCE_IRN_LINK); + current_ir_graph = rem; } ir_graph_pass_t *opt_tail_rec_irg_pass(const char *name) { - return def_graph_pass_ret(name ? name : "tailrec", opt_tail_rec_irg); + return def_graph_pass(name ? name : "tailrec", opt_tail_rec_irg); } /* @@ -720,26 +707,15 @@ ir_graph_pass_t *opt_tail_rec_irg_pass(const char *name) */ void opt_tail_recursion(void) { - int i; - int n_opt_applications = 0; - ir_graph *irg; + size_t i, n; FIRM_DBG_REGISTER(dbg, "firm.opt.tailrec"); - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - irg = get_irp_irg(i); - - current_ir_graph = irg; - - ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); - if (opt_tail_rec_irg(irg)) - ++n_opt_applications; - - ir_free_resources(irg, IR_RESOURCE_IRN_LINK); + DB((dbg, LEVEL_1, "Performing tail recursion ...\n")); + for (i = 0, n = get_irp_n_irgs(); i < n; ++i) { + ir_graph *irg = get_irp_irg(i); + opt_tail_rec_irg(irg); } - - DB((dbg, LEVEL_1, "Performed tail recursion for %d of %d graphs\n", - n_opt_applications, get_irp_n_irgs())); } ir_prog_pass_t *opt_tail_recursion_pass(const char *name)