2010-04-13 Richard Guenther <rguenther@suse.de>

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

diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index a2423a0..c236de3 100644 (file)
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -1,12 +1,13 @@
 /* Rename SSA copies.
 /* Rename SSA copies.

-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010
+   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,22 +16,23 @@ 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 "system.h"
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"

+#include "gimple.h"

 #include "flags.h"
 #include "basic-block.h"
 #include "function.h"
 #include "diagnostic.h"
 #include "flags.h"
 #include "basic-block.h"
 #include "function.h"
 #include "diagnostic.h"

+#include "tree-pretty-print.h"

 #include "bitmap.h"
 #include "tree-flow.h"
 #include "bitmap.h"
 #include "tree-flow.h"

-#include "tree-gimple.h"
+#include "gimple.h"

 #include "tree-inline.h"
 #include "timevar.h"
 #include "hashtab.h"
 #include "tree-inline.h"
 #include "timevar.h"
 #include "hashtab.h"


@@ -50,22 +52,22 @@ Boston, MA 02110-1301, USA.  */
    T.3_5 = <blah>
    a_1 = T.3_5
 
    T.3_5 = <blah>
    a_1 = T.3_5
 

-   If this copy couldn't be copy propagated, it could possibly remain in the 
-   program throughout the optimization phases.   After SSA->normal, it would 
+   If this copy couldn't be copy propagated, it could possibly remain in the
+   program throughout the optimization phases.   After SSA->normal, it would

    become:
 
    T.3 = <blah>
    a = T.3
    become:
 
    T.3 = <blah>
    a = T.3

-   
-   Since T.3_5 is distinct from all other SSA versions of T.3, there is no 
-   fundamental reason why the base variable needs to be T.3, subject to 
-   certain restrictions.  This optimization attempts to determine if we can 
+
+   Since T.3_5 is distinct from all other SSA versions of T.3, there is no
+   fundamental reason why the base variable needs to be T.3, subject to
+   certain restrictions.  This optimization attempts to determine if we can

    change the base variable on copies like this, and result in code such as:
 
    a_5 = <blah>
    a_1 = a_5
 
    change the base variable on copies like this, and result in code such as:
 
    a_5 = <blah>
    a_1 = a_5
 

-   This gives the SSA->normal pass a shot at coalescing a_1 and a_5. If it is 
+   This gives the SSA->normal pass a shot at coalescing a_1 and a_5. If it is

    possible, the copy goes away completely. If it isn't possible, a new temp
    will be created for a_5, and you will end up with the exact same code:
 
    possible, the copy goes away completely. If it isn't possible, a new temp
    will be created for a_5, and you will end up with the exact same code:
 


@@ -79,8 +81,8 @@ Boston, MA 02110-1301, USA.  */
    a_1 = <blah>
    <blah2> = a_1
 
    a_1 = <blah>
    <blah2> = a_1
 

-   get turned into 
-    
+   get turned into
+

    T.3_5 = <blah>
    a_1 = T.3_5
    <blah2> = a_1
    T.3_5 = <blah>
    a_1 = T.3_5
    <blah2> = a_1


@@ -99,7 +101,7 @@ Boston, MA 02110-1301, USA.  */
    <blah2> = a_1
 
    which copy propagation would then turn into:
    <blah2> = a_1
 
    which copy propagation would then turn into:

-   
+

    a_5 = <blah>
    <blah2> = a_5
 
    a_5 = <blah>
    <blah2> = a_5
 


@@ -109,13 +111,12 @@ Boston, MA 02110-1301, USA.  */
 /* Coalesce the partitions in MAP representing VAR1 and VAR2 if it is valid.
    Choose a representative for the partition, and send debug info to DEBUG.  */
 
 /* Coalesce the partitions in MAP representing VAR1 and VAR2 if it is valid.
    Choose a representative for the partition, and send debug info to DEBUG.  */
 

