X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fscalar_replace.c;h=8c87f7780f49fd2438048787fcb88e497954aeed;hb=45ecc187cee7107c83c1f9618a1e1e586df73644;hp=b073688e315b3515885de3fa299581578a50531d;hpb=e74e0c8fb6ef361347b2f580ce3fa71afe10874e;p=libfirm diff --git a/ir/opt/scalar_replace.c b/ir/opt/scalar_replace.c index b073688e3..8c87f7780 100644 --- a/ir/opt/scalar_replace.c +++ b/ir/opt/scalar_replace.c @@ -131,7 +131,7 @@ static int is_const_sel(ir_node *sel) { for (i = 0; i < n; ++i) { ir_node *idx = get_Sel_index(sel, i); - if (get_irn_op(idx) != op_Const) + if (!is_Const(idx)) return 0; } return 1; @@ -172,9 +172,9 @@ static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode) { */ int is_address_taken(ir_node *sel) { - int i; - ir_mode *emode, *mode; - ir_node *value; + int i, input_nr, k; + ir_mode *emode, *mode; + ir_node *value; ir_entity *ent; if (! is_const_sel(sel)) @@ -185,15 +185,15 @@ int is_address_taken(ir_node *sel) switch (get_irn_opcode(succ)) { case iro_Load: + /* do not remove volatile variables */ + if (get_Load_volatility(succ) == volatility_is_volatile) + return 1; /* check if this load is not a hidden conversion */ mode = get_Load_mode(succ); ent = get_Sel_entity(sel); emode = get_type_mode(get_entity_type(ent)); if (! check_load_store_mode(mode, emode)) return 1; - /* do not remove volatile variables */ - if (get_Load_volatility(succ) == volatility_is_volatile) - return 1; break; case iro_Store: @@ -201,15 +201,15 @@ int is_address_taken(ir_node *sel) value = get_Store_value(succ); if (value == sel) return 1; + /* do not remove volatile variables */ + if (get_Store_volatility(succ) == volatility_is_volatile) + return 1; /* check if this Store is not a hidden conversion */ mode = get_irn_mode(value); ent = get_Sel_entity(sel); emode = get_type_mode(get_entity_type(ent)); if (! check_load_store_mode(mode, emode)) return 1; - /* do not remove volatile variables */ - if (get_Store_volatility(succ) == volatility_is_volatile) - return 1; break; case iro_Sel: { @@ -230,6 +230,33 @@ int is_address_taken(ir_node *sel) */ return 1; + case iro_Id: { + int res = is_address_taken(succ); + if (res) + return 1; + break; + } + + case iro_Tuple: + /* Non-optimized Tuple, happens in inlining */ + for (input_nr = get_Tuple_n_preds(succ) - 1; input_nr >= 0; --input_nr) { + ir_node *pred = get_Tuple_pred(succ, input_nr); + + if (pred == sel) { + /* we found one input */ + for (k = get_irn_n_outs(succ) - 1; k >= 0; --k) { + ir_node *proj = get_irn_out(succ, k); + + if (is_Proj(proj) && get_Proj_proj(proj) == input_nr) { + int res = is_address_taken(proj); + if (res) + return 1; + } + } + } + } + break; + default: /* another op, the address is taken */ return 1; @@ -263,7 +290,7 @@ static void link_all_leave_sels(ir_entity *ent, ir_node *sel) { * visited more than once causing a ring here, so we use the * node flag to mark linked nodes */ - if (irn_visited(sel)) + if (irn_visited_else_mark(sel)) return; /* we know we are at a leave, because this function is only @@ -272,8 +299,6 @@ static void link_all_leave_sels(ir_entity *ent, ir_node *sel) { */ set_irn_link(sel, get_entity_link(ent)); set_entity_link(ent, sel); - - mark_irn_visited(sel); } } @@ -301,7 +326,7 @@ static int find_possible_replacements(ir_graph *irg) { int i; int res = 0; - set_using_irn_visited(irg); + ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED); inc_irg_visited(irg); /* @@ -358,7 +383,7 @@ static int find_possible_replacements(ir_graph *irg) { } } - clear_using_irn_visited(irg); + ir_free_resources(irg, IR_RESOURCE_IRN_VISITED); return res; } @@ -379,8 +404,7 @@ static path_t *find_path(ir_node *sel, unsigned len) { if (! is_Sel(pred)) { /* we found the root */ - - res = xmalloc(sizeof(*res) + (len - 1) * sizeof(res->path)); + res = XMALLOCF(path_t, path, len); res->path_len = len; } else res = find_path(pred, len); @@ -488,12 +512,11 @@ typedef struct _env_t { */ static void topologic_walker(ir_node *node, void *ctx) { env_t *env = ctx; - ir_op *op = get_irn_op(node); ir_node *adr, *block, *mem, *val; ir_mode *mode; unsigned vnum; - if (op == op_Load) { + if (is_Load(node)) { /* a load, check if we can resolve it */ adr = get_Load_ptr(node); @@ -514,6 +537,9 @@ static void topologic_walker(ir_node *node, void *ctx) { DB((dbg, SET_LEVEL_3, "replacing by value %u\n", vnum)); + block = get_nodes_block(node); + set_cur_block(block); + /* check, if we can replace this Load */ val = get_value(vnum, env->modes[vnum]); @@ -529,13 +555,12 @@ static void topologic_walker(ir_node *node, void *ctx) { val = new_d_Conv(get_irn_dbg_info(node), val, mode); mem = get_Load_mem(node); - block = get_nodes_block(node); turn_into_tuple(node, pn_Load_max); set_Tuple_pred(node, pn_Load_M, mem); set_Tuple_pred(node, pn_Load_res, val); - set_Tuple_pred(node, pn_Load_X_regular, new_r_Jmp(current_ir_graph, block)); + set_Tuple_pred(node, pn_Load_X_regular, new_Jmp()); set_Tuple_pred(node, pn_Load_X_except, new_Bad()); - } else if (op == op_Store) { + } else if (is_Store(node)) { DB((dbg, SET_LEVEL_3, " checking %+F for replacement ", node)); /* a Store always can be replaced */ @@ -560,14 +585,15 @@ static void topologic_walker(ir_node *node, void *ctx) { val = get_Store_value(node); if (get_irn_mode(val) != env->modes[vnum]) val = new_d_Conv(get_irn_dbg_info(node), val, env->modes[vnum]); - set_value(vnum, val); - mem = get_Store_mem(node); block = get_nodes_block(node); + set_cur_block(block); + set_value(vnum, val); + mem = get_Store_mem(node); turn_into_tuple(node, pn_Store_max); set_Tuple_pred(node, pn_Store_M, mem); - set_Tuple_pred(node, pn_Store_X_regular, new_r_Jmp(current_ir_graph, block)); + set_Tuple_pred(node, pn_Store_X_regular, new_Jmp()); set_Tuple_pred(node, pn_Store_X_except, new_Bad()); } } @@ -604,7 +630,7 @@ static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes) { * * @param irg The current ir graph. */ -void scalar_replacement_opt(ir_graph *irg) { +int scalar_replacement_opt(ir_graph *irg) { unsigned nvals; int i; scalars_t key, *value; @@ -685,7 +711,7 @@ void scalar_replacement_opt(ir_graph *irg) { set_irg_outs_inconsistent(irg); set_irg_loopinfo_inconsistent(irg); - res = 1 + res = 1; } del_pset(sels); del_set(set_ent);