bearch: Use arch_register_req_is(req, ignore) instead of arch_irn_is_ignore(...)...
[libfirm] / ir / be / belower.c
index dc93e6b..b8a1d01 100644 (file)
 
 /**
  * @file
- * @brief       Performs lowering of perm nodes. Inserts copies to assure register constraints.
+ * @brief       Performs lowering of perm nodes. Inserts copies to assure
+ *              register constraints.
  * @author      Christian Wuerdig
  * @date        14.12.2005
- * @version     $Id$
  */
 #include "config.h"
 
 #include "debug.h"
 #include "xmalloc.h"
 #include "irnodeset.h"
-#include "irnodemap.h"
+#include "irnodehashmap.h"
 #include "irgmod.h"
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "array_t.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "belower.h"
 #include "benode.h"
 #include "besched.h"
@@ -60,9 +61,9 @@ typedef struct {
 
 /** Environment for constraints. */
 typedef struct {
-       ir_graph      *irg;
-       ir_nodemap_t   op_set;
-       struct obstack obst;
+       ir_graph        *irg;
+       ir_nodehashmap_t op_set;
+       struct obstack   obst;
 } constraint_env_t;
 
 /** Lowering walker environment. */
@@ -301,8 +302,6 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
         * NOTE: This works with auto-magic. If we insert the new copy/exchange
         * nodes after this node, everything should be ok. */
        ir_node                     *      sched_point = sched_prev(irn);
-       const ir_edge_t             *      edge;
-       const ir_edge_t             *      next;
        int                                n;
        int                                i;
 
@@ -313,7 +312,7 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
 
        /* build the list of register pairs (in, out) */
        n = 0;
-       foreach_out_edge_safe(irn, edge, next) {
+       foreach_out_edge_safe(irn, edge) {
                ir_node               *const out     = get_edge_src_irn(edge);
                long                   const pn      = get_Proj_proj(out);
                ir_node               *const in      = get_irn_n(irn, pn);
@@ -455,7 +454,7 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
                                        DB((dbg, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n",
                                                                irn, arg1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name));
 
-                                       cpyxchg = be_new_Copy(reg_class, block, arg1);
+                                       cpyxchg = be_new_Copy(block, arg1);
                                        arch_set_irn_register(cpyxchg, cycle.elems[i + 1]);
 
                                        /* exchange copy node and proj */
@@ -502,13 +501,14 @@ static ir_node *find_copy(ir_node *irn, ir_node *op)
 
 static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, constraint_env_t *env)
 {
-       ir_nodemap_t                *op_set;
+       ir_nodehashmap_t            *op_set;
        ir_node                     *block;
        const arch_register_class_t *cls;
        ir_node                     *keep, *cpy;
        op_copy_assoc_t             *entry;
 
-       if (arch_irn_is_ignore(other_different) ||
+       arch_register_req_t const *const req = arch_get_irn_register_req(other_different);
+       if (arch_register_req_is(req, ignore) ||
                        !mode_is_datab(get_irn_mode(other_different))) {
                DB((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
                return;
@@ -516,7 +516,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
 
        op_set = &env->op_set;
        block  = get_nodes_block(irn);
-       cls    = arch_get_irn_reg_class_out(other_different);
+       cls    = req->cls;
 
        /* Make a not spillable copy of the different node   */
        /* this is needed because the different irn could be */
@@ -526,8 +526,8 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        /* check if already exists such a copy in the schedule immediately before */
        cpy = find_copy(skip_Proj(irn), other_different);
        if (! cpy) {
-               cpy = be_new_Copy(cls, block, other_different);
-               arch_irn_set_flags(cpy, arch_irn_flags_dont_spill);
+               cpy = be_new_Copy(block, other_different);
+               arch_set_irn_flags(cpy, arch_irn_flags_dont_spill);
                DB((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different));
        } else {
                DB((dbg_constr, LEVEL_1, "using already existing %+F for value %+F\n", cpy, other_different));
@@ -536,7 +536,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        /* Add the Keep resp. CopyKeep and reroute the users */
        /* of the other_different irn in case of CopyKeep.   */
        if (has_irn_users(other_different)) {
-               keep = be_new_CopyKeep_single(cls, block, cpy, irn, get_irn_mode(other_different));
+               keep = be_new_CopyKeep_single(block, cpy, irn);
                be_node_set_reg_class_in(keep, 1, cls);
        } else {
                ir_node *in[2];
@@ -555,13 +555,13 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        sched_add_after(skip_Proj(irn), keep);
 
        /* insert the other different and its copies into the map */
-       entry = (op_copy_assoc_t*)ir_nodemap_get(op_set, other_different);
+       entry = ir_nodehashmap_get(op_copy_assoc_t, op_set, other_different);
        if (! entry) {
                entry      = OALLOC(&env->obst, op_copy_assoc_t);
                entry->cls = cls;
                ir_nodeset_init(&entry->copies);
 
-               ir_nodemap_insert(op_set, other_different, entry);
+               ir_nodehashmap_insert(op_set, other_different, entry);
        }
 
        /* insert copy */
@@ -582,7 +582,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
  */
 static void assure_different_constraints(ir_node *irn, ir_node *skipped_irn, constraint_env_t *env)
 {
-       const arch_register_req_t *req = arch_get_register_req_out(irn);
+       const arch_register_req_t *req = arch_get_irn_register_req(irn);
 
        if (arch_register_req_is(req, must_be_different)) {
                const unsigned other = req->other_different;
@@ -621,15 +621,12 @@ static void assure_different_constraints(ir_node *irn, ir_node *skipped_irn, con
  */
 static void assure_constraints_walker(ir_node *block, void *walk_env)
 {
-       ir_node *irn;
        constraint_env_t *env = (constraint_env_t*)walk_env;
 
        sched_foreach_reverse(block, irn) {
                ir_mode *mode = get_irn_mode(irn);
 
                if (mode == mode_T) {
-                       const ir_edge_t *edge;
-
                        foreach_out_edge(irn, edge) {
                                ir_node *proj = get_edge_src_irn(edge);
 
@@ -649,16 +646,14 @@ static void assure_constraints_walker(ir_node *block, void *walk_env)
  */
 static void melt_copykeeps(constraint_env_t *cenv)
 {
-       ir_nodemap_iterator_t map_iter;
-       ir_nodemap_entry_t    map_entry;
+       ir_nodehashmap_iterator_t map_iter;
+       ir_nodehashmap_entry_t    map_entry;
 
        /* for all */
-       foreach_ir_nodemap(&cenv->op_set, map_entry, map_iter) {
+       foreach_ir_nodehashmap(&cenv->op_set, map_entry, map_iter) {
                op_copy_assoc_t *entry = (op_copy_assoc_t*)map_entry.data;
                int     idx, num_ck;
-               ir_node *cp;
                struct obstack obst;
-               ir_nodeset_iterator_t iter;
                ir_node **ck_arr, **melt_arr;
 
                obstack_init(&obst);
@@ -686,7 +681,6 @@ static void melt_copykeeps(constraint_env_t *cenv)
                        if (ck_arr[idx]) {
                                int j, n_melt;
                                ir_node **new_ck_in;
-                               ir_node *new_ck;
                                ir_node *sched_pt = NULL;
 
                                n_melt     = 1;
@@ -732,11 +726,9 @@ static void melt_copykeeps(constraint_env_t *cenv)
                                                kill_node(melt_arr[j]);
                                }
 
+                               ir_node *const new_ck = be_new_CopyKeep(get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in);
 #ifdef KEEP_ALIVE_COPYKEEP_HACK
-                               new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY);
                                keep_alive(new_ck);
-#else
-                               new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref));
 #endif /* KEEP_ALIVE_COPYKEEP_HACK */
 
                                /* set register class for all kept inputs */
@@ -766,14 +758,14 @@ static void melt_copykeeps(constraint_env_t *cenv)
 
 void assure_constraints(ir_graph *irg)
 {
-       constraint_env_t      cenv;
-       ir_nodemap_iterator_t map_iter;
-       ir_nodemap_entry_t    map_entry;
+       constraint_env_t          cenv;
+       ir_nodehashmap_iterator_t map_iter;
+       ir_nodehashmap_entry_t    map_entry;
 
        FIRM_DBG_REGISTER(dbg_constr, "firm.be.lower.constr");
 
        cenv.irg = irg;
-       ir_nodemap_init(&cenv.op_set);
+       ir_nodehashmap_init(&cenv.op_set);
        obstack_init(&cenv.obst);
 
        irg_block_walk_graph(irg, NULL, assure_constraints_walker, &cenv);
@@ -784,12 +776,10 @@ void assure_constraints(ir_graph *irg)
        melt_copykeeps(&cenv);
 
        /* for all */
-       foreach_ir_nodemap(&cenv.op_set, map_entry, map_iter) {
+       foreach_ir_nodehashmap(&cenv.op_set, map_entry, map_iter) {
                op_copy_assoc_t          *entry = (op_copy_assoc_t*)map_entry.data;
                size_t                    n     = ir_nodeset_size(&entry->copies);
                ir_node                 **nodes = ALLOCAN(ir_node*, n);
-               ir_node                  *cp;
-               ir_nodeset_iterator_t     iter;
                be_ssa_construction_env_t senv;
 
                /* put the node in an array */
@@ -830,12 +820,11 @@ void assure_constraints(ir_graph *irg)
                ir_nodeset_destroy(&entry->copies);
        }
 
-       ir_nodemap_destroy(&cenv.op_set);
+       ir_nodehashmap_destroy(&cenv.op_set);
        obstack_free(&cenv.obst, NULL);
-       be_liveness_invalidate(be_get_irg_liveness(irg));
+       be_invalidate_live_sets(irg);
 }
 
-
 /**
  * Push nodes that do not need to be permed through the Perm.
  * This is commonly a reload cascade at block ends.
@@ -853,7 +842,6 @@ static int push_through_perm(ir_node *perm)
 {
        ir_graph *irg     = get_irn_irg(perm);
        ir_node *bl       = get_nodes_block(perm);
-       ir_node *node;
        int  arity        = get_irn_arity(perm);
        int *map;
        int *proj_map;
@@ -861,13 +849,11 @@ static int push_through_perm(ir_node *perm)
        int n_moved;
        int new_size;
        ir_node *frontier = bl;
-       ir_node *irn;
        int i, n;
 
        /* get some Proj and find out the register class of that Proj. */
-       const ir_edge_t             *edge     = get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL);
-       ir_node                     *one_proj = get_edge_src_irn(edge);
-       const arch_register_class_t *cls      = arch_get_irn_reg_class_out(one_proj);
+       ir_node                     *one_proj = get_edge_src_irn(get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL));
+       const arch_register_class_t *cls      = arch_get_irn_reg_class(one_proj);
        assert(is_Proj(one_proj));
 
        DB((dbg_permmove, LEVEL_1, "perm move %+F irg %+F\n", perm, irg));
@@ -895,12 +881,15 @@ found_front:
 
        DB((dbg_permmove, LEVEL_2, "\tfrontier: %+F\n", frontier));
 
-       node = sched_prev(perm);
        n_moved = 0;
-       while (!sched_is_begin(node)) {
+       for (;;) {
+               ir_node *const node = sched_prev(perm);
+               if (node == frontier)
+                       break;
+
                const arch_register_req_t *req;
                int                        input = -1;
-               ir_node                   *proj;
+               ir_node                   *proj  = NULL;
 
                /* search if node is a INPUT of Perm */
                foreach_out_edge(perm, edge) {
@@ -916,11 +905,9 @@ found_front:
                /* it wasn't an input to the perm, we can't do anything more */
                if (input < 0)
                        break;
-               if (!sched_comes_after(frontier, node))
-                       break;
                if (arch_irn_is(node, modify_flags))
                        break;
-               req = arch_get_register_req_out(node);
+               req = arch_get_irn_register_req(node);
                if (req->type != arch_register_req_type_normal)
                        break;
                for (i = get_irn_arity(node) - 1; i >= 0; --i) {
@@ -946,8 +933,6 @@ found_front:
 
                bitset_set(moved, input);
                n_moved++;
-
-               node = sched_prev(node);
        }
 
        /* well, we could not push anything through the perm */
@@ -1014,7 +999,7 @@ void lower_nodes_after_ra(ir_graph *irg, int do_copy)
        env.do_copy = do_copy;
 
        /* we will need interference */
-       be_liveness_assure_chk(be_get_irg_liveness(irg));
+       be_assure_live_chk(irg);
 
        irg_walk_graph(irg, NULL, lower_nodes_after_ra_walker, &env);
 }