Let foreach_pset() declare its iterator variable.
[libfirm] / ir / opt / ldstopt.c
index c8552d6..3667f26 100644 (file)
@@ -21,7 +21,6 @@
  * @file
  * @brief   Load/Store optimizations.
  * @author  Michael Beck
- * @version $Id$
  */
 #include "config.h"
 
@@ -35,6 +34,7 @@
 #include "ircons_t.h"
 #include "irgmod.h"
 #include "irgwalk.h"
+#include "irtools.h"
 #include "tv_t.h"
 #include "dbginfo_t.h"
 #include "iropt_dbg.h"
@@ -43,9 +43,8 @@
 #include "irhooks.h"
 #include "iredges.h"
 #include "irpass.h"
-#include "opt_polymorphy.h"
 #include "irmemory.h"
-#include "irphase_t.h"
+#include "irnodehashmap.h"
 #include "irgopt.h"
 #include "set.h"
 #include "be.h"
@@ -74,7 +73,7 @@ typedef struct walk_env_t {
 
 /** A Load/Store info. */
 typedef struct ldst_info_t {
-       ir_node  *projs[MAX_PROJ];    /**< list of Proj's of this node */
+       ir_node  *projs[MAX_PROJ+1];  /**< list of Proj's of this node */
        ir_node  *exc_block;          /**< the exception block if available */
        int      exc_idx;             /**< predecessor index in the exception block */
        unsigned visited;             /**< visited counter for breaking loops */
@@ -338,170 +337,6 @@ static long get_Sel_array_index_long(ir_node *n, int dim)
        return get_tarval_long(get_Const_tarval(index));
 }  /* get_Sel_array_index_long */
 
-/**
- * Returns the accessed component graph path for an
- * node computing an address.
- *
- * @param ptr    the node computing the address
- * @param depth  current depth in steps upward from the root
- *               of the address
- */
-static compound_graph_path *rec_get_accessed_path(ir_node *ptr, size_t depth)
-{
-       compound_graph_path *res = NULL;
-       ir_entity           *root, *field, *ent;
-       size_t              path_len, pos, idx;
-       ir_tarval           *tv;
-       ir_type             *tp;
-
-       if (is_SymConst(ptr)) {
-               /* a SymConst. If the depth is 0, this is an access to a global
-                * entity and we don't need a component path, else we know
-                * at least its length.
-                */
-               assert(get_SymConst_kind(ptr) == symconst_addr_ent);
-               root = get_SymConst_entity(ptr);
-               res = (depth == 0) ? NULL : new_compound_graph_path(get_entity_type(root), depth);
-       } else if (is_Sel(ptr)) {
-               /* it's a Sel, go up until we find the root */
-               res = rec_get_accessed_path(get_Sel_ptr(ptr), depth+1);
-               if (res == NULL)
-                       return NULL;
-
-               /* fill up the step in the path at the current position */
-               field    = get_Sel_entity(ptr);
-               path_len = get_compound_graph_path_length(res);
-               pos      = path_len - depth - 1;
-               set_compound_graph_path_node(res, pos, field);
-
-               if (is_Array_type(get_entity_owner(field))) {
-                       assert(get_Sel_n_indexs(ptr) == 1 && "multi dim arrays not implemented");
-                       set_compound_graph_path_array_index(res, pos, get_Sel_array_index_long(ptr, 0));
-               }
-       } else if (is_Add(ptr)) {
-               ir_mode   *mode;
-               ir_tarval *tmp;
-
-               {
-                       ir_node   *l    = get_Add_left(ptr);
-                       ir_node   *r    = get_Add_right(ptr);
-                       if (is_Const(r) && get_irn_mode(l) == get_irn_mode(ptr)) {
-                               ptr = l;
-                               tv  = get_Const_tarval(r);
-                       } else {
-                               ptr = r;
-                               tv  = get_Const_tarval(l);
-                       }
-               }
-ptr_arith:
-               mode = get_tarval_mode(tv);
-               tmp  = tv;
-
-               /* ptr must be a Sel or a SymConst, this was checked in find_constant_entity() */
-               if (is_Sel(ptr)) {
-                       field = get_Sel_entity(ptr);
-               } else {
-                       field = get_SymConst_entity(ptr);
-               }
-               idx = 0;
-               for (ent = field;;) {
-                       unsigned   size;
-                       ir_tarval *sz, *tv_index, *tlower, *tupper;
-                       ir_node   *bound;
-
-                       tp = get_entity_type(ent);
-                       if (! is_Array_type(tp))
-                               break;
-                       ent = get_array_element_entity(tp);
-                       size = get_type_size_bytes(get_entity_type(ent));
-                       sz   = new_tarval_from_long(size, mode);
-
-                       tv_index = tarval_div(tmp, sz);
-                       tmp      = tarval_mod(tmp, sz);
-
-                       if (tv_index == tarval_bad || tmp == tarval_bad)
-                               return NULL;
-
-                       assert(get_array_n_dimensions(tp) == 1 && "multiarrays not implemented");
-                       bound  = get_array_lower_bound(tp, 0);
-                       tlower = computed_value(bound);
-                       bound  = get_array_upper_bound(tp, 0);
-                       tupper = computed_value(bound);
-
-                       if (tlower == tarval_bad || tupper == tarval_bad)
-                               return NULL;
-
-                       if (tarval_cmp(tv_index, tlower) == ir_relation_less)
-                               return NULL;
-                       if (tarval_cmp(tupper, tv_index) == ir_relation_less)
-                               return NULL;
-
-                       /* ok, bounds check finished */
-                       ++idx;
-               }
-               if (! tarval_is_null(tmp)) {
-                       /* access to some struct/union member */
-                       return NULL;
-               }
-
-               /* should be at least ONE array */
-               if (idx == 0)
-                       return NULL;
-
-               res = rec_get_accessed_path(ptr, depth + idx);
-               if (res == NULL)
-                       return NULL;
-
-               path_len = get_compound_graph_path_length(res);
-               pos      = path_len - depth - idx;
-
-               for (ent = field;;) {
-                       unsigned   size;
-                       ir_tarval *sz, *tv_index;
-                       long       index;
-
-                       tp = get_entity_type(ent);
-                       if (! is_Array_type(tp))
-                               break;
-                       ent = get_array_element_entity(tp);
-                       set_compound_graph_path_node(res, pos, ent);
-
-                       size = get_type_size_bytes(get_entity_type(ent));
-                       sz   = new_tarval_from_long(size, mode);
-
-                       tv_index = tarval_div(tv, sz);
-                       tv       = tarval_mod(tv, sz);
-
-                       /* worked above, should work again */
-                       assert(tv_index != tarval_bad && tv != tarval_bad);
-
-                       /* bounds already checked above */
-                       index = get_tarval_long(tv_index);
-                       set_compound_graph_path_array_index(res, pos, index);
-                       ++pos;
-               }
-       } else if (is_Sub(ptr)) {
-               ir_node *l = get_Sub_left(ptr);
-               ir_node *r = get_Sub_right(ptr);
-
-               ptr = l;
-               tv  = get_Const_tarval(r);
-               tv  = tarval_neg(tv);
-               goto ptr_arith;
-       }
-       return res;
-}  /* rec_get_accessed_path */
-
-/**
- * Returns an access path or NULL.  The access path is only
- * valid, if the graph is in phase_high and _no_ address computation is used.
- */
-static compound_graph_path *get_accessed_path(ir_node *ptr)
-{
-       compound_graph_path *gr = rec_get_accessed_path(ptr, 0);
-       return gr;
-}  /* get_accessed_path */
-
 typedef struct path_entry {
        ir_entity         *ent;
        struct path_entry *next;
@@ -780,8 +615,8 @@ static unsigned is_Call_pure(ir_node *call)
                /* try the called entity */
                ir_node *ptr = get_Call_ptr(call);
 
-               if (is_Global(ptr)) {
-                       ir_entity *ent = get_Global_entity(ptr);
+               if (is_SymConst_addr_ent(ptr)) {
+                       ir_entity *ent = get_SymConst_entity(ptr);
 
                        prop = get_entity_additional_properties(ent);
                }
@@ -1096,8 +931,9 @@ ir_node *can_replace_load_by_const(const ir_node *load, ir_node *c)
                if (is_reinterpret_cast(c_mode, l_mode)) {
                        /* copy the value from the const code irg and cast it */
                        res = new_rd_Conv(dbgi, block, res, l_mode);
+               } else {
+                       return NULL;
                }
-               return NULL;
        }
        return res;
 }
@@ -1140,50 +976,45 @@ static unsigned optimize_load(ir_node *load)
                return res | DF_CHANGED;
        }
 
