Fixed the Phi optimize case: after fixing CSE for Phi nodes, it was broken
[libfirm] / ir / opt / ldstopt.c
index de17fd0..829cdae 100644 (file)
@@ -1,27 +1,35 @@
 /*
- * Project:     libFIRM
- * File name:   ir/opt/ldstopt.c
- * Purpose:     load store optimizations
- * Author:      Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2007 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * 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.
+ */
+
+/**
+ * @file
+ * @brief   Load/Store optimizations.
+ * @author  Michael Beck
+ * @version $Id$
  */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
+#include "iroptimize.h"
 #include "irnode_t.h"
 #include "irgraph_t.h"
 #include "irmode_t.h"
@@ -40,6 +48,7 @@
 #include "irtools.h"
 #include "opt_polymorphy.h"
 #include "irmemory.h"
+#include "xmalloc.h"
 
 #ifdef DO_CACHEOPT
 #include "cacheopt/cachesim.h"
@@ -489,7 +498,7 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
                         * We could make it a little bit better if we would know that the exception
                         * handler of the Store jumps directly to the end...
                         */
-                       if ((!pred_info->projs[pn_Store_X_except] && !info->projs[pn_Load_X_except]) ||
+                       if ((pred_info->projs[pn_Store_X_except] == NULL && info->projs[pn_Load_X_except] == NULL) ||
                            get_nodes_block(load) == get_nodes_block(pred)) {
                                ir_node *value = get_Store_value(pred);
 
@@ -527,36 +536,30 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
                         * Here, there is no need to check if the previous Load has an exception
                         * hander because they would have exact the same exception...
                         */
-                       if (! info->projs[pn_Load_X_except] || get_nodes_block(load) == get_nodes_block(pred)) {
+                       if (info->projs[pn_Load_X_except] == NULL || get_nodes_block(load) == get_nodes_block(pred)) {
+                               ir_node *value;
+
                                DBG_OPT_RAR(load, pred);
 
-                               if (pred_info->projs[pn_Load_res]) {
-                                       ir_node *value = pred_info->projs[pn_Load_res];
+                               /* the result is used */
+                               if (info->projs[pn_Load_res]) {
+                                       if (pred_info->projs[pn_Load_res] == NULL) {
+                                               /* create a new Proj again */
+                                               pred_info->projs[pn_Load_res] = new_r_Proj(current_ir_graph, get_nodes_block(pred), pred, get_Load_mode(pred), pn_Load_res);
+                                       }
+                                       value = pred_info->projs[pn_Load_res];
 
                                        /* add an convert if needed */
                                        if (get_Load_mode(pred) != load_mode) {
                                                value = new_r_Conv(current_ir_graph, get_nodes_block(load), value, load_mode);
                                        }
 
-                                       /* we need a data proj from the previous load for this optimization */
-                                       if (info->projs[pn_Load_res])
-                                               exchange(info->projs[pn_Load_res], pred_info->projs[pn_Load_res]);
-
-                                       if (info->projs[pn_Load_M])
-                                               exchange(info->projs[pn_Load_M], mem);
-                               } else {
-                                       if (info->projs[pn_Load_res]) {
-                                               set_Proj_pred(info->projs[pn_Load_res], pred);
-                                               set_nodes_block(info->projs[pn_Load_res], get_nodes_block(pred));
-                                               pred_info->projs[pn_Load_res] = info->projs[pn_Load_res];
-                                       }
-                                       if (info->projs[pn_Load_M]) {
-                                               /* Actually, this if should not be necessary.  Construct the Loads
-                                               properly!!! */
-                                               exchange(info->projs[pn_Load_M], mem);
-                                       }
+                                       exchange(info->projs[pn_Load_res], value);
                                }
 
+                               if (info->projs[pn_Load_M])
+                                       exchange(info->projs[pn_Load_M], mem);
+
                                /* no exception */
                                if (info->projs[pn_Load_X_except]) {
                                        exchange(info->projs[pn_Load_X_except], new_Bad());
@@ -570,7 +573,7 @@ static unsigned follow_Mem_chain(ir_node *load, ir_node *curr) {
                }
 
                if (get_irn_op(pred) == op_Store) {
-                       /* check if we can pass thru this store */
+                       /* check if we can pass through this store */
                        ir_alias_relation rel = get_alias_relation(
                                current_ir_graph,
                                get_Store_ptr(pred),
@@ -1063,22 +1066,6 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
        for (i = 0; i < n; ++i)
                stores[i] = skip_Proj(get_Phi_pred(phi, i));
 
-       /* Prepare: Skip the memory Proj: we need this in the case some stores
-          are cascaded.
-          Beware: One Store might be included more than once in the stores[]
-          list, so we must prevent to do the exchange more than once.
-        */
-       for (i = 0; i < n; ++i) {
-               ir_node *store = stores[i];
-               ir_node *proj_m;
-
-               info = get_irn_link(store);
-               proj_m = info->projs[pn_Store_M];
-
-               if (is_Proj(proj_m) && get_Proj_pred(proj_m) == store)
-                       exchange(proj_m, get_Store_mem(store));
-       }
-
        /* first step: collect all inputs */
        for (i = 0; i < n; ++i) {
                ir_node *store = stores[i];
@@ -1087,6 +1074,8 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
                inM[i] = get_Store_mem(store);
                inD[i] = get_Store_value(store);
                idx[i] = info->exc_idx;
+
+               kill_node(store);
        }
        block = get_nodes_block(phi);