re PR ipa/44563 (GCC uses a lot of RAM when compiling a large numbers of functions)

2015-03-12  Richard Biener  <rguenther@suse.de>

	PR middle-end/44563
	* tree-inline.c (gimple_expand_calls_inline): Walk BB backwards
	to avoid quadratic behavior with inline expansion splitting blocks.
	* tree-cfgcleanup.c (cleanup_tree_cfg_bb): Do not merge block
	with the successor if the predecessor will be merged with it.
	* tree-cfg.c (gimple_can_merge_blocks_p): We can't merge the
	entry block with its successor.

From-SVN: r221410

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18ada578fd6fd337756aeb3472c857b9625729f6..3f24ed8d5690db71cca0cacbc73c094ee850ebe1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2015-03-12  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/44563
+       * tree-inline.c (gimple_expand_calls_inline): Walk BB backwards
+       to avoid quadratic behavior with inline expansion splitting blocks.
+       * tree-cfgcleanup.c (cleanup_tree_cfg_bb): Do not merge block
+       with the successor if the predecessor will be merged with it.
+       * tree-cfg.c (gimple_can_merge_blocks_p): We can't merge the
+       entry block with its successor.
+
 2015-03-13  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/44563

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index ac12a585c5174ec3ed061bb03664b6578b6a119a..0f5e428124c71bd7c91e8e36ece4d87bf8dd455e 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1703,7 +1703,8 @@ gimple_can_merge_blocks_p (basic_block a, basic_block b)
   if (!single_pred_p (b))
     return false;
 
-  if (b == EXIT_BLOCK_PTR_FOR_FN (cfun))
+  if (a == ENTRY_BLOCK_PTR_FOR_FN (cfun)
+      || b == EXIT_BLOCK_PTR_FOR_FN (cfun))
     return false;
 
   /* If A ends by a statement causing exceptions or something similar, we

diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index f5a21a30f85c0975c7bdcded3e12523fb4e38587..e7122e33c2882250da0d4a9d390f339509d2c20c 100644 (file)
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -650,8 +650,18 @@ cleanup_tree_cfg_bb (basic_block bb)
   if (single_succ_p (bb)
       && can_merge_blocks_p (bb, single_succ (bb)))
     {
-      merge_blocks (bb, single_succ (bb));
-      return true;
+      /* If there is a merge opportunity with the predecessor
+         do nothing now but wait until we process the predecessor.
+        This happens when we visit BBs in a non-optimal order and
+        avoids quadratic behavior with adjusting stmts BB pointer.  */
+      if (single_pred_p (bb)
+         && can_merge_blocks_p (single_pred (bb), bb))
+       ;
+      else
+       {
+         merge_blocks (bb, single_succ (bb));
+         return true;
+       }
     }
 
   return retval;

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 259a3488c3475ffcbb9dce5b82c03b7b4b10a2de..83e43356f60b44678acdf6c686e7d1c425097055 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -4779,18 +4779,19 @@ static bool
 gimple_expand_calls_inline (basic_block bb, copy_body_data *id)
 {
   gimple_stmt_iterator gsi;
+  bool inlined = false;
 
-  for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+  for (gsi = gsi_last_bb (bb); !gsi_end_p (gsi);)
     {
       gimple stmt = gsi_stmt (gsi);
+      gsi_prev (&gsi);
 
       if (is_gimple_call (stmt)
-         && !gimple_call_internal_p (stmt)
-         && expand_call_inline (bb, stmt, id))
-       return true;
+         && !gimple_call_internal_p (stmt))
+       inlined |= expand_call_inline (bb, stmt, id);
     }
 
-  return false;
+  return inlined;
 }