fixed the fix of the fix (that was fix)
[libfirm] / ir / be / becopyopt.c
index 1b2c7e7..584da53 100644 (file)
@@ -1,8 +1,33 @@
+/*
+ * Copyright (C) 1995-2007 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.
+ */
+
 /**
- * Author:      Daniel Grund
- * Date:               12.04.2005
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * @file
+ * @brief       Copy minimization driver.
+ * @author      Daniel Grund
+ * @date        12.04.2005
+ * @version     $Id$
+ *
+ * Main file for the optimization reducing the copies needed for:
+ * - Phi coalescing
+ * - Register-constrained nodes
+ * - Two-address code instructions
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -13,6 +38,7 @@
 #include "debug.h"
 #include "pmap.h"
 #include "raw_bitset.h"
+#include "irnode.h"
 #include "irgraph.h"
 #include "irgwalk.h"
 #include "irprog.h"
@@ -28,6 +54,7 @@
 #include "benode_t.h"
 #include "beutil.h"
 #include "beifg_t.h"
+#include "beintlive_t.h"
 #include "becopyopt_t.h"
 #include "becopystat.h"
 #include "belive_t.h"
@@ -56,7 +83,7 @@ static unsigned   dump_flags  = 0;
 static unsigned   style_flags = 0;
 static unsigned   do_stats    = 0;
 static cost_fct_t cost_func   = co_get_costs_exec_freq;
-static unsigned   algo        = CO_ALGO_HEUR;
+static unsigned   algo        = CO_ALGO_HEUR4;
 static int        improve     = 1;
 
 static const lc_opt_enum_mask_items_t dump_items[] = {
@@ -149,7 +176,7 @@ static int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const
        if (env->ifg)
                return be_ifg_connected(env->ifg, a, b);
        else
-               return values_interfere(env->birg->lv, a, b);
+               return values_interfere(env->birg, a, b);
 }
 
 
@@ -214,39 +241,6 @@ int co_is_optimizable_root(const copy_opt_t *co, ir_node *irn) {
        return 0;
 }
 
-int co_is_optimizable_arg(const copy_opt_t *co, ir_node *irn) {
-       const ir_edge_t *edge;
-       const arch_register_t *reg;
-
-       assert(0 && "Is buggy and obsolete. Do not use");
-
-       if (arch_irn_is(co->aenv, irn, ignore))
-               return 0;
-
-       reg = arch_get_irn_register(co->aenv, irn);
-       if (arch_register_type_is(reg, ignore))
-               return 0;
-
-       foreach_out_edge(irn, edge) {
-               ir_node *n = edge->src;
-
-               if (!nodes_interfere(co->cenv, irn, n) || irn == n) {
-                       const arch_register_req_t *req;
-                       req = arch_get_register_req(co->aenv, n, -1);
-
-                       if(is_Reg_Phi(n) ||
-                          is_Perm(co->aenv, n) ||
-                          (arch_register_req_is(req, should_be_same))) {
-                               ir_node *other = get_irn_n(irn, req->other_same);
-                               if(other == irn)
-                                       return 1;
-                       }
-               }
-       }
-
-       return 0;
-}
-
 int co_get_costs_loop_depth(const copy_opt_t *co, ir_node *root, ir_node* arg, int pos) {
        int cost = 0;
        ir_loop *loop;
@@ -420,22 +414,25 @@ static void co_collect_units(ir_node *irn, void *env) {
                        /* Else insert the argument of the phi to the members of this ou */
                        DBG((dbg, LEVEL_1, "\t   Member: %+F\n", arg));
 
-                       /* Check if arg has occurred at a prior position in the arg/list */
-                       arg_pos = 0;
-                       for (o=0; o<unit->node_count; ++o)
-                               if (unit->nodes[o] == arg) {
-                                       arg_pos = o;
-                                       break;
+                       if (! arch_irn_is(co->aenv, arg, ignore)) {
+                               /* Check if arg has occurred at a prior position in the arg/list */
+                               arg_pos = 0;
+                               for (o=1; o<unit->node_count; ++o) {
+                                       if (unit->nodes[o] == arg) {
+                                               arg_pos = o;
+                                               break;
+                                       }
                                }
 
-                       if (!arg_pos) { /* a new argument */
-                               /* insert node, set costs */
-                               unit->nodes[unit->node_count] = arg;
-                               unit->costs[unit->node_count] = co->get_costs(co, irn, arg, i);
-                               unit->node_count++;
-                       } else { /* arg has occured before in same phi */
-                               /* increase costs for existing arg */
-                               unit->costs[arg_pos] += co->get_costs(co, irn, arg, i);
+                               if (!arg_pos) { /* a new argument */
+                                       /* insert node, set costs */
+                                       unit->nodes[unit->node_count] = arg;
+                                       unit->costs[unit->node_count] = co->get_costs(co, irn, arg, i);
+                                       unit->node_count++;
+                               } else { /* arg has occured before in same phi */
+                                       /* increase costs for existing arg */
+                                       unit->costs[arg_pos] += co->get_costs(co, irn, arg, i);
+                               }
                        }
                }
                unit->nodes = xrealloc(unit->nodes, unit->node_count * sizeof(*unit->nodes));
@@ -457,7 +454,7 @@ static void co_collect_units(ir_node *irn, void *env) {
 
                /* Src == Tgt of a 2-addr-code instruction */
                if (is_2addr_code(req)) {
-                       ir_node *other = get_irn_n(irn, req->other_same);
+                       ir_node *other = get_irn_n(skip_Proj(irn), req->other_same);
                        if (!arch_irn_is(co->aenv, other, ignore) &&
                                        !nodes_interfere(co->cenv, irn, other)) {
                                unit->nodes = xmalloc(2 * sizeof(*unit->nodes));
@@ -711,15 +708,14 @@ static int compare_affinity_node_t(const void *k1, const void *k2, size_t size)
 
 static void add_edge(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs) {
        affinity_node_t new_node, *node;
-       neighb_t new_nbr, *nbr;
-       int allocnew;
+       neighb_t        *nbr;
+       int             allocnew = 1;
 
        new_node.irn        = n1;
        new_node.degree     = 0;
        new_node.neighbours = NULL;
        node = set_insert(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
 
-       allocnew = 1;
        for (nbr = node->neighbours; nbr; nbr = nbr->next)
                if (nbr->irn == n2) {
                        allocnew = 0;
@@ -728,11 +724,11 @@ static void add_edge(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs) {
 
        /* if we did not find n2 in n1's neighbourhood insert it */
        if (allocnew) {
-               obstack_grow(&co->obst, &new_nbr, sizeof(new_nbr));
-               nbr = obstack_finish(&co->obst);
+               nbr        = obstack_alloc(&co->obst, sizeof(*nbr));
                nbr->irn   = n2;
                nbr->costs = 0;
                nbr->next  = node->neighbours;
+
                node->neighbours = nbr;
                node->degree++;
        }
@@ -778,8 +774,8 @@ static void build_graph_walker(ir_node *irn, void *env) {
                const arch_register_req_t *req =
                        arch_get_register_req(co->aenv, irn, -1);
                if (is_2addr_code(req)) {
-                       ir_node *other = get_irn_n(irn, req->other_same);
-                       if(!arch_irn_is(co->aenv, other, ignore))
+                       ir_node *other = get_irn_n(skip_Proj(irn), req->other_same);
+                       if (! arch_irn_is(co->aenv, other, ignore))
                                add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
                }
        }