-static void
+static bool

 copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
 {
   int p1, p2, p3;
   tree root1, root2;
   tree rep1, rep2;
 copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
 {
   int p1, p2, p3;
   tree root1, root2;
   tree rep1, rep2;

-  var_ann_t ann1, ann2, ann3;

   bool ign1, ign2, abnorm;
 
   gcc_assert (TREE_CODE (var1) == SSA_NAME);
   bool ign1, ign2, abnorm;
 
   gcc_assert (TREE_CODE (var1) == SSA_NAME);


@@ -144,14 +145,11 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
   root1 = SSA_NAME_VAR (rep1);
   root2 = SSA_NAME_VAR (rep2);
 
   root1 = SSA_NAME_VAR (rep1);
   root2 = SSA_NAME_VAR (rep2);
 

-  ann1 = var_ann (root1);
-  ann2 = var_ann (root2);
-

   if (p1 == p2)
     {
       if (debug)
        fprintf (debug, " : Already coalesced.\n");
   if (p1 == p2)
     {
       if (debug)
        fprintf (debug, " : Already coalesced.\n");

-      return;
+      return false;

     }
 
   /* Don't coalesce if one of the variables occurs in an abnormal PHI.  */
     }
 
   /* Don't coalesce if one of the variables occurs in an abnormal PHI.  */


@@ -161,7 +159,7 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
     {
       if (debug)
        fprintf (debug, " : Abnormal PHI barrier.  No coalesce.\n");
     {
       if (debug)
        fprintf (debug, " : Abnormal PHI barrier.  No coalesce.\n");

-      return;
+      return false;

     }
 
   /* Partitions already have the same root, simply merge them.  */
     }
 
   /* Partitions already have the same root, simply merge them.  */


@@ -170,7 +168,7 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
       p1 = partition_union (map->var_partition, p1, p2);
       if (debug)
        fprintf (debug, " : Same root, coalesced --> P%d.\n", p1);
       p1 = partition_union (map->var_partition, p1, p2);
       if (debug)
        fprintf (debug, " : Same root, coalesced --> P%d.\n", p1);

-      return;
+      return false;

     }
 
   /* Never attempt to coalesce 2 difference parameters.  */
     }
 
   /* Never attempt to coalesce 2 difference parameters.  */


@@ -178,20 +176,20 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
     {
       if (debug)
         fprintf (debug, " : 2 different PARM_DECLS. No coalesce.\n");
     {
       if (debug)
         fprintf (debug, " : 2 different PARM_DECLS. No coalesce.\n");

-      return;
+      return false;

     }
 
   if ((TREE_CODE (root1) == RESULT_DECL) != (TREE_CODE (root2) == RESULT_DECL))
     {
       if (debug)
         fprintf (debug, " : One root a RESULT_DECL. No coalesce.\n");
     }
 
   if ((TREE_CODE (root1) == RESULT_DECL) != (TREE_CODE (root2) == RESULT_DECL))
     {
       if (debug)
         fprintf (debug, " : One root a RESULT_DECL. No coalesce.\n");

-      return;
+      return false;

     }
 
   ign1 = TREE_CODE (root1) == VAR_DECL && DECL_IGNORED_P (root1);
   ign2 = TREE_CODE (root2) == VAR_DECL && DECL_IGNORED_P (root2);
 
     }
 
   ign1 = TREE_CODE (root1) == VAR_DECL && DECL_IGNORED_P (root1);
   ign2 = TREE_CODE (root2) == VAR_DECL && DECL_IGNORED_P (root2);
 

-  /* Never attempt to coalesce 2 user variables unless one is an inline 
+  /* Never attempt to coalesce 2 user variables unless one is an inline

      variable.  */
   if (!ign1 && !ign2)
     {
      variable.  */
   if (!ign1 && !ign2)
     {


@@ -199,25 +197,15 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
         ign2 = true;
       else if (DECL_FROM_INLINE (root1))
        ign1 = true;
         ign2 = true;
       else if (DECL_FROM_INLINE (root1))
        ign1 = true;

-      else 
+      else

        {
          if (debug)
            fprintf (debug, " : 2 different USER vars. No coalesce.\n");
        {
          if (debug)
            fprintf (debug, " : 2 different USER vars. No coalesce.\n");

-         return;
+         return false;

        }
     }
 
        }
     }
 

