OSDN Git Service

Always execute verify_loop_closed_ssa at LNO level.
authorspop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 6 Apr 2010 19:20:29 +0000 (19:20 +0000)
committerMasaki Muranaka <monaka@monami-software.com>
Sun, 23 May 2010 00:47:14 +0000 (09:47 +0900)
2010-04-06  Sebastian Pop  <sebastian.pop@amd.com>

* passes.c (execute_function_todo): Call verify_loop_closed_ssa
for all the passes of the LNO having LOOP_CLOSED_SSA.
* tree-if-conv.c (pass_if_conversion): Remove TODO_verify_loops.
* tree-loop-distribution.c (pass_loop_distribution): Same.
* tree-pass.h (TODO_verify_loops): Removed.
* tree-ssa-loop.c (pass_tree_loop_init): Same.
(pass_lim): Same.
(pass_tree_unswitch): Same.
(pass_predcom): Same.
(pass_vectorize): Same.
(pass_linear_transform): Same.
(pass_graphite_transforms): Same.
(pass_iv_canon): Same.
(pass_complete_unroll): Same.
(pass_complete_unrolli): Same.
(pass_parallelize_loops): Same.
(pass_loop_prefetch): Same.
(pass_iv_optimize): Same.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158020 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/passes.c

index 7e98243..1489840 100644 (file)
@@ -1,3 +1,24 @@
+2010-04-06  Sebastian Pop  <sebastian.pop@amd.com>
+
+       * passes.c (execute_function_todo): Call verify_loop_closed_ssa
+       for all the passes of the LNO having LOOP_CLOSED_SSA.
+       * tree-if-conv.c (pass_if_conversion): Remove TODO_verify_loops.
+       * tree-loop-distribution.c (pass_loop_distribution): Same.
+       * tree-pass.h (TODO_verify_loops): Removed.
+       * tree-ssa-loop.c (pass_tree_loop_init): Same.
+       (pass_lim): Same.
+       (pass_tree_unswitch): Same.
+       (pass_predcom): Same.
+       (pass_vectorize): Same.
+       (pass_linear_transform): Same.
+       (pass_graphite_transforms): Same.
+       (pass_iv_canon): Same.
+       (pass_complete_unroll): Same.
+       (pass_complete_unrolli): Same.
+       (pass_parallelize_loops): Same.
+       (pass_loop_prefetch): Same.
+       (pass_iv_optimize): Same.
+
 2010-04-06  Changpeng Fang  <changpeng.fang@amd.com>
 
        PR middle-end/32824
index 7f097f8..0d42f9c 100644 (file)
@@ -25,6 +25,8 @@ along with GCC; see the file COPYING3.  If not see
    Error messages and low-level interface to malloc also handled here.  */
 
 #include "config.h"
+#undef FLOAT /* This is for hpux. They should change hpux.  */
+#undef FFS  /* Some systems define this in param.h.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
@@ -65,6 +67,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "reload.h"
 #include "dwarf2asm.h"
 #include "integrate.h"
+#include "real.h"
 #include "debug.h"
 #include "target.h"
 #include "langhooks.h"
@@ -188,11 +191,7 @@ rest_of_decl_compilation (tree decl,
           || DECL_INITIAL (decl))
          && !DECL_EXTERNAL (decl))
        {
-         /* When reading LTO unit, we also read varpool, so do not
-            rebuild it.  */
-         if (in_lto_p && !at_end)
-           ;
-         else if (TREE_CODE (decl) != FUNCTION_DECL)
+         if (TREE_CODE (decl) != FUNCTION_DECL)
            varpool_finalize_decl (decl);
          else
            assemble_variable (decl, top_level, at_end, 0);
@@ -219,9 +218,7 @@ rest_of_decl_compilation (tree decl,
     }
 
   /* Let cgraph know about the existence of variables.  */
-  if (in_lto_p && !at_end)
-    ;
-  else if (TREE_CODE (decl) == VAR_DECL && !DECL_EXTERNAL (decl))
+  if (TREE_CODE (decl) == VAR_DECL && !DECL_EXTERNAL (decl))
     varpool_node (decl);
 }
 
@@ -745,7 +742,6 @@ init_optimization_passes (void)
 
   /* Interprocedural optimization passes.  */
   p = &all_small_ipa_passes;
