X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fscalar_replace.c;h=d13f96e739d478e0574f9d0ba54d8b2f38dbe1b5;hb=b27ae245166bb695bc4e418ff416d91bc37d0f28;hp=276baf3b58af018b242ff7b411b8f06d453ab932;hpb=41fac672b8f412b67e502dff0f9b03af6ceaef73;p=libfirm diff --git a/ir/opt/scalar_replace.c b/ir/opt/scalar_replace.c index 276baf3b5..d13f96e73 100644 --- a/ir/opt/scalar_replace.c +++ b/ir/opt/scalar_replace.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. * @@ -29,6 +29,7 @@ #include "iroptimize.h" #include "scalar_replace.h" +#include "opt_init.h" #include "irflag_t.h" #include "irouts.h" #include "set.h" @@ -40,6 +41,7 @@ #include "irgwalk.h" #include "irgmod.h" #include "irnode_t.h" +#include "irpass.h" #include "irtools.h" #include "xmalloc.h" #include "debug.h" @@ -55,25 +57,24 @@ */ typedef union { ir_entity *ent; - tarval *tv; + ir_tarval *tv; } path_elem_t; /** * An access path, used to assign value numbers * to variables that will be scalar replaced. */ -typedef struct _path_t { +typedef struct path_t { unsigned vnum; /**< The value number. */ - unsigned path_len; /**< The length of the access path. */ + size_t path_len; /**< The length of the access path. */ path_elem_t path[1]; /**< The path. */ } path_t; /** The size of a path in bytes. */ #define PATH_SIZE(p) (sizeof(*(p)) + sizeof((p)->path[0]) * ((p)->path_len - 1)) -typedef struct _scalars_t { +typedef struct scalars_t { ir_entity *ent; /**< A entity for scalar replacement. */ - ir_type *ent_owner; /**< The owner of this entity. */ } scalars_t; DEBUG_ONLY(static firm_dbg_module_t *dbg;) @@ -83,9 +84,10 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;) * * @return 0 if they are identically */ -static int path_cmp(const void *elt, const void *key, size_t size) { - const path_t *p1 = elt; - const path_t *p2 = key; +static int path_cmp(const void *elt, const void *key, size_t size) +{ + const path_t *p1 = (const path_t*)elt; + const path_t *p2 = (const path_t*)key; (void) size; /* we can use memcmp here, because identical tarvals should have identical addresses */ @@ -97,9 +99,10 @@ static int path_cmp(const void *elt, const void *key, size_t size) { * * @return 0 if they are identically */ -static int ent_cmp(const void *elt, const void *key, size_t size) { - const scalars_t *c1 = elt; - const scalars_t *c2 = key; +static int ent_cmp(const void *elt, const void *key, size_t size) +{ + const scalars_t *c1 = (const scalars_t*)elt; + const scalars_t *c2 = (const scalars_t*)key; (void) size; return c1->ent != c2->ent; @@ -108,7 +111,8 @@ static int ent_cmp(const void *elt, const void *key, size_t size) { /** * Calculate a hash value for a path. */ -static unsigned path_hash(const path_t *path) { +static unsigned path_hash(const path_t *path) +{ unsigned hash = 0; unsigned i; @@ -123,7 +127,8 @@ static unsigned path_hash(const path_t *path) { * * @param sel the Sel node that will be checked */ -static int is_const_sel(ir_node *sel) { +static int is_const_sel(ir_node *sel) +{ int i, n = get_Sel_n_indexs(sel); for (i = 0; i < n; ++i) { @@ -152,7 +157,8 @@ static int is_const_sel(ir_node *sel) { * @param mode the mode of the Load/Store * @param ent_mode the mode of the accessed entity */ -static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode) { +static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode) +{ if (ent_mode != mode) { if (ent_mode == NULL || get_mode_size_bits(ent_mode) != get_mode_size_bits(mode) || @@ -166,7 +172,7 @@ static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode) { /* * Returns non-zero, if the address of an entity - * represented by a Sel node (or it's successor Sels) is taken. + * represented by a Sel node (or its successor Sels) is taken. */ int is_address_taken(ir_node *sel) { @@ -211,13 +217,14 @@ int is_address_taken(ir_node *sel) break; case iro_Sel: { - ir_entity* entity = get_Sel_entity(succ); + int res; + ir_entity *entity = get_Sel_entity(succ); /* we can't handle unions correctly yet -> address taken */ if (is_Union_type(get_entity_owner(entity))) return 1; /* Check the Sel successor of Sel */ - int res = is_address_taken(succ); + res = is_address_taken(succ); if (res) return 1; break; @@ -273,7 +280,8 @@ int is_address_taken(ir_node *sel) * @param ent the entity that will be scalar replaced * @param sel a Sel node that selects some fields of this entity */ -static int link_all_leave_sels(ir_entity *ent, ir_node *sel) { +static int link_all_leave_sels(ir_entity *ent, ir_node *sel) +{ int i, is_leave = 1; for (i = get_irn_n_outs(sel) - 1; i >= 0; --i) { @@ -313,36 +321,40 @@ static void *ADDRESS_TAKEN = &_x; * * This function finds variables on the (members of the) frame type * that can be scalar replaced, because their address is never taken. - * If such a variable is found, it's entity link will hold a list of all + * If such a variable is found, its entity link will hold a list of all * Sel nodes, that selects the atomic fields of this entity. * Otherwise, the link will be ADDRESS_TAKEN or NULL. * * @return non-zero if at least one entity could be replaced * potentially */ -static int find_possible_replacements(ir_graph *irg) { +static int find_possible_replacements(ir_graph *irg) +{ ir_node *irg_frame; ir_type *frame_tp; - int i, j, k, static_link_arg; + size_t mem_idx; + int i; + long static_link_arg; int res = 0; /* * First, clear the link field of all interesting entities. */ frame_tp = get_irg_frame_type(irg); - for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) { - ir_entity *ent = get_class_member(frame_tp, i); + for (mem_idx = get_class_n_members(frame_tp); mem_idx > 0;) { + ir_entity *ent = get_class_member(frame_tp, --mem_idx); set_entity_link(ent, NULL); } /* check for inner functions: * FIXME: need a way to get the argument position for the static link */ static_link_arg = 0; - for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) { - ir_entity *ent = get_class_member(frame_tp, i); + for (mem_idx = get_class_n_members(frame_tp); mem_idx > 0;) { + ir_entity *ent = get_class_member(frame_tp, --mem_idx); if (is_method_entity(ent)) { ir_graph *inner_irg = get_entity_irg(ent); ir_node *args; + int j; assure_irg_outs(inner_irg); args = get_irg_args(inner_irg); @@ -350,6 +362,7 @@ static int find_possible_replacements(ir_graph *irg) { ir_node *arg = get_irn_out(args, j); if (get_Proj_proj(arg) == static_link_arg) { + int k; for (k = get_irn_n_outs(arg) - 1; k >= 0; --k) { ir_node *succ = get_irn_out(arg, k); @@ -422,13 +435,15 @@ static int find_possible_replacements(ir_graph *irg) { } /** - * Return a path from the Sel node sel to it's root. + * Return a path from the Sel node "sel" to its root. * * @param sel the Sel node * @param len the length of the path so far */ -static path_t *find_path(ir_node *sel, unsigned len) { - int pos, i, n; +static path_t *find_path(ir_node *sel, size_t len) +{ + size_t pos; + int i, n; path_t *res; ir_node *pred = get_Sel_ptr(sel); @@ -443,6 +458,7 @@ static path_t *find_path(ir_node *sel, unsigned len) { } else res = find_path(pred, len); + assert(len <= res->path_len); pos = res->path_len - len; res->path[pos++].ent = get_Sel_entity(sel); @@ -475,14 +491,15 @@ static unsigned allocate_value_numbers(pset *sels, ir_entity *ent, unsigned vnum DB((dbg, SET_LEVEL_3, " Visiting Sel nodes of entity %+F\n", ent)); /* visit all Sel nodes in the chain of the entity */ - for (sel = get_entity_link(ent); sel; sel = next) { - next = get_irn_link(sel); + for (sel = (ir_node*)get_entity_link(ent); sel != NULL; + sel = next) { + next = (ir_node*)get_irn_link(sel); /* we must mark this sel for later */ pset_insert_ptr(sels, sel); key = find_path(sel, 0); - path = set_find(pathes, key, PATH_SIZE(key), path_hash(key)); + path = (path_t*)set_find(pathes, key, PATH_SIZE(key), path_hash(key)); if (path) { SET_VNUM(sel, path->vnum); @@ -495,7 +512,7 @@ static unsigned allocate_value_numbers(pset *sels, ir_entity *ent, unsigned vnum SET_VNUM(sel, key->vnum); DB((dbg, SET_LEVEL_3, " %+F represents value %u\n", sel, key->vnum)); - ARR_EXTO(ir_mode *, *modes, (int)((key->vnum + 15) & ~15)); + ARR_EXTO(ir_mode *, *modes, (key->vnum + 15) & ~15); (*modes)[key->vnum] = get_type_mode(get_entity_type(get_Sel_entity(sel))); @@ -527,7 +544,7 @@ static unsigned allocate_value_numbers(pset *sels, ir_entity *ent, unsigned vnum /** * A list entry for the fixing lists */ -typedef struct _list_entry_t { +typedef struct list_entry_t { ir_node *node; /**< the node that must be fixed */ unsigned vnum; /**< the value number of this node */ } list_entry_t; @@ -535,7 +552,7 @@ typedef struct _list_entry_t { /** * environment for memory walker */ -typedef struct _env_t { +typedef struct env_t { int nvals; /**< number of values */ ir_mode **modes; /**< the modes of the values */ pset *sels; /**< A set of all Sel nodes that have a value number */ @@ -544,11 +561,13 @@ typedef struct _env_t { /** * topological post-walker. */ -static void topologic_walker(ir_node *node, void *ctx) { - env_t *env = ctx; - ir_node *adr, *block, *mem, *val; - ir_mode *mode; - unsigned vnum; +static void topologic_walker(ir_node *node, void *ctx) +{ + env_t *env = (env_t*)ctx; + ir_graph *irg = get_irn_irg(node); + ir_node *adr, *block, *mem, *val; + ir_mode *mode; + unsigned vnum; if (is_Load(node)) { /* a load, check if we can resolve it */ @@ -586,14 +605,14 @@ static void topologic_walker(ir_node *node, void *ctx) { Handle this here. */ mode = get_Load_mode(node); if (mode != get_irn_mode(val)) - val = new_d_Conv(get_irn_dbg_info(node), val, mode); + val = new_rd_Conv(get_irn_dbg_info(node), block, val, mode); mem = get_Load_mem(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_Jmp()); - set_Tuple_pred(node, pn_Load_X_except, new_Bad()); + set_Tuple_pred(node, pn_Load_X_regular, new_r_Jmp(block)); + set_Tuple_pred(node, pn_Load_X_except, new_r_Bad(irg, mode_X)); } else if (is_Store(node)) { DB((dbg, SET_LEVEL_3, " checking %+F for replacement ", node)); @@ -621,15 +640,15 @@ static void topologic_walker(ir_node *node, void *ctx) { /* Beware: A Store can contain a hidden conversion in Firm. */ 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]); + val = new_rd_Conv(get_irn_dbg_info(node), block, val, env->modes[vnum]); 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_Jmp()); - set_Tuple_pred(node, pn_Store_X_except, new_Bad()); + set_Tuple_pred(node, pn_Store_X_regular, new_r_Jmp(block)); + set_Tuple_pred(node, pn_Store_X_except, new_r_Bad(irg, mode_X)); } } @@ -641,23 +660,25 @@ static void topologic_walker(ir_node *node, void *ctx) { * @param modes A flexible array, containing all the modes of * the value numbers. */ -static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes) { +static void do_scalar_replacements(ir_graph *irg, pset *sels, int nvals, + ir_mode **modes) +{ env_t env; - ssa_cons_start(current_ir_graph, nvals); + ssa_cons_start(irg, nvals); - env.nvals = nvals; - env.modes = modes; - env.sels = sels; + env.nvals = nvals; + env.modes = modes; + env.sels = sels; /* * second step: walk over the graph blockwise in topological order * and fill the array as much as possible. */ - DB((dbg, SET_LEVEL_3, "Substituting Loads and Stores in %+F\n", current_ir_graph)); - irg_walk_blkwise_graph(current_ir_graph, NULL, topologic_walker, &env); + DB((dbg, SET_LEVEL_3, "Substituting Loads and Stores in %+F\n", irg)); + irg_walk_blkwise_graph(irg, NULL, topologic_walker, &env); - ssa_cons_finish(current_ir_graph); + ssa_cons_finish(irg); } /* @@ -665,7 +686,8 @@ static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes) { * * @param irg The current ir graph. */ -int scalar_replacement_opt(ir_graph *irg) { +int scalar_replacement_opt(ir_graph *irg) +{ unsigned nvals; int i; scalars_t key, *value; @@ -673,16 +695,9 @@ int scalar_replacement_opt(ir_graph *irg) { ir_mode **modes; set *set_ent; pset *sels; - ir_type *ent_type; - ir_graph *rem; + ir_type *ent_type, *frame_tp; int res = 0; - if (! get_opt_scalar_replacement()) - return 0; - - rem = current_ir_graph; - current_ir_graph = irg; - /* Call algorithm that computes the out edges */ assure_irg_outs(irg); @@ -696,10 +711,11 @@ int scalar_replacement_opt(ir_graph *irg) { /* Insert in set the scalar replacements. */ irg_frame = get_irg_frame(irg); - nvals = 0; - modes = NEW_ARR_F(ir_mode *, 16); - set_ent = new_set(ent_cmp, 8); - sels = pset_new_ptr(8); + nvals = 0; + modes = NEW_ARR_F(ir_mode *, 16); + set_ent = new_set(ent_cmp, 8); + sels = pset_new_ptr(8); + frame_tp = get_irg_frame_type(irg); for (i = get_irn_n_outs(irg_frame) - 1; i >= 0; --i) { ir_node *succ = get_irn_out(irg_frame, i); @@ -707,13 +723,17 @@ int scalar_replacement_opt(ir_graph *irg) { if (is_Sel(succ)) { ir_entity *ent = get_Sel_entity(succ); + /* we are only interested in entities on the frame, NOT + on the value type */ + if (get_entity_owner(ent) != frame_tp) + continue; + if (get_entity_link(ent) == NULL || get_entity_link(ent) == ADDRESS_TAKEN) continue; ent_type = get_entity_type(ent); key.ent = ent; - key.ent_owner = get_entity_owner(ent); set_insert(set_ent, &key, sizeof(key), HASH_PTR(key.ent)); #ifdef DEBUG_libfirm @@ -736,10 +756,10 @@ int scalar_replacement_opt(ir_graph *irg) { /* If scalars were found. */ if (nvals > 0) { - do_scalar_replacements(sels, nvals, modes); + do_scalar_replacements(irg, sels, nvals, modes); - foreach_set(set_ent, value) { - remove_class_member(value->ent_owner, value->ent); + foreach_set(set_ent, scalars_t*, value) { + free_entity(value->ent); } /* @@ -747,9 +767,6 @@ int scalar_replacement_opt(ir_graph *irg) { * neither changed control flow, cf-backedges should be still * consistent. */ - set_irg_outs_inconsistent(irg); - set_irg_loopinfo_inconsistent(irg); - res = 1; } del_pset(sels); @@ -760,10 +777,16 @@ int scalar_replacement_opt(ir_graph *irg) { ir_free_resources(irg, IR_RESOURCE_IRN_LINK); irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK); - current_ir_graph = rem; return res; } -void firm_init_scalar_replace(void) { +ir_graph_pass_t *scalar_replacement_opt_pass(const char *name) +{ + return def_graph_pass_ret(name ? name : "scalar_rep", + scalar_replacement_opt); +} + +void firm_init_scalar_replace(void) +{ FIRM_DBG_REGISTER(dbg, "firm.opt.scalar_replace"); }