-       /* Load from a constant polymorphic field, where we can resolve
-          polymorphism. */
-       value = transform_polymorph_Load(load);
-       if (value == load) {
-               value = NULL;
-               /* check if we can determine the entity that will be loaded */
-               ent = find_constant_entity(ptr);
-               if (ent != NULL
-                               && get_entity_visibility(ent) != ir_visibility_external) {
-                       /* a static allocation that is not external: there should be NO
-                        * exception when loading even if we cannot replace the load itself.
-                        */
-
-                       /* no exception, clear the info field as it might be checked later again */
-                       if (info->projs[pn_Load_X_except]) {
-                               ir_graph *irg = get_irn_irg(load);
-                               exchange(info->projs[pn_Load_X_except], new_r_Bad(irg, mode_X));
-                               info->projs[pn_Load_X_except] = NULL;
-                               res |= CF_CHANGED;
-                       }
-                       if (info->projs[pn_Load_X_regular]) {
-                               exchange(info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
-                               info->projs[pn_Load_X_regular] = NULL;
-                               res |= CF_CHANGED;
-                       }
-
-                       if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT) {
-                               if (ent->initializer != NULL) {
-                                       /* new style initializer */
-                                       value = find_compound_ent_value(ptr);
-                               } else if (entity_has_compound_ent_values(ent)) {
-                                       /* old style initializer */
-                                       compound_graph_path *path = get_accessed_path(ptr);
+       value = NULL;
+       /* check if we can determine the entity that will be loaded */
+       ent = find_constant_entity(ptr);
+       if (ent != NULL
+                       && get_entity_visibility(ent) != ir_visibility_external) {
+               /* a static allocation that is not external: there should be NO
+                * exception when loading even if we cannot replace the load itself.
+                */
 
-                                       if (path != NULL) {
-                                               assert(is_proper_compound_graph_path(path, get_compound_graph_path_length(path)-1));
+               /* no exception, clear the info field as it might be checked later again */
+               if (info->projs[pn_Load_X_except]) {
+                       ir_graph *irg = get_irn_irg(load);
+                       exchange(info->projs[pn_Load_X_except], new_r_Bad(irg, mode_X));
+                       info->projs[pn_Load_X_except] = NULL;
+                       res |= CF_CHANGED;
+               }
+               if (info->projs[pn_Load_X_regular]) {
+                       exchange(info->projs[pn_Load_X_regular], new_r_Jmp(get_nodes_block(load)));
+                       info->projs[pn_Load_X_regular] = NULL;
+                       res |= CF_CHANGED;
+               }
 
-                                               value = get_compound_ent_value_by_path(ent, path);
-                                               DB((dbg, LEVEL_1, "  Constant access at %F%F resulted in %+F\n", ent, path, value));
-                                               free_compound_graph_path(path);
-                                       }
+               if (get_entity_linkage(ent) & IR_LINKAGE_CONSTANT) {
+                       if (has_entity_initializer(ent)) {
+                               /* new style initializer */
+                               value = find_compound_ent_value(ptr);
+                       }
+                       if (value != NULL) {
+                               ir_graph *irg = get_irn_irg(load);
+                               value = can_replace_load_by_const(load, value);
+                               if (value != NULL && is_Sel(ptr)) {
+                                       /* frontend has inserted masking operations after bitfield accesses,
+                                        * so we might have to shift the const. */
+                                       unsigned char bit_offset = get_entity_offset_bits_remainder(get_Sel_entity(ptr));
+                                       ir_tarval *tv_old = get_Const_tarval(value);
+                                       ir_tarval *tv_offset = new_tarval_from_long(bit_offset, mode_Bu);
+                                       ir_tarval *tv_new = tarval_shl(tv_old, tv_offset);
+                                       value = new_r_Const(irg, tv_new);
                                }
-                               if (value != NULL)
-                                       value = can_replace_load_by_const(load, value);
                        }
                }
        }
@@ -1480,7 +1311,10 @@ static unsigned optimize_store(ir_node *store)
 static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
 {
        int i, n;
-       ir_node *store, *old_store, *ptr, *block, *phi_block, *phiM, *phiD, *exc, *projM;
+       ir_node *store, *ptr, *block, *phi_block, *phiM, *phiD, *exc, *projM;
+#ifdef DO_CACHEOPT
+       ir_node *old_store;
+#endif
        ir_mode *mode;
        ir_node **inM, **inD, **projMs;
        int *idx;
@@ -1503,7 +1337,9 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
                return 0;
 
        store = skip_Proj(projM);
+#ifdef DO_CACHEOPT
        old_store = store;
+#endif
        if (!is_Store(store))
                return 0;
 
@@ -1673,7 +1509,7 @@ static void do_load_store_optimize(ir_node *n, void *env)
                break;
 
        default:
-               ;
+               break;
        }
 }  /* do_load_store_optimize */
 
@@ -1694,13 +1530,14 @@ typedef struct node_entry {
 
 /** A loop entry. */
 typedef struct loop_env {
-       ir_phase ph;           /**< the phase object */
-       ir_node  **stack;      /**< the node stack */
-       size_t   tos;          /**< tos index */
-       unsigned nextDFSnum;   /**< the current DFS number */
-       unsigned POnum;        /**< current post order number */
-
-       unsigned changes;      /**< a bitmask of graph changes */
+       ir_nodehashmap_t map;
+       struct obstack   obst;
+       ir_node          **stack;      /**< the node stack */
+       size_t           tos;          /**< tos index */
+       unsigned         nextDFSnum;   /**< the current DFS number */
+       unsigned         POnum;        /**< current post order number */
+
+       unsigned         changes;      /**< a bitmask of graph changes */
 } loop_env;
 
 /**
@@ -1708,13 +1545,12 @@ typedef struct loop_env {
 */
 static node_entry *get_irn_ne(ir_node *irn, loop_env *env)
 {
-       ir_phase   *ph = &env->ph;
-       node_entry *e  = (node_entry*)phase_get_irn_data(&env->ph, irn);
+       node_entry *e = (node_entry*)ir_nodehashmap_get(&env->map, irn);
 
-       if (! e) {
-               e = (node_entry*)phase_alloc(ph, sizeof(*e));
+       if (e == NULL) {
+               e = OALLOC(&env->obst, node_entry);
                memset(e, 0, sizeof(*e));
-               phase_set_irn_data(ph, irn, e);
+               ir_nodehashmap_insert(&env->map, irn, e);
        }
        return e;
 }  /* get_irn_ne */
@@ -1802,7 +1638,7 @@ static int cmp_avail_entry(const void *elt, const void *key, size_t size)
  */
 static unsigned hash_cache_entry(const avail_entry_t *entry)
 {
-       return get_irn_idx(entry->ptr) * 9 + HASH_PTR(entry->mode);
+       return get_irn_idx(entry->ptr) * 9 + hash_ptr(entry->mode);
 }  /* hash_cache_entry */
 
 /**
@@ -1814,13 +1650,10 @@ static unsigned hash_cache_entry(const avail_entry_t *entry)
 static void move_loads_out_of_loops(scc *pscc, loop_env *env)
 {
        ir_node   *phi, *load, *next, *other, *next_other;
-       ir_entity *ent;
        int       j;
        phi_entry *phi_list = NULL;
        set       *avail;
 
-       avail = new_set(cmp_avail_entry, 8);
-
        /* collect all outer memories */
        for (phi = pscc->head; phi != NULL; phi = next) {
                node_entry *ne = get_irn_ne(phi, env);
@@ -1838,7 +1671,7 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env)
 
                        if (pe->pscc != ne->pscc) {
                                /* not in the same SCC, is region const */
-                               phi_entry *pe = (phi_entry*)phase_alloc(&env->ph, sizeof(*pe));
+                               phi_entry *pe = OALLOC(&env->obst, phi_entry);
 
                                pe->phi  = phi;
                                pe->pos  = j;
@@ -1854,6 +1687,8 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env)
        if (phi_list->next != NULL)
                return;
 
+       avail = new_set(cmp_avail_entry, 8);
+
        for (load = pscc->head; load; load = next) {
                ir_mode *load_mode;
                node_entry *ne = get_irn_ne(load, env);
@@ -1868,9 +1703,8 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env)
                                continue;
 
                        /* for now, we can only move Load(Global) */
-                       if (! is_Global(ptr))
+                       if (! is_SymConst_addr_ent(ptr))
                                continue;
-                       ent       = get_Global_entity(ptr);
                        load_mode = get_Load_mode(load);
                        for (other = pscc->head; other != NULL; other = next_other) {
                                node_entry *ne = get_irn_ne(other, env);
@@ -1906,17 +1740,17 @@ static void move_loads_out_of_loops(scc *pscc, loop_env *env)
 
                                        entry.ptr  = ptr;
                                        entry.mode = load_mode;
-                                       res = (avail_entry_t*)set_find(avail, &entry, sizeof(entry), hash_cache_entry(&entry));
+                                       res = set_find(avail_entry_t, avail, &entry, sizeof(entry), hash_cache_entry(&entry));
                                        if (res != NULL) {
                                                irn = res->load;
                                        } else {
                                                irn = new_rd_Load(db, pred, get_Phi_pred(phi, pos), ptr, load_mode, cons_none);
                                                entry.load = irn;
-                                               set_insert(avail, &entry, sizeof(entry), hash_cache_entry(&entry));
+                                               set_insert(avail_entry_t, avail, &entry, sizeof(entry), hash_cache_entry(&entry));
                                                DB((dbg, LEVEL_1, "  Created %+F in %+F\n", irn, pred));
                                        }
                                        pe->load = irn;
-                                       ninfo = get_ldst_info(irn, phase_obst(&env->ph));
+                                       ninfo = get_ldst_info(irn, &env->obst);
 
                                        ninfo->projs[pn_Load_M] = mem = new_r_Proj(irn, mode_M, pn_Load_M);
                                        if (res == NULL) {
@@ -2131,7 +1965,7 @@ static void dfs(ir_node *irn, loop_env *env)
                                node->low = MIN(o->DFSnum, node->low);
                }
        } else if (is_fragile_op(irn)) {
-               ir_node *pred = get_fragile_op_mem(irn);
+               ir_node *pred = get_memop_mem(irn);
                node_entry *o = get_irn_ne(pred, env);
 
                if (!irn_visited(pred)) {
@@ -2156,7 +1990,7 @@ static void dfs(ir_node *irn, loop_env *env)
        }
 
        if (node->low == node->DFSnum) {
-               scc *pscc = (scc*)phase_alloc(&env->ph, sizeof(*pscc));
+               scc *pscc = OALLOC(&env->obst, scc);
                ir_node *x;
 
                pscc->head = NULL;
@@ -2193,15 +2027,15 @@ static void do_dfs(ir_graph *irg, loop_env *env)
                ir_node *pred = get_Block_cfgpred(endblk, i);
 
                pred = skip_Proj(pred);
-               if (is_Return(pred))
+               if (is_Return(pred)) {
                        dfs(get_Return_mem(pred), env);
-               else if (is_Raise(pred))
+               } else if (is_Raise(pred)) {
                        dfs(get_Raise_mem(pred), env);
-               else if (is_fragile_op(pred))
-                       dfs(get_fragile_op_mem(pred), env);
-               else if (is_Bad(pred))
-                       /* ignore non-optimized block predecessor */;
-               else {
+               } else if (is_fragile_op(pred)) {
+                       dfs(get_memop_mem(pred), env);
+               } else if (is_Bad(pred)) {
+                       /* ignore non-optimized block predecessor */
+               else {
                        assert(0 && "Unknown EndBlock predecessor");
                }
        }
@@ -2230,13 +2064,15 @@ static int optimize_loops(ir_graph *irg)
        env.nextDFSnum    = 0;
        env.POnum         = 0;
        env.changes       = 0;
-       phase_init(&env.ph, irg, phase_irn_init_default);
+       ir_nodehashmap_init(&env.map);
+       obstack_init(&env.obst);
 
        /* calculate the SCC's and drive loop optimization. */
        do_dfs(irg, &env);
 
        DEL_ARR_F(env.stack);
-       phase_deinit(&env.ph);
+       obstack_free(&env.obst, NULL);
+       ir_nodehashmap_destroy(&env.map);
 
        return env.changes;
 }  /* optimize_loops */
@@ -2244,26 +2080,24 @@ static int optimize_loops(ir_graph *irg)
 /*
  * do the load store optimization
  */
-int optimize_load_store(ir_graph *irg)
+void optimize_load_store(ir_graph *irg)
 {
        walk_env_t env;
 
+       assure_irg_properties(irg,
+               IR_GRAPH_PROPERTY_NO_UNREACHABLE_CODE
+               | IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES
+               | IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES
+               | IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE
+               | IR_GRAPH_PROPERTY_CONSISTENT_ENTITY_USAGE);
+
        FIRM_DBG_REGISTER(dbg, "firm.opt.ldstopt");
 
        assert(get_irg_phase_state(irg) != phase_building);
        assert(get_irg_pinned(irg) != op_pin_state_floats &&
                "LoadStore optimization needs pinned graph");
 
-       /* we need landing pads */
-       remove_critical_cf_edges(irg);
-
-       edges_assure(irg);
-
-       /* for Phi optimization post-dominators are needed ... */
-       assure_postdoms(irg);
-
        if (get_opt_alias_analysis()) {
-               assure_irg_entity_usage_computed(irg);
                assure_irp_globals_entity_usage_computed();
        }
 
@@ -2281,21 +2115,15 @@ int optimize_load_store(ir_graph *irg)
 
        obstack_free(&env.obst, NULL);
 
-       /* Handle graph state */
-       if (env.changes) {
-               set_irg_entity_usage_state(irg, ir_entity_usage_not_computed);
-               edges_deactivate(irg);
-       }
-
-       if (env.changes & CF_CHANGED) {
-               /* is this really needed: Yes, control flow changed, block might
-               have Bad() predecessors. */
-               set_irg_doms_inconsistent(irg);
-       }
-       return env.changes != 0;
-}  /* optimize_load_store */
+       confirm_irg_properties(irg,
+               env.changes
+               ? env.changes & CF_CHANGED
+                       ? IR_GRAPH_PROPERTIES_NONE
+                       : IR_GRAPH_PROPERTIES_CONTROL_FLOW
+               : IR_GRAPH_PROPERTIES_ALL);
+}
 
 ir_graph_pass_t *optimize_load_store_pass(const char *name)
 {
-       return def_graph_pass_ret(name ? name : "ldst", optimize_load_store);
+       return def_graph_pass(name ? name : "ldst", optimize_load_store);
 }  /* optimize_load_store_pass */