-  /* Don't coalesce if there are two different memory tags.  */
-  if (ann1->symbol_mem_tag
-      && ann2->symbol_mem_tag
-      && ann1->symbol_mem_tag != ann2->symbol_mem_tag)
-    {
-      if (debug)
-       fprintf (debug, " : 2 memory tags. No coalesce.\n");
-      return;
-    }
-
-  /* If both values have default defs, we can't coalesce.  If only one has a 
+  /* If both values have default defs, we can't coalesce.  If only one has a

      tag, make sure that variable is the new root partition.  */
   if (gimple_default_def (cfun, root1))
     {
      tag, make sure that variable is the new root partition.  */
   if (gimple_default_def (cfun, root1))
     {


@@ -225,7 +213,7 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
        {
          if (debug)
            fprintf (debug, " : 2 default defs. No coalesce.\n");
        {
          if (debug)
            fprintf (debug, " : 2 default defs. No coalesce.\n");

-         return;
+         return false;

        }
       else
         {
        }
       else
         {


@@ -240,56 +228,38 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
     }
 
   /* Don't coalesce if the two variables aren't type compatible.  */
     }
 
   /* Don't coalesce if the two variables aren't type compatible.  */

-  if (!lang_hooks.types_compatible_p (TREE_TYPE (root1), TREE_TYPE (root2)))
+  if (!types_compatible_p (TREE_TYPE (root1), TREE_TYPE (root2)))

     {
       if (debug)
        fprintf (debug, " : Incompatible types.  No coalesce.\n");
     {
       if (debug)
        fprintf (debug, " : Incompatible types.  No coalesce.\n");

-      return;
+      return false;

     }
 
     }
 

-  /* Don't coalesce if the aliasing sets of the types are different.  */
-  if (POINTER_TYPE_P (TREE_TYPE (root1))
-      && POINTER_TYPE_P (TREE_TYPE (root2))
-      && get_alias_set (TREE_TYPE (TREE_TYPE (root1)))
-          != get_alias_set (TREE_TYPE (TREE_TYPE (root2))))
-    {
-      if (debug)
-       fprintf (debug, " : 2 different aliasing sets. No coalesce.\n");
-      return;
-    }
-
-

   /* Merge the two partitions.  */
   p3 = partition_union (map->var_partition, p1, p2);
 
   /* Merge the two partitions.  */
   p3 = partition_union (map->var_partition, p1, p2);
 

-  /* Set the root variable of the partition to the better choice, if there is 
+  /* Set the root variable of the partition to the better choice, if there is

      one.  */
   if (!ign2)
     replace_ssa_name_symbol (partition_to_var (map, p3), root2);
   else if (!ign1)
     replace_ssa_name_symbol (partition_to_var (map, p3), root1);
 
      one.  */
   if (!ign2)
     replace_ssa_name_symbol (partition_to_var (map, p3), root2);
   else if (!ign1)
     replace_ssa_name_symbol (partition_to_var (map, p3), root1);
 

-  /* Update the various flag widgitry of the current base representative.  */
-  ann3 = var_ann (SSA_NAME_VAR (partition_to_var (map, p3)));
-  if (ann1->symbol_mem_tag)
-    ann3->symbol_mem_tag = ann1->symbol_mem_tag;
-  else
-    ann3->symbol_mem_tag = ann2->symbol_mem_tag;
-

   if (debug)
     {
       fprintf (debug, " --> P%d ", p3);
   if (debug)
     {
       fprintf (debug, " --> P%d ", p3);

-      print_generic_expr (debug, SSA_NAME_VAR (partition_to_var (map, p3)), 
+      print_generic_expr (debug, SSA_NAME_VAR (partition_to_var (map, p3)),

                          TDF_SLIM);
       fprintf (debug, "\n");
     }
                          TDF_SLIM);
       fprintf (debug, "\n");
     }

+  return true;

 }
 
 
 /* This function will make a pass through the IL, and attempt to coalesce any
    SSA versions which occur in PHI's or copies.  Coalescing is accomplished by
 }
 
 
 /* This function will make a pass through the IL, and attempt to coalesce any
    SSA versions which occur in PHI's or copies.  Coalescing is accomplished by

-   changing the underlying root variable of all coalesced version.  This will 
-   then cause the SSA->normal pass to attempt to coalesce them all to the same 
+   changing the underlying root variable of all coalesced version.  This will
+   then cause the SSA->normal pass to attempt to coalesce them all to the same

    variable.  */
 
 static unsigned int
    variable.  */
 
 static unsigned int


@@ -297,31 +267,32 @@ rename_ssa_copies (void)
 {
   var_map map;
   basic_block bb;
 {
   var_map map;
   basic_block bb;

-  block_stmt_iterator bsi;
-  tree phi, stmt, var, part_var;
+  gimple_stmt_iterator gsi;
+  tree var, part_var;
+  gimple stmt, phi;

   unsigned x;
   FILE *debug;
   unsigned x;
   FILE *debug;

+  bool updated = false;

 
   if (dump_file && (dump_flags & TDF_DETAILS))
     debug = dump_file;
   else
     debug = NULL;
 
 
   if (dump_file && (dump_flags & TDF_DETAILS))
     debug = dump_file;
   else
     debug = NULL;
 

-  map = init_var_map (num_ssa_names + 1);
+  map = init_var_map (num_ssa_names);

 
   FOR_EACH_BB (bb)
     {
       /* Scan for real copies.  */
 
   FOR_EACH_BB (bb)
     {
       /* Scan for real copies.  */

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

        {
        {

-         stmt = bsi_stmt (bsi); 
-         if (TREE_CODE (stmt) == GIMPLE_MODIFY_STMT)
+         stmt = gsi_stmt (gsi);
+         if (gimple_assign_ssa_name_copy_p (stmt))

            {
            {

-             tree lhs = GIMPLE_STMT_OPERAND (stmt, 0);
-             tree rhs = GIMPLE_STMT_OPERAND (stmt, 1);
+             tree lhs = gimple_assign_lhs (stmt);
+             tree rhs = gimple_assign_rhs1 (stmt);

 
 

-              if (TREE_CODE (lhs) == SSA_NAME && TREE_CODE (rhs) == SSA_NAME)
-               copy_rename_partition_coalesce (map, lhs, rhs, debug);
+             updated |= copy_rename_partition_coalesce (map, lhs, rhs, debug);

            }
        }
     }
            }
        }
     }


@@ -329,20 +300,23 @@ rename_ssa_copies (void)
   FOR_EACH_BB (bb)
     {
       /* Treat PHI nodes as copies between the result and each argument.  */
   FOR_EACH_BB (bb)
     {
       /* Treat PHI nodes as copies between the result and each argument.  */

-      for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi))
+      for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi))

         {
         {

-          int i;
-         tree res = PHI_RESULT (phi);
+          size_t i;
+         tree res;
+
+         phi = gsi_stmt (gsi);
+         res = gimple_phi_result (phi);

 
          /* Do not process virtual SSA_NAMES.  */
          if (!is_gimple_reg (SSA_NAME_VAR (res)))
            continue;
 
 
          /* Do not process virtual SSA_NAMES.  */
          if (!is_gimple_reg (SSA_NAME_VAR (res)))
            continue;
 

-          for (i = 0; i < PHI_NUM_ARGS (phi); i++)
+          for (i = 0; i < gimple_phi_num_args (phi); i++)

             {
             {

-              tree arg = PHI_ARG_DEF (phi, i);
+              tree arg = gimple_phi_arg (phi, i)->def;

               if (TREE_CODE (arg) == SSA_NAME)
               if (TREE_CODE (arg) == SSA_NAME)

-               copy_rename_partition_coalesce (map, res, arg, debug);
+               updated |= copy_rename_partition_coalesce (map, res, arg, debug);

             }
         }
     }
             }
         }
     }