-  NEXT_PASS (pass_ipa_free_lang_data);
   NEXT_PASS (pass_ipa_function_and_variable_visibility);
   NEXT_PASS (pass_ipa_early_inline);
     {
@@ -754,6 +750,7 @@ init_optimization_passes (void)
       NEXT_PASS (pass_inline_parameters);
       NEXT_PASS (pass_rebuild_cgraph_edges);
     }
+  NEXT_PASS (pass_ipa_free_lang_data);
   NEXT_PASS (pass_early_local_passes);
     {
       struct opt_pass **p = &pass_early_local_passes.pass.sub;
@@ -806,7 +803,6 @@ init_optimization_passes (void)
 
   p = &all_regular_ipa_passes;
   NEXT_PASS (pass_ipa_whole_program_visibility);
-  NEXT_PASS (pass_ipa_profile);
   NEXT_PASS (pass_ipa_cp);
   NEXT_PASS (pass_ipa_inline);
   NEXT_PASS (pass_ipa_reference);
@@ -818,6 +814,7 @@ init_optimization_passes (void)
 
   p = &all_lto_gen_passes;
   NEXT_PASS (pass_ipa_lto_gimple_out);
+  NEXT_PASS (pass_ipa_lto_wpa_fixup);
   NEXT_PASS (pass_ipa_lto_finish_out);  /* This must be the last LTO pass.  */
   *p = NULL;
 
@@ -947,7 +944,6 @@ init_optimization_passes (void)
       NEXT_PASS (pass_forwprop);
       NEXT_PASS (pass_phiopt);
       NEXT_PASS (pass_fold_builtins);
-      NEXT_PASS (pass_optimize_widening_mul);
       NEXT_PASS (pass_tail_calls);
       NEXT_PASS (pass_rename_ssa_copies);
       NEXT_PASS (pass_uncprop);
@@ -1028,7 +1024,6 @@ init_optimization_passes (void)
          NEXT_PASS (pass_postreload_cse);
          NEXT_PASS (pass_gcse2);
          NEXT_PASS (pass_split_after_reload);
-         NEXT_PASS (pass_implicit_zee);
          NEXT_PASS (pass_branch_target_load_optimize1);
          NEXT_PASS (pass_thread_prologue_and_epilogue);
          NEXT_PASS (pass_rtl_dse2);
@@ -1261,15 +1256,14 @@ execute_function_todo (void *data)
     }
 
 #if defined ENABLE_CHECKING
-  if (flags & TODO_verify_ssa
-      || (current_loops && loops_state_satisfies_p (LOOP_CLOSED_SSA)))
+  if (flags & TODO_verify_ssa)
     verify_ssa (true);
   if (flags & TODO_verify_flow)
     verify_flow_info ();
   if (flags & TODO_verify_stmts)
     verify_stmts ();
   if (current_loops && loops_state_satisfies_p (LOOP_CLOSED_SSA))
-    verify_loop_closed_ssa (false);
+    verify_loop_closed_ssa ();
   if (flags & TODO_verify_rtl_sharing)
     verify_rtl_sharing ();
 #endif
@@ -1366,17 +1360,14 @@ pass_init_dump_file (struct opt_pass *pass)
       if (dump_file && current_function_decl)
        {
          const char *dname, *aname;
-         struct cgraph_node *node = cgraph_node (current_function_decl);
          dname = lang_hooks.decl_printable_name (current_function_decl, 2);
          aname = (IDENTIFIER_POINTER
                   (DECL_ASSEMBLER_NAME (current_function_decl)));
          fprintf (dump_file, "\n;; Function %s (%s)%s\n\n", dname, aname,
-            node->frequency == NODE_FREQUENCY_HOT
+            cfun->function_frequency == FUNCTION_FREQUENCY_HOT
             ? " (hot)"
-            : node->frequency == NODE_FREQUENCY_UNLIKELY_EXECUTED
+            : cfun->function_frequency == FUNCTION_FREQUENCY_UNLIKELY_EXECUTED
             ? " (unlikely executed)"
-            : node->frequency == NODE_FREQUENCY_EXECUTED_ONCE
-            ? " (executed once)"
             : "");
        }
       return initializing_dump;
