PR target/38695

[pf3gnuchains/gcc-fork.git] / gcc / tree-ssa-ter.c

diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c
index c6b7ab3..cb393fb 100644 (file)
--- a/gcc/tree-ssa-ter.c
+++ b/gcc/tree-ssa-ter.c
@@ -1,12 +1,13 @@
 /* Routines for performing Temporary Expression Replacement (TER) in SSA trees.
 /* Routines for performing Temporary Expression Replacement (TER) in SSA trees.

-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation,
+   Inc.

    Contributed by Andrew MacLeod  <amacleod@redhat.com>
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
    Contributed by Andrew MacLeod  <amacleod@redhat.com>
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GCC is distributed in the hope that it will be useful,
 any later version.
 
 GCC is distributed in the hope that it will be useful,


@@ -15,9 +16,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 
 #include "config.h"
 
 
 #include "config.h"


@@ -30,6 +30,7 @@ Boston, MA 02110-1301, USA.  */
 #include "tree-flow.h"
 #include "tree-dump.h"
 #include "tree-ssa-live.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
 #include "tree-ssa-live.h"

+#include "flags.h"

 
 
 /* Temporary Expression Replacement (TER)
 
 
 /* Temporary Expression Replacement (TER)


@@ -59,7 +60,7 @@ Boston, MA 02110-1301, USA.  */
    v_9 = (b_5 + 6) * (C * 10)
 
    which will then have the ssa_name assigned to regular variables, and the
    v_9 = (b_5 + 6) * (C * 10)
 
    which will then have the ssa_name assigned to regular variables, and the

-   resulting code which will be passed ot the expander looks something like:
+   resulting code which will be passed to the expander looks something like:

 
    v = (b + 6) * (C * 10)
 
 
    v = (b + 6) * (C * 10)
 


@@ -71,7 +72,7 @@ Boston, MA 02110-1301, USA.  */
    Although SSA_NAMES themselves don't change, this pass is performed after 
    coalescing has coalesced different SSA_NAMES together, so there could be a 
    definition of an SSA_NAME which is coalesced with a use that causes a
    Although SSA_NAMES themselves don't change, this pass is performed after 
    coalescing has coalesced different SSA_NAMES together, so there could be a 
    definition of an SSA_NAME which is coalesced with a use that causes a

-   problem.  ie
+   problem, i.e.,

    
    PHI b_5 = <b_8(2), b_14(1)>
    <...>
    
    PHI b_5 = <b_8(2), b_14(1)>
    <...>


@@ -88,7 +89,7 @@ Boston, MA 02110-1301, USA.  */
    TER implements this but stepping through the instructions in a block and
    tracking potential expressions for replacement, and the partitions they are
    dependent on.  Expressions are represented by the SSA_NAME_VERSION of the
    TER implements this but stepping through the instructions in a block and
    tracking potential expressions for replacement, and the partitions they are
    dependent on.  Expressions are represented by the SSA_NAME_VERSION of the

-   DEF on the LHS of a GIMPLE_MODIFY_STMT and the expression is the RHS.
+   DEF on the LHS of a GIMPLE_ASSIGN and the expression is the RHS.

 
    When a stmt is determined to be a possible replacement expression, the
    following steps are taken:
 
    When a stmt is determined to be a possible replacement expression, the
    following steps are taken:


@@ -96,8 +97,8 @@ Boston, MA 02110-1301, USA.  */
    EXPR_DECL_UID bitmap is allocated and set to the base variable UID of the 
    def and any uses in the expression.  non-NULL means the expression is being 
    tracked.  The UID's themselves are used to prevent TER substitution into
    EXPR_DECL_UID bitmap is allocated and set to the base variable UID of the 
    def and any uses in the expression.  non-NULL means the expression is being 
    tracked.  The UID's themselves are used to prevent TER substitution into

-   accumulating sequences.
-   ie
+   accumulating sequences, i.e.,
+

    x = x + y
    x = x + z
    x = x + w
    x = x + y
    x = x + z
    x = x + w


@@ -125,7 +126,7 @@ Boston, MA 02110-1301, USA.  */
    a block to clear out the KILL_LIST bitmaps at the end of each block.
 
    NEW_REPLACEABLE_DEPENDENCIES is used as a temporary place to store 
    a block to clear out the KILL_LIST bitmaps at the end of each block.
 
    NEW_REPLACEABLE_DEPENDENCIES is used as a temporary place to store 

