X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ftree-ssa-copyrename.c;h=ed221c2f3e08565a0291cc3831ec8a6c05023dba;hb=db899978cbb5a0ffe7e7ddf741c5c61f949f28d2;hp=b2921a2b9eb2ec3d073f612a9687ff2619c8530d;hpb=ad3a58c88bd70c0a24d1d1403dcc2b6cae09a794;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c index b2921a2b9eb..ed221c2f3e0 100644 --- a/gcc/tree-ssa-copyrename.c +++ b/gcc/tree-ssa-copyrename.c @@ -1,12 +1,12 @@ /* Rename SSA copies. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc. Contributed by Andrew MacLeod 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, @@ -15,22 +15,22 @@ 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 -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 +. */ #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 "bitmap.h" #include "tree-flow.h" -#include "tree-gimple.h" +#include "gimple.h" #include "tree-inline.h" #include "timevar.h" #include "hashtab.h" @@ -109,13 +109,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. */ -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; - var_ann_t ann1, ann2, ann3; bool ign1, ign2, abnorm; gcc_assert (TREE_CODE (var1) == SSA_NAME); @@ -144,14 +143,11 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug) 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"); - return; + return false; } /* Don't coalesce if one of the variables occurs in an abnormal PHI. */ @@ -161,7 +157,7 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug) { if (debug) fprintf (debug, " : Abnormal PHI barrier. No coalesce.\n"); - return; + return false; } /* Partitions already have the same root, simply merge them. */ @@ -170,7 +166,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); - return; + return false; } /* Never attempt to coalesce 2 difference parameters. */ @@ -178,14 +174,14 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug) { 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"); - return; + return false; } ign1 = TREE_CODE (root1) == VAR_DECL && DECL_IGNORED_P (root1); @@ -203,20 +199,10 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug) { 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 tag, make sure that variable is the new root partition. */ if (gimple_default_def (cfun, root1)) @@ -225,7 +211,7 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug) { if (debug) fprintf (debug, " : 2 default defs. No coalesce.\n"); - return; + return false; } else { @@ -240,25 +226,13 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug) } /* 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"); - return; - } - - /* 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; + return false; } - /* Merge the two partitions. */ p3 = partition_union (map->var_partition, p1, p2); @@ -269,13 +243,6 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug) 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); @@ -283,6 +250,7 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug) TDF_SLIM); fprintf (debug, "\n"); } + return true; } @@ -297,31 +265,32 @@ rename_ssa_copies (void) { 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; + bool updated = false; 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 (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) == MODIFY_EXPR) + stmt = gsi_stmt (gsi); + if (gimple_assign_ssa_name_copy_p (stmt)) { - tree lhs = TREE_OPERAND (stmt, 0); - tree rhs = TREE_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 +298,23 @@ rename_ssa_copies (void) 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; - 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) - copy_rename_partition_coalesce (map, res, arg, debug); + updated |= copy_rename_partition_coalesce (map, res, arg, debug); } } } @@ -353,12 +325,12 @@ rename_ssa_copies (void) /* 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; - var = map->partition_to_var[x]; + var = ssa_name (x); if (debug) { if (SSA_NAME_VAR (var) != SSA_NAME_VAR (part_var)) @@ -374,7 +346,7 @@ rename_ssa_copies (void) } delete_var_map (map); - return 0; + return updated ? TODO_remove_unused_locals : 0; } /* Return true if copy rename is to be performed. */ @@ -385,8 +357,10 @@ gate_copyrename (void) 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 */ @@ -394,11 +368,10 @@ struct tree_opt_pass pass_rename_ssa_copies = 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, /* todo_flags_start */ - TODO_dump_func | TODO_verify_ssa, /* todo_flags_finish */ - 0 /* letter */ + TODO_dump_func | TODO_verify_ssa /* todo_flags_finish */ + } }; -