@@ -1495,20 +1486,10 @@ execute_one_ipa_transform_pass (struct cgraph_node *node,
 void
 execute_all_ipa_transforms (void)
 {
-  enum cgraph_state old_state = cgraph_state;
   struct cgraph_node *node;
   if (!cfun)
     return;
   node = cgraph_node (current_function_decl);
-
-  /* Statement verification skip verification of nothorw when
-     state is IPA_SSA because we do not modify function bodies
-     after setting the flag on function.  Instead we leave it
-     to fixup_cfg to do such a transformation.  We need to temporarily
-     change the cgraph state so statement verifier before
-     transform do not fire.  */
-  cgraph_state = CGRAPH_STATE_IPA_SSA;
-
   if (node->ipa_transforms_to_apply)
     {
       unsigned int i;
@@ -1522,7 +1503,6 @@ execute_all_ipa_transforms (void)
       VEC_free (ipa_opt_pass, heap, node->ipa_transforms_to_apply);
       node->ipa_transforms_to_apply = NULL;
     }
-  cgraph_state = old_state;
 }
 
 /* Execute PASS. */
@@ -1653,7 +1633,6 @@ execute_pass_list (struct opt_pass *pass)
 
 static void
 ipa_write_summaries_2 (struct opt_pass *pass, cgraph_node_set set,
-                      varpool_node_set vset,
                       struct lto_out_decl_state *state)
 {
   while (pass)
@@ -1670,7 +1649,7 @@ ipa_write_summaries_2 (struct opt_pass *pass, cgraph_node_set set,
          if (pass->tv_id)
            timevar_push (pass->tv_id);
 
-         ipa_pass->write_summary (set,vset);
+         ipa_pass->write_summary (set);
 
          /* If a timevar is present, start it.  */
          if (pass->tv_id)
@@ -1678,7 +1657,7 @@ ipa_write_summaries_2 (struct opt_pass *pass, cgraph_node_set set,
        }
 
       if (pass->sub && pass->sub->type != GIMPLE_PASS)
-       ipa_write_summaries_2 (pass->sub, set, vset, state);
+       ipa_write_summaries_2 (pass->sub, set, state);
 
       pass = pass->next;
     }
@@ -1689,16 +1668,14 @@ ipa_write_summaries_2 (struct opt_pass *pass, cgraph_node_set set,
    summaries.  SET is the set of nodes to be written.  */
 
 static void
-ipa_write_summaries_1 (cgraph_node_set set, varpool_node_set vset)
+ipa_write_summaries_1 (cgraph_node_set set)
 {
   struct lto_out_decl_state *state = lto_new_out_decl_state ();
-  compute_ltrans_boundary (state, set, vset);
-
   lto_push_out_decl_state (state);
 
-  gcc_assert (!flag_wpa);
-  ipa_write_summaries_2 (all_regular_ipa_passes, set, vset, state);
-  ipa_write_summaries_2 (all_lto_gen_passes, set, vset, state);
+  if (!flag_wpa)
+    ipa_write_summaries_2 (all_regular_ipa_passes, set, state);
+  ipa_write_summaries_2 (all_lto_gen_passes, set, state);
 
   gcc_assert (lto_get_out_decl_state () == state);
   lto_pop_out_decl_state ();
@@ -1711,14 +1688,13 @@ void
 ipa_write_summaries (void)
 {
   cgraph_node_set set;
-  varpool_node_set vset;
   struct cgraph_node **order;
-  struct varpool_node *vnode;
   int i, order_pos;
 
   if (!flag_generate_lto || errorcount || sorrycount)
     return;
 
+  lto_new_extern_inline_states ();
   set = cgraph_node_set_new ();
 
   /* Create the callgraph set in the same order used in
@@ -1745,77 +1721,25 @@ ipa_write_summaries (void)
          renumber_gimple_stmt_uids ();
          pop_cfun ();
        }
-      if (node->analyzed)
-       cgraph_node_set_add (set, node);
+      cgraph_node_set_add (set, node);
     }
-  vset = varpool_node_set_new ();
 
-  for (vnode = varpool_nodes; vnode; vnode = vnode->next)
-    if (vnode->needed && !vnode->alias)
-      varpool_node_set_add (vset, vnode);
-
-  ipa_write_summaries_1 (set, vset);
+  ipa_write_summaries_1 (set);
+  lto_delete_extern_inline_states ();
 
   free (order);
   ggc_free (set);
-  ggc_free (vset);
 }
 
-/* Same as execute_pass_list but assume that subpasses of IPA passes
-   are local passes. If SET is not NULL, write out optimization summaries of
-   only those node in SET. */
 
-static void
-ipa_write_optimization_summaries_1 (struct opt_pass *pass, cgraph_node_set set,
-                      varpool_node_set vset,
-                      struct lto_out_decl_state *state)
-{
-  while (pass)
-    {
-      struct ipa_opt_pass_d *ipa_pass = (struct ipa_opt_pass_d *)pass;
-      gcc_assert (!current_function_decl);
-      gcc_assert (!cfun);
-      gcc_assert (pass->type == SIMPLE_IPA_PASS || pass->type == IPA_PASS);
-      if (pass->type == IPA_PASS
-         && ipa_pass->write_optimization_summary
-         && (!pass->gate || pass->gate ()))
-       {
-         /* If a timevar is present, start it.  */
-         if (pass->tv_id)
-           timevar_push (pass->tv_id);
-
-         ipa_pass->write_optimization_summary (set, vset);
-
-         /* If a timevar is present, start it.  */
-         if (pass->tv_id)
-           timevar_pop (pass->tv_id);
-       }
-
-      if (pass->sub && pass->sub->type != GIMPLE_PASS)
-       ipa_write_optimization_summaries_1 (pass->sub, set, vset, state);
-
-      pass = pass->next;
-    }
-}
-
-/* Write all the optimization summaries for the cgraph nodes in SET.  If SET is
+/* Write all the summaries for the cgraph nodes in SET.  If SET is
    NULL, write out all summaries of all nodes. */
 
 void
-ipa_write_optimization_summaries (cgraph_node_set set, varpool_node_set vset)
+ipa_write_summaries_of_cgraph_node_set (cgraph_node_set set)
 {
-  struct lto_out_decl_state *state = lto_new_out_decl_state ();
-  compute_ltrans_boundary (state, set, vset);
-
-  lto_push_out_decl_state (state);
-
-  gcc_assert (flag_wpa);
-  ipa_write_optimization_summaries_1 (all_regular_ipa_passes, set, vset, state);
-  ipa_write_optimization_summaries_1 (all_lto_gen_passes, set, vset, state);
-
-  gcc_assert (lto_get_out_decl_state () == state);
-  lto_pop_out_decl_state ();
-  lto_delete_out_decl_state (state);
+  if (flag_generate_lto && !(errorcount || sorrycount))
+    ipa_write_summaries_1 (set);
 }
 
 /* Same as execute_pass_list but assume that subpasses of IPA passes
@@ -1860,57 +1784,13 @@ ipa_read_summaries_1 (struct opt_pass *pass)
 void
 ipa_read_summaries (void)
 {
-  ipa_read_summaries_1 (all_regular_ipa_passes);
+  if (!flag_ltrans)
+    ipa_read_summaries_1 (all_regular_ipa_passes);
   ipa_read_summaries_1 (all_lto_gen_passes);
 }
 
 /* Same as execute_pass_list but assume that subpasses of IPA passes
    are local passes.  */
-
-static void
-ipa_read_optimization_summaries_1 (struct opt_pass *pass)
-{
-  while (pass)
-    {
-      struct ipa_opt_pass_d *ipa_pass = (struct ipa_opt_pass_d *) pass;
-
-      gcc_assert (!current_function_decl);
-      gcc_assert (!cfun);
-      gcc_assert (pass->type == SIMPLE_IPA_PASS || pass->type == IPA_PASS);
-
-      if (pass->gate == NULL || pass->gate ())
-       {
-         if (pass->type == IPA_PASS && ipa_pass->read_optimization_summary)
-           {
-             /* If a timevar is present, start it.  */
-             if (pass->tv_id)
-               timevar_push (pass->tv_id);
-
-             ipa_pass->read_optimization_summary ();
-
-             /* Stop timevar.  */
-             if (pass->tv_id)
-               timevar_pop (pass->tv_id);
-           }
-
-         if (pass->sub && pass->sub->type != GIMPLE_PASS)
-           ipa_read_optimization_summaries_1 (pass->sub);
-       }
-      pass = pass->next;
-    }
-}
-
-/* Read all the summaries for all_regular_ipa_passes and all_lto_gen_passes.  */
-
-void
-ipa_read_optimization_summaries (void)
-{
-  ipa_read_optimization_summaries_1 (all_regular_ipa_passes);
-  ipa_read_optimization_summaries_1 (all_lto_gen_passes);
-}
-
-/* Same as execute_pass_list but assume that subpasses of IPA passes
-   are local passes.  */
 void
 execute_ipa_pass_list (struct opt_pass *pass)
 {