becopyilp: Do not advertise the switch to dump the solution, because this is not...
[libfirm] / ir / be / bessadestr.c
index d98f34a..bdd38d5 100644 (file)
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -22,7 +8,6 @@
  * @brief       Performs SSA-Destruction.
  * @author      Daniel Grund
  * @date        25.05.2005
- * @version     $Id$
  */
 #include "config.h"
 
 #include "belive_t.h"
 #include "benode.h"
 #include "besched.h"
-#include "bestatevent.h"
+#include "statev_t.h"
 #include "beirg.h"
 #include "beintlive_t.h"
+#include "bespillutil.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -66,8 +52,8 @@ static void clear_link(ir_node *irn, void *data)
  */
 static void collect_phis_walker(ir_node *irn, void *data)
 {
-       be_chordal_env_t *env = data;
-       if (is_Phi(irn) && chordal_has_class(env, irn)) {
+       be_chordal_env_t *env = (be_chordal_env_t*)data;
+       if (is_Phi(irn) && arch_irn_consider_in_reg_alloc(env->cls, irn)) {
                ir_node *bl = get_nodes_block(irn);
                set_irn_link(irn, get_irn_link(bl));
                set_irn_link(bl, irn);
@@ -89,26 +75,19 @@ typedef struct {
 
 static int cmp_perm_proj(const void *a, const void *b, size_t n)
 {
-       const perm_proj_t *p = a;
-       const perm_proj_t *q = b;
+       const perm_proj_t *p = (const perm_proj_t*)a;
+       const perm_proj_t *q = (const perm_proj_t*)b;
        (void) n;
 
        return !(p->arg == q->arg);
 }
 
-typedef struct insert_all_perms_env_t {
-       be_chordal_env_t *chordal_env;
-       pmap *perm_map;
-} insert_all_perms_env_t;
-
 /**
  * Insert Perms in all predecessors of a block containing a phi
  */
 static void insert_all_perms_walker(ir_node *bl, void *data)
 {
-       insert_all_perms_env_t *env = data;
-       be_chordal_env_t *chordal_env = env->chordal_env;
-       pmap *perm_map = env->perm_map;
+       be_chordal_env_t *const chordal_env = (be_chordal_env_t*)data;
        be_lv_t *lv = be_get_irg_liveness(chordal_env->irg);
        int i, n;
 
@@ -120,26 +99,24 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
 
        /* Look at all predecessors of the phi block */
        for (i = 0, n = get_irn_arity(bl); i < n; ++i) {
-               ir_node *phi, *perm, *insert_after, **in;
-               perm_proj_t *pp;
+               ir_node *phi, *perm, **in;
                set *arg_set     = new_set(cmp_perm_proj, chordal_env->cls->n_regs);
                ir_node *pred_bl = get_Block_cfgpred_block(bl, i);
                int n_projs      = 0;
 
-               assert(!pmap_contains(perm_map, pred_bl) && "Already permed that block");
-
                /*
                 * Note that all phis in the list are in the same
                 * register class by construction.
                 */
-               for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+               for (phi = (ir_node*)get_irn_link(bl); phi != NULL;
+                    phi = (ir_node*)get_irn_link(phi)) {
                        ir_node                   *arg = get_irn_n(phi, i);
                        unsigned                   hash;
                        perm_proj_t                templ;
 
                        hash = hash_irn(arg);
                        templ.arg  = arg;
-                       pp         = set_find(arg_set, &templ, sizeof(templ), hash);
+                       perm_proj_t *const pp = set_find(perm_proj_t, arg_set, &templ, sizeof(templ), hash);
 
                        /*
                         * If a proj_perm_t entry has not been made in the argument set,
@@ -150,7 +127,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                         */
                        if (!pp && !be_is_live_in(lv, bl, arg)) {
                                templ.pos = n_projs++;
-                               set_insert(arg_set, &templ, sizeof(templ), hash);
+                               (void)set_insert(perm_proj_t, arg_set, &templ, sizeof(templ), hash);
                        }
                }
 
@@ -161,38 +138,38 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                         * above in the arg_set and insert it into the schedule.
                         */
                        in = XMALLOCN(ir_node*, n_projs);
-                       for (pp = set_first(arg_set); pp; pp = set_next(arg_set))
+                       foreach_set(arg_set, perm_proj_t, pp) {
                                in[pp->pos] = pp->arg;
+                       }
 
                        perm = be_new_Perm(chordal_env->cls, pred_bl, n_projs, in);
-                       be_stat_ev("phi_perm", n_projs);
+                       stat_ev_int("phi_perm", n_projs);
 
-                       insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, NULL);
-                       sched_add_after(insert_after, perm);
+                       ir_node *const schedpoint = be_get_end_of_block_insertion_point(pred_bl);
+                       sched_add_before(schedpoint, perm);
 
                        /*
                         * Make the Projs for the Perm and insert into schedule.
                         * Register allocation is copied from the former phi
                         * arguments to the projs (new phi arguments).
                         */
-                       insert_after = perm;
-                       for (pp = set_first(arg_set); pp; pp = set_next(arg_set)) {
+                       foreach_set(arg_set, perm_proj_t, pp) {
                                ir_node *proj = new_r_Proj(perm, get_irn_mode(pp->arg), pp->pos);
                                pp->proj = proj;
                                assert(arch_get_irn_register(pp->arg));
                                arch_set_irn_register(proj, arch_get_irn_register(pp->arg));
-                               insert_after = proj;
                                DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", arch_get_irn_register(pp->arg)->name, pp->arg, pp->proj));
                        }
 
                        /*
                         * Set the phi nodes to their new arguments: The Projs of the Perm
                         */
-                       for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+                       for (phi = (ir_node*)get_irn_link(bl); phi != NULL;
+                            phi = (ir_node*)get_irn_link(phi)) {
                                perm_proj_t templ;
 
                                templ.arg = get_irn_n(phi, i);
-                               pp        = set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg));
+                               perm_proj_t *const pp = set_find(perm_proj_t, arg_set, &templ, sizeof(templ), hash_irn(templ.arg));
 
                                /* If not found, it was an interfering argument */
                                if (pp) {
@@ -208,9 +185,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
                                        be_liveness_update(lv, in[i]);
                        }
                        free(in);
-
-                       /* register in perm map */
-                       pmap_insert(perm_map, pred_bl, perm);
                }
 
                del_set(arg_set);
@@ -227,15 +201,15 @@ static void insert_all_perms_walker(ir_node *bl, void *data)
  */
 static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
 {
-       be_chordal_env_t *chordal_env = data;
+       be_chordal_env_t *chordal_env = (be_chordal_env_t*)data;
        be_lv_t *lv = be_get_irg_liveness(chordal_env->irg);
        ir_node *phi;
 
        /* Consider all phis of this block */
-       for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+       for (phi = (ir_node*)get_irn_link(bl); phi != NULL;
+            phi = (ir_node*)get_irn_link(phi)) {
                ir_node                     *phi_block = get_nodes_block(phi);
                const arch_register_t       *phi_reg   = arch_get_irn_register(phi);
-               const arch_register_class_t *cls       = phi_reg->reg_class;
                int                          max;
                int                          i;
 
@@ -255,7 +229,6 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
                        DBG((dbg, LEVEL_1, "  for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
 
                        if (phi_reg == arg_reg
-                                       || (arg_reg->type & arch_register_type_joker)
                                        || (arg_reg->type & arch_register_type_virtual)) {
                                /* Phi and arg have the same register, so pin and continue */
                                pin_irn(arg, phi_block);
@@ -271,11 +244,12 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
                                        insert it into schedule,
                                        pin it
                                */
-                               ir_node *dupl  = be_new_Copy(cls, arg_block, arg);
+                               ir_node *dupl = be_new_Copy(arg_block, arg);
 
                                set_irn_n(phi, i, dupl);
                                arch_set_irn_register(dupl, phi_reg);
-                               sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, NULL), dupl);
+                               ir_node *const schedpoint = be_get_end_of_block_insertion_point(arg_block);
+                               sched_add_before(schedpoint, dupl);
                                pin_irn(dupl, phi_block);
                                be_liveness_introduce(lv, dupl);
                                be_liveness_update(lv, arg);
@@ -298,7 +272,9 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
 
                                DBG((dbg, LEVEL_1, "      searching for phi with same arg having args register\n"));
 
-                               for (other_phi = get_irn_link(phi_block); other_phi; other_phi = get_irn_link(other_phi)) {
+                               for (other_phi = (ir_node*)get_irn_link(phi_block);
+                                    other_phi != NULL;
+                                    other_phi = (ir_node*)get_irn_link(other_phi)) {
 
                                        assert(is_Phi(other_phi)                               &&
                                                get_nodes_block(phi) == get_nodes_block(other_phi) &&
@@ -321,15 +297,11 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
                                        pin it
                                */
                                ir_node *perm = get_Proj_pred(arg);
-                               ir_node *dupl = be_new_Copy(cls, arg_block, arg);
-                               ir_node *ins;
+                               ir_node *dupl = be_new_Copy(arg_block, arg);
 
                                set_irn_n(phi, i, dupl);
                                arch_set_irn_register(dupl, phi_reg);
-                               /* skip the Perm's Projs and insert the copies behind. */
-                               for (ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins)) {
-                               }
-                               sched_add_before(ins, dupl);
+                               sched_add_after(perm, dupl);
                                pin_irn(dupl, phi_block);
                                be_liveness_introduce(lv, dupl);
                                be_liveness_update(lv, arg);
@@ -349,42 +321,31 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
 
 void be_ssa_destruction(be_chordal_env_t *chordal_env)
 {
-       insert_all_perms_env_t insert_perms_env;
-       pmap     *perm_map = pmap_create();
-       ir_graph *irg      = chordal_env->irg;
-       be_lv_t  *lv       = be_assure_liveness(irg);
+       ir_graph *irg = chordal_env->irg;
 
        FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
 
-       be_liveness_invalidate(lv);
+       be_invalidate_live_sets(irg);
 
        /* create a map for fast lookup of perms: block --> perm */
        irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
 
        DBG((dbg, LEVEL_1, "Placing perms...\n"));
-       insert_perms_env.chordal_env = chordal_env;
-       insert_perms_env.perm_map = perm_map;
-       irg_block_walk_graph(irg, insert_all_perms_walker, NULL, &insert_perms_env);
-
-       // Matze: really needed here?
-       // Sebastian: Yes. the walker function uses interference.
-       be_liveness_invalidate(lv);
+       irg_block_walk_graph(irg, insert_all_perms_walker, NULL, chordal_env);
 
        if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
                dump_ir_graph(irg, "ssa_destr_perms_placed");
 
-       be_liveness_assure_chk(lv);
+       be_assure_live_chk(irg);
 
        DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
        irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);
 
-       /* TODO: unfortunately updating doesn't work yet. */
-       be_liveness_invalidate(lv);
+       /* unfortunately updating doesn't work yet. */
+       be_invalidate_live_chk(irg);
 
        if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
                dump_ir_graph(irg, "ssa_destr_regs_set");
-
-       pmap_destroy(perm_map);
 }
 
 static void ssa_destruction_check_walker(ir_node *bl, void *data)
@@ -393,16 +354,16 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data)
        int i, max;
        (void)data;
 
-       for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+       for (phi = (ir_node*)get_irn_link(bl); phi != NULL;
+            phi = (ir_node*)get_irn_link(phi)) {
                const arch_register_t *phi_reg, *arg_reg;
 
                phi_reg = arch_get_irn_register(phi);
                /* iterate over all args of phi */
                for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
                        ir_node                   *arg = get_irn_n(phi, i);
-                       const arch_register_req_t *req = arch_get_register_req_out(arg);
-
-                       if (req->type & arch_register_req_type_ignore)
+                       const arch_register_req_t *req = arch_get_irn_register_req(arg);
+                       if (arch_register_req_is(req, ignore))
                                continue;
 
                        arg_reg = arch_get_irn_register(arg);