@@ -352,13 +326,13 @@ rename_ssa_copies (void)
 
   /* Now one more pass to make all elements of a partition share the same
      root variable.  */
 
   /* Now one more pass to make all elements of a partition share the same
      root variable.  */

-  
-  for (x = 1; x <= num_ssa_names; x++)
+
+  for (x = 1; x < num_ssa_names; x++)

     {
       part_var = partition_to_var (map, x);
       if (!part_var)
         continue;
     {
       part_var = partition_to_var (map, x);
       if (!part_var)
         continue;

-      var = map->partition_to_var[x];
+      var = ssa_name (x);

       if (debug)
         {
          if (SSA_NAME_VAR (var) != SSA_NAME_VAR (part_var))
       if (debug)
         {
          if (SSA_NAME_VAR (var) != SSA_NAME_VAR (part_var))


@@ -374,7 +348,7 @@ rename_ssa_copies (void)
     }
 
   delete_var_map (map);
     }
 
   delete_var_map (map);

-  return 0;
+  return updated ? TODO_remove_unused_locals : 0;

 }
 
 /* Return true if copy rename is to be performed.  */
 }
 
 /* Return true if copy rename is to be performed.  */


@@ -385,8 +359,10 @@ gate_copyrename (void)
   return flag_tree_copyrename != 0;
 }
 
   return flag_tree_copyrename != 0;
 }
 

-struct tree_opt_pass pass_rename_ssa_copies = 
-{  
+struct gimple_opt_pass pass_rename_ssa_copies =
+{
+ {
+  GIMPLE_PASS,

   "copyrename",                                /* name */
   gate_copyrename,                     /* gate */
   rename_ssa_copies,                   /* execute */
   "copyrename",                                /* name */
   gate_copyrename,                     /* gate */
   rename_ssa_copies,                   /* execute */


@@ -394,11 +370,10 @@ struct tree_opt_pass pass_rename_ssa_copies =
   NULL,                                        /* next */
   0,                                   /* static_pass_number */
   TV_TREE_COPY_RENAME,                 /* tv_id */
   NULL,                                        /* next */
   0,                                   /* static_pass_number */
   TV_TREE_COPY_RENAME,                 /* tv_id */

-  PROP_cfg | PROP_ssa | PROP_alias,    /* properties_required */
+  PROP_cfg | PROP_ssa,                 /* properties_required */

   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */
   0,                                   /* properties_provided */
   0,                                   /* properties_destroyed */

-  0,                                   /* todo_flags_start */ 
-  TODO_dump_func | TODO_verify_ssa,     /* todo_flags_finish */
-  0                                    /* letter */
-}; 
-
+  0,                                   /* todo_flags_start */
+  TODO_dump_func | TODO_verify_ssa      /* todo_flags_finish */
+ }
+};