X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fscalar_replace.c;h=d432b4b197bf030480168ba8ffcbcd64ba494ede;hb=94e9283b212f0f10b460248de945576a0bb61703;hp=276baf3b58af018b242ff7b411b8f06d453ab932;hpb=41fac672b8f412b67e502dff0f9b03af6ceaef73;p=libfirm diff --git a/ir/opt/scalar_replace.c b/ir/opt/scalar_replace.c index 276baf3b5..d432b4b19 100644 --- a/ir/opt/scalar_replace.c +++ b/ir/opt/scalar_replace.c @@ -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" @@ -83,7 +85,8 @@ 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) { +static int path_cmp(const void *elt, const void *key, size_t size) +{ const path_t *p1 = elt; const path_t *p2 = key; (void) size; @@ -97,7 +100,8 @@ 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) { +static int ent_cmp(const void *elt, const void *key, size_t size) +{ const scalars_t *c1 = elt; const scalars_t *c2 = key; (void) size; @@ -108,7 +112,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 +128,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 +158,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) || @@ -211,13 +218,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 +281,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) { @@ -320,7 +329,8 @@ static void *ADDRESS_TAKEN = &_x; * @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; @@ -427,7 +437,8 @@ static int find_possible_replacements(ir_graph *irg) { * @param sel the Sel node * @param len the length of the path so far */ -static path_t *find_path(ir_node *sel, unsigned len) { +static path_t *find_path(ir_node *sel, unsigned len) +{ int pos, i, n; path_t *res; ir_node *pred = get_Sel_ptr(sel); @@ -544,7 +555,8 @@ typedef struct _env_t { /** * topological post-walker. */ -static void topologic_walker(ir_node *node, void *ctx) { +static void topologic_walker(ir_node *node, void *ctx) +{ env_t *env = ctx; ir_node *adr, *block, *mem, *val; ir_mode *mode; @@ -641,7 +653,8 @@ 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(pset *sels, int nvals, ir_mode **modes) +{ env_t env; ssa_cons_start(current_ir_graph, nvals); @@ -665,7 +678,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,13 +687,10 @@ int scalar_replacement_opt(ir_graph *irg) { ir_mode **modes; set *set_ent; pset *sels; - ir_type *ent_type; + ir_type *ent_type, *frame_tp; ir_graph *rem; int res = 0; - if (! get_opt_scalar_replacement()) - return 0; - rem = current_ir_graph; current_ir_graph = irg; @@ -696,10 +707,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,6 +719,11 @@ 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; @@ -764,6 +781,13 @@ int scalar_replacement_opt(ir_graph *irg) { 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"); }