-   dependencies which will be reused by the current definition. ALl the uses
+   dependencies which will be reused by the current definition. All the uses

    on an expression are processed before anything else is done. If a use is
    determined to be a replaceable expression AND the current stmt is also going
    to be replaceable, all the dependencies of this replaceable use will be
    on an expression are processed before anything else is done. If a use is
    determined to be a replaceable expression AND the current stmt is also going
    to be replaceable, all the dependencies of this replaceable use will be


@@ -138,8 +139,8 @@ Boston, MA 02110-1301, USA.  */
 
    a_2's expression 'b_5 + 6' is determined to be replaceable at the use 
    location. It is dependent on the partition 'b_5' is in. This is cached into
 
    a_2's expression 'b_5 + 6' is determined to be replaceable at the use 
    location. It is dependent on the partition 'b_5' is in. This is cached into

-   the NEW_REPLACEABLE_DEPENDENCIES bitmap. and when v_8 is examined for
-   replaceablility, it is a candidate, and it is dependent on the partition 
+   the NEW_REPLACEABLE_DEPENDENCIES bitmap, and when v_8 is examined for
+   replaceability, it is a candidate, and it is dependent on the partition

    b_5 is in *NOT* a_2, as well as c_4's partition.
 
    if v_8 is also replaceable:
    b_5 is in *NOT* a_2, as well as c_4's partition.
 
    if v_8 is also replaceable:


@@ -158,7 +159,7 @@ typedef struct temp_expr_table_d
 {
   var_map map;
   bitmap *partition_dependencies;      /* Partitions expr is dependent on.  */
 {
   var_map map;
   bitmap *partition_dependencies;      /* Partitions expr is dependent on.  */

-  tree *replaceable_expressions;       /* Replacement expression table.  */
+  gimple *replaceable_expressions;     /* Replacement expression table.  */

   bitmap *expr_decl_uids;              /* Base uids of exprs.  */
   bitmap *kill_list;                   /* Expr's killed by a partition.  */
   int virtual_partition;               /* Pseudo partition for virtual ops.  */
   bitmap *expr_decl_uids;              /* Base uids of exprs.  */
   bitmap *kill_list;                   /* Expr's killed by a partition.  */
   int virtual_partition;               /* Pseudo partition for virtual ops.  */


@@ -215,27 +216,29 @@ new_temp_expr_table (var_map map)
 /* Free TER table T.  If there are valid replacements, return the expression 
    vector.  */
 
 /* Free TER table T.  If there are valid replacements, return the expression 
    vector.  */
 

-static tree *
+static gimple *

 free_temp_expr_table (temp_expr_table_p t)
 {
 free_temp_expr_table (temp_expr_table_p t)
 {

-  tree *ret = NULL;
-  unsigned i;
+  gimple *ret = NULL;

 
 #ifdef ENABLE_CHECKING
   unsigned x;
   for (x = 0; x <= num_var_partitions (t->map); x++)
     gcc_assert (!t->kill_list[x]);
 
 #ifdef ENABLE_CHECKING
   unsigned x;
   for (x = 0; x <= num_var_partitions (t->map); x++)
     gcc_assert (!t->kill_list[x]);

+  for (x = 0; x < num_ssa_names + 1; x++)
+    {
+      gcc_assert (t->expr_decl_uids[x] == NULL);
+      gcc_assert (t->partition_dependencies[x] == NULL);
+    }

 #endif
 
   BITMAP_FREE (t->partition_in_use);
 #endif
 
   BITMAP_FREE (t->partition_in_use);

+  BITMAP_FREE (t->new_replaceable_dependencies);

 
 

-  for (i = 0; i <= num_ssa_names; i++)
-    if (t->expr_decl_uids[i])
-      BITMAP_FREE (t->expr_decl_uids[i]);

   free (t->expr_decl_uids);
   free (t->expr_decl_uids);

-

   free (t->kill_list);
   free (t->partition_dependencies);
   free (t->kill_list);
   free (t->partition_dependencies);

+  free (t->num_in_part);

 
   if (t->replaceable_expressions)
     ret = t->replaceable_expressions;
 
   if (t->replaceable_expressions)
     ret = t->replaceable_expressions;


@@ -252,7 +255,7 @@ version_to_be_replaced_p (temp_expr_table_p tab, int version)
 {
   if (!tab->replaceable_expressions)
     return false;
 {
   if (!tab->replaceable_expressions)
     return false;

-  return tab->replaceable_expressions[version] != NULL_TREE;
+  return tab->replaceable_expressions[version] != NULL;

 }
 
 
 }
 
 


@@ -357,14 +360,20 @@ add_dependence (temp_expr_table_p tab, int version, tree var)
 /* Return TRUE if expression STMT is suitable for replacement.  */
 
 static inline bool
 /* Return TRUE if expression STMT is suitable for replacement.  */
 
 static inline bool

-is_replaceable_p (tree stmt)
+is_replaceable_p (gimple stmt)

 {
 {

-  tree call_expr;

   use_operand_p use_p;
   use_operand_p use_p;

-  tree def, use_stmt;
+  tree def;
+  gimple use_stmt;
+  location_t locus1, locus2;
+  tree block1, block2;

 
   /* Only consider modify stmts.  */
 
   /* Only consider modify stmts.  */

-  if (TREE_CODE (stmt) != GIMPLE_MODIFY_STMT)
+  if (!is_gimple_assign (stmt))
+    return false;
+
+  /* If the statement may throw an exception, it cannot be replaced.  */
+  if (stmt_could_throw_p (stmt))

     return false;
 
   /* Punt if there is more than 1 def.  */
     return false;
 
   /* Punt if there is more than 1 def.  */


@@ -377,41 +386,57 @@ is_replaceable_p (tree stmt)
     return false;
 
   /* If the use isn't in this block, it wont be replaced either.  */
     return false;
 
   /* If the use isn't in this block, it wont be replaced either.  */

-  if (bb_for_stmt (use_stmt) != bb_for_stmt (stmt))
+  if (gimple_bb (use_stmt) != gimple_bb (stmt))
+    return false;
+
+  locus1 = gimple_location (stmt);
+  block1 = gimple_block (stmt);
+
+  if (gimple_code (use_stmt) == GIMPLE_PHI)
+    {
+      locus2 = 0;
+      block2 = NULL_TREE;
+    }
+  else
+    {
+      locus2 = gimple_location (use_stmt);
+      block2 = gimple_block (use_stmt);
+    }
+
+  if (!optimize
+      && ((locus1 && locus1 != locus2) || (block1 && block1 != block2)))

     return false;
 
   /* Used in this block, but at the TOP of the block, not the end.  */
     return false;
 
   /* Used in this block, but at the TOP of the block, not the end.  */

-  if (TREE_CODE (use_stmt) == PHI_NODE)
+  if (gimple_code (use_stmt) == GIMPLE_PHI)

     return false;
 
   /* There must be no VDEFs.  */
   if (!(ZERO_SSA_OPERANDS (stmt, SSA_OP_VDEF)))
     return false;
 
     return false;
 
   /* There must be no VDEFs.  */
   if (!(ZERO_SSA_OPERANDS (stmt, SSA_OP_VDEF)))
     return false;
 

+  /* Without alias info we can't move around loads.  */
+  if (gimple_references_memory_p (stmt) && !optimize)
+    return false;
+

   /* Float expressions must go through memory if float-store is on.  */
   if (flag_float_store 
   /* Float expressions must go through memory if float-store is on.  */
   if (flag_float_store 

-      && FLOAT_TYPE_P (TREE_TYPE (GENERIC_TREE_OPERAND (stmt, 1))))
+      && FLOAT_TYPE_P (gimple_expr_type (stmt)))

     return false;
 
   /* An assignment with a register variable on the RHS is not
      replaceable.  */
     return false;
 
   /* An assignment with a register variable on the RHS is not
      replaceable.  */

-  if (TREE_CODE (GENERIC_TREE_OPERAND (stmt, 1)) == VAR_DECL
-      && DECL_HARD_REGISTER (GENERIC_TREE_OPERAND (stmt, 1)))
+  if (gimple_assign_rhs_code (stmt) == VAR_DECL
+      && DECL_HARD_REGISTER (gimple_assign_rhs1 (stmt)))

     return false;
 
     return false;
 

-  /* Calls to functions with side-effects cannot be replaced.  */
-  if ((call_expr = get_call_expr_in (stmt)) != NULL_TREE)
-    {
-      int call_flags = call_expr_flags (call_expr);
-      if (TREE_SIDE_EFFECTS (call_expr)
-         && !(call_flags & (ECF_PURE | ECF_CONST | ECF_NORETURN)))
-       return false;
-    }
+  /* No function calls can be replaced.  */
+  if (is_gimple_call (stmt))
+    return false;

 
   /* Leave any stmt with volatile operands alone as well.  */
 
   /* Leave any stmt with volatile operands alone as well.  */

-  if (stmt_ann (stmt)->has_volatile_ops)
+  if (gimple_has_volatile_ops (stmt))

     return false;
     return false;

-  

 
   return true;
 }
 
   return true;
 }


@@ -440,10 +465,10 @@ finished_with_expr (temp_expr_table_p tab, int version, bool free_expr)
 }
 
 
 }
 
 

-/* Create an expression entry fora replaceable expression.  */
+/* Create an expression entry for a replaceable expression.  */

 
 static void 
 
 static void 

-process_replaceable (temp_expr_table_p tab, tree stmt)
+process_replaceable (temp_expr_table_p tab, gimple stmt)

 {
   tree var, def, basevar;
   int version;
 {
   tree var, def, basevar;
   int version;


@@ -520,7 +545,7 @@ kill_virtual_exprs (temp_expr_table_p tab)
 
 
 /* Mark the expression associated with VAR as replaceable, and enter
 
 
 /* Mark the expression associated with VAR as replaceable, and enter

-   the defining stmt into the partition_dependencies table TAB.  if
+   the defining stmt into the partition_dependencies table TAB.  If

    MORE_REPLACING is true, accumulate the pending partition dependencies.  */
 
 static void
    MORE_REPLACING is true, accumulate the pending partition dependencies.  */
 
 static void


@@ -537,7 +562,7 @@ mark_replaceable (temp_expr_table_p tab, tree var, bool more_replacing)
 
   /* Set the replaceable expression.  */
   if (!tab->replaceable_expressions)
 
   /* Set the replaceable expression.  */
   if (!tab->replaceable_expressions)

-    tab->replaceable_expressions = XCNEWVEC (tree, num_ssa_names + 1);
+    tab->replaceable_expressions = XCNEWVEC (gimple, num_ssa_names + 1);

   tab->replaceable_expressions[version] = SSA_NAME_DEF_STMT (var);
 }
 
   tab->replaceable_expressions[version] = SSA_NAME_DEF_STMT (var);
 }
 


@@ -548,20 +573,20 @@ mark_replaceable (temp_expr_table_p tab, tree var, bool more_replacing)
 static void
 find_replaceable_in_bb (temp_expr_table_p tab, basic_block bb)
 {
 static void
 find_replaceable_in_bb (temp_expr_table_p tab, basic_block bb)
 {

-  block_stmt_iterator bsi;
-  tree stmt, def, use;
-  stmt_ann_t ann;
+  gimple_stmt_iterator bsi;
+  gimple stmt;
+  tree def, use;

   int partition;
   var_map map = tab->map;
   ssa_op_iter iter;
   bool stmt_replaceable;
 
   int partition;
   var_map map = tab->map;
   ssa_op_iter iter;
   bool stmt_replaceable;
 

-  for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
+  for (bsi = gsi_start_bb (bb); !gsi_end_p (bsi); gsi_next (&bsi))

     {
     {

-      stmt = bsi_stmt (bsi);
-      ann = stmt_ann (stmt);
+      stmt = gsi_stmt (bsi);

 
       stmt_replaceable = is_replaceable_p (stmt);
 
       stmt_replaceable = is_replaceable_p (stmt);

+

       /* Determine if this stmt finishes an existing expression.  */
       FOR_EACH_SSA_TREE_OPERAND (use, stmt, iter, SSA_OP_USE)
        {
       /* Determine if this stmt finishes an existing expression.  */
       FOR_EACH_SSA_TREE_OPERAND (use, stmt, iter, SSA_OP_USE)
        {


@@ -590,7 +615,7 @@ find_replaceable_in_bb (temp_expr_table_p tab, basic_block bb)
              /* Mark expression as replaceable unless stmt is volatile or the 
                 def variable has the same root variable as something in the 
                 substitution list.  */
              /* Mark expression as replaceable unless stmt is volatile or the 
                 def variable has the same root variable as something in the 
                 substitution list.  */

-             if (ann->has_volatile_ops || same_root_var)
+             if (gimple_has_volatile_ops (stmt) || same_root_var)

                finished_with_expr (tab, ver, true);
              else
                mark_replaceable (tab, use, stmt_replaceable);
                finished_with_expr (tab, ver, true);
              else
                mark_replaceable (tab, use, stmt_replaceable);


@@ -628,58 +653,42 @@ find_replaceable_in_bb (temp_expr_table_p tab, basic_block bb)
    NULL is returned by the function, otherwise an expression vector indexed
    by SSA_NAME version numbers.  */
 
    NULL is returned by the function, otherwise an expression vector indexed
    by SSA_NAME version numbers.  */
 

-extern tree *
+extern gimple *

 find_replaceable_exprs (var_map map)
 {
   basic_block bb;
   temp_expr_table_p table;
 find_replaceable_exprs (var_map map)
 {
   basic_block bb;
   temp_expr_table_p table;

-  tree *ret;
+  gimple *ret;

 
   table = new_temp_expr_table (map);
   FOR_EACH_BB (bb)
     {
       find_replaceable_in_bb (table, bb);
 
   table = new_temp_expr_table (map);
   FOR_EACH_BB (bb)
     {
       find_replaceable_in_bb (table, bb);

-      gcc_assert (bitmap_empty_p (table->partition_in_use));
-

 #ifdef ENABLE_CHECKING
 #ifdef ENABLE_CHECKING

-      {
-       unsigned i;
-       /* Make sure all the tables have been cleared out.  */
-       for (i = 0; i < num_ssa_names + 1; i++)
-         {
-           gcc_assert (table->partition_dependencies[i] == NULL);
-           gcc_assert (table->expr_decl_uids[i] == NULL);
-           if (i < num_var_partitions (map))
-             gcc_assert (table->kill_list[i] == NULL);
-         }
-      }
+      gcc_assert (bitmap_empty_p (table->partition_in_use));

 #endif
     }
 
   ret = free_temp_expr_table (table);
   return ret;
 #endif
     }
 
   ret = free_temp_expr_table (table);
   return ret;

-}
-
+} 

 
 /* Dump TER expression table EXPR to file F.  */
 
 
 /* Dump TER expression table EXPR to file F.  */
 

-extern void
-dump_replaceable_exprs (FILE *f, tree *expr)
+void
+dump_replaceable_exprs (FILE *f, gimple *expr)

 {
 {

-  tree stmt, var;
-  int x;
+  tree var;
+  unsigned x;

 
   fprintf (f, "\nReplacing Expressions\n");
 
   fprintf (f, "\nReplacing Expressions\n");

-  for (x = 0; x < (int)num_ssa_names; x++)
+  for (x = 0; x < num_ssa_names; x++)

     if (expr[x])
       {
     if (expr[x])
       {

-        stmt = expr[x];
-       var = SINGLE_SSA_TREE_OPERAND (stmt, SSA_OP_DEF);
-       gcc_assert (var != NULL_TREE);
+       var = ssa_name (x);

        print_generic_expr (f, var, TDF_SLIM);
        fprintf (f, " replace with --> ");
        print_generic_expr (f, var, TDF_SLIM);
        fprintf (f, " replace with --> ");

-       print_generic_expr (f, GENERIC_TREE_OPERAND (stmt, 1),
-                           TDF_SLIM);
+       print_gimple_stmt (f, expr[x], 0, TDF_SLIM);

        fprintf (f, "\n");
       }
   fprintf (f, "\n");
        fprintf (f, "\n");
       }
   fprintf (f, "\n");


@@ -691,7 +700,7 @@ dump_replaceable_exprs (FILE *f, tree *expr)
    exclusively to debug TER.  F is the place to send debug info and T is the
    table being debugged.  */
 
    exclusively to debug TER.  F is the place to send debug info and T is the
    table being debugged.  */
 

-extern void
+void

 debug_ter (FILE *f, temp_expr_table_p t)
 {
   unsigned x, y;
 debug_ter (FILE *f, temp_expr_table_p t)
 {
   unsigned x, y;