CbC/CbC_gcc: gcc/ipa-inline-transform.c comparison

comparison gcc/ipa-inline-transform.c @ 145:1830386684a0

gcc-9.2.0

author	anatofuz
date	Thu, 13 Feb 2020 11:34:05 +0900
parents	84e7813d76e9
children

comparison

equal deleted inserted replaced

-:84e7813d76e9
+:1830386684a0
 /* Callgraph transformations to handle inlining
-Copyright (C) 2003-2018 Free Software Foundation, Inc.
+Copyright (C) 2003-2020 Free Software Foundation, Inc.
 Contributed by Jan Hubicka
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify it under
 #include "ipa-inline.h"
 #include "tree-inline.h"
 #include "function.h"
 #include "cfg.h"
 #include "basic-block.h"
+#include "ipa-utils.h"
 int ncalls_inlined;
 int nfunctions_inlined;
 /* Scale counts of NODE edges by NUM/DEN.  */
 	     Lacking may edges in callgraph we just preserve them post
 	     inlining.  */
 	  && (!DECL_VIRTUAL_P (node->decl)
 	      || !opt_for_fn (node->decl, flag_devirtualize))
 	  /* During early inlining some unanalyzed cgraph nodes might be in the
-	     callgraph and they might reffer the function in question.  */
+	     callgraph and they might refer the function in question.  */
 	  && !cgraph_new_nodes.exists ());
 }
 /* We are going to eliminate last direct call to NODE (or alias of it) via edge E.
 Verify that the NODE can be removed from unit and if it is contained in comdat
 		     bool update_original, int *overall_size)
 {
 struct cgraph_node *inlining_into;
 struct cgraph_edge *next;
-if (e->caller->global.inlined_to)
+if (e->caller->inlined_to)
-inlining_into = e->caller->global.inlined_to;
+inlining_into = e->caller->inlined_to;
 else
 inlining_into = e->caller;
 if (duplicate)
 {
 /* We may eliminate the need for out-of-line copy to be output.
 	 In that case just go ahead and re-use it.  This is not just an
-	 memory optimization.  Making offline copy of fuction disappear
+	 memory optimization.  Making offline copy of function disappear
 	 from the program will improve future decisions on inlining.  */
 if (!e->callee->callers->next_caller
 	  /* Recursive inlining never wants the master clone to
 	     be overwritten.  */
 	  && update_original
 	  /* TODO: When callee is in a comdat group, we could remove all of it,
 	     including all inline clones inlined into it.  That would however
 	     need small function inlining to register edge removal hook to
 	     maintain the priority queue.
-	     For now we keep the ohter functions in the group in program until
+	     For now we keep the other functions in the group in program until
 	     cgraph_remove_unreachable_functions gets rid of them.  */
-	  gcc_assert (!e->callee->global.inlined_to);
+	  gcc_assert (!e->callee->inlined_to);
 	  e->callee->remove_from_same_comdat_group ();
 	  if (e->callee->definition
 	      && inline_account_function_p (e->callee))
 	    {
 	      gcc_assert (!e->callee->alias);
 	      if (overall_size)
-		*overall_size -= ipa_fn_summaries->get (e->callee)->size;
+		*overall_size -= ipa_size_summaries->get (e->callee)->size;
 	      nfunctions_inlined++;
 	    }
 	  duplicate = false;
 	  e->callee->externally_visible = false;
 update_noncloned_counts (e->callee, e->count, e->callee->count);
 	}
 }
 else
 e->callee->remove_from_same_comdat_group ();
-e->callee->global.inlined_to = inlining_into;
+e->callee->inlined_to = inlining_into;
 /* Recursively clone all bodies.  */
 for (e = e->callee->callees; e; e = next)
 {
 next = e->next_callee;
 if (!e->inline_failed)
 clone_inlined_nodes (e, duplicate, update_original, overall_size);
 }
 }
-/* Check all speculations in N and resolve them if they seems useless. */
+/* Check all speculations in N and if any seem useless, resolve them.  When a
+first edge is resolved, pop all edges from NEW_EDGES and insert them to
+EDGE_SET.  Then remove each resolved edge from EDGE_SET, if it is there.  */
 static bool
-check_speculations (cgraph_node *n)
+check_speculations_1 (cgraph_node *n, vec<cgraph_edge *> *new_edges,
+		      hash_set <cgraph_edge *> *edge_set)
 {
 bool speculation_removed = false;
 cgraph_edge *next;
 for (cgraph_edge *e = n->callees; e; e = next)
 {
 next = e->next_callee;
 if (e->speculative && !speculation_useful_p (e, true))
 	{
-	  e->resolve_speculation (NULL);
+	  while (new_edges && !new_edges->is_empty ())
+	    edge_set->add (new_edges->pop ());
+	  edge_set->remove (e);
+	  cgraph_edge::resolve_speculation (e, NULL);
 	  speculation_removed = true;
 	}
 else if (!e->inline_failed)
-	speculation_removed |= check_speculations (e->callee);
+	speculation_removed |= check_speculations_1 (e->callee, new_edges,
+						     edge_set);
 }
 return speculation_removed;
+}
+/* Push E to NEW_EDGES.  Called from hash_set traverse method, which
+unfortunately means this function has to have external linkage, otherwise
+the code will not compile with gcc 4.8.  */
+bool
+push_all_edges_in_set_to_vec (cgraph_edge * const &e,
+			      vec<cgraph_edge *> *new_edges)
+{
+new_edges->safe_push (e);
+return true;
+}
+/* Check all speculations in N and if any seem useless, resolve them and remove
+them from NEW_EDGES.  */
+static bool
+check_speculations (cgraph_node *n, vec<cgraph_edge *> *new_edges)
+{
+hash_set <cgraph_edge *> edge_set;
+bool res = check_speculations_1 (n, new_edges, &edge_set);
+if (!edge_set.is_empty ())
+edge_set.traverse <vec<cgraph_edge *> *,
+		       push_all_edges_in_set_to_vec> (new_edges);
+return res;
 }
 /* Mark all call graph edges coming out of NODE and all nodes that have been
 inlined to it as in_polymorphic_cdtor.  */
 	     bool *callee_removed)
 {
 int old_size = 0, new_size = 0;
 struct cgraph_node *to = NULL;
 struct cgraph_edge *curr = e;
+bool comdat_local = e->callee->comdat_local_p ();
 struct cgraph_node *callee = e->callee->ultimate_alias_target ();
 bool new_edges_found = false;
 int estimated_growth = 0;
 if (! update_overall_summary)
 #endif
 /* Don't inline inlined edges.  */
 gcc_assert (e->inline_failed);
 /* Don't even think of inlining inline clone.  */
-gcc_assert (!callee->global.inlined_to);
+gcc_assert (!callee->inlined_to);
 to = e->caller;
-if (to->global.inlined_to)
+if (to->inlined_to)
-to = to->global.inlined_to;
+to = to->inlined_to;
 if (to->thunk.thunk_p)
 {
 struct cgraph_node *target = to->callees->callee;
+thunk_expansion = true;
+symtab->call_cgraph_removal_hooks (to);
 if (in_lto_p)
 	to->get_untransformed_body ();
 to->expand_thunk (false, true);
 /* When thunk is instrumented we may have multiple callees.  */
 for (e = to->callees; e && e->callee != target; e = e->next_callee)
 	;
+symtab->call_cgraph_insertion_hooks (to);
+thunk_expansion = false;
 gcc_assert (e);
 }
 e->inline_failed = CIF_OK;
 	}
 }
 clone_inlined_nodes (e, true, update_original, overall_size);
-gcc_assert (curr->callee->global.inlined_to == to);
+gcc_assert (curr->callee->inlined_to == to);
-old_size = ipa_fn_summaries->get (to)->size;
+old_size = ipa_size_summaries->get (to)->size;
 ipa_merge_fn_summary_after_inlining (e);
 if (e->in_polymorphic_cdtor)
 mark_all_inlined_calls_cdtor (e->callee);
 if (opt_for_fn (e->caller->decl, optimize))
 new_edges_found = ipa_propagate_indirect_call_infos (curr, new_edges);
-check_speculations (e->callee);
+bool removed_p = check_speculations (e->callee, new_edges);
 if (update_overall_summary)
-ipa_update_overall_fn_summary (to);
+ipa_update_overall_fn_summary (to, new_edges_found || removed_p);
 else
 /* Update self size by the estimate so overall function growth limits
 work for further inlining into this function.  Before inlining
 the function we inlined to again we expect the caller to update
 the overall summary.  */
-ipa_fn_summaries->get (to)->size += estimated_growth;
+ipa_size_summaries->get (to)->size += estimated_growth;
-new_size = ipa_fn_summaries->get (to)->size;
+new_size = ipa_size_summaries->get (to)->size;
 if (callee->calls_comdat_local)
 to->calls_comdat_local = true;
-else if (to->calls_comdat_local && callee->comdat_local_p ())
+else if (to->calls_comdat_local && comdat_local)
 {
 struct cgraph_edge *se = to->callees;
 for (; se; se = se->next_callee)
 	if (se->inline_failed && se->callee->comdat_local_p ())
 	  break;
 {
 struct cgraph_node *first_clone, *n;
 if (dump_file)
 fprintf (dump_file, "\nSaving body of %s for later reuse\n",
-	     node->name ());
+	     node->dump_name ());
 gcc_assert (node == cgraph_node::get (node->decl));
 /* first_clone will be turned into real function.  */
 first_clone = node->clones;
 	  }
 }
 /* Copy the OLD_VERSION_NODE function tree to the new version.  */
 tree_function_versioning (node->decl, first_clone->decl,
-			    NULL, true, NULL, false,
+			    NULL, NULL, true, NULL, NULL);
-			    NULL, NULL);
 /* The function will be short lived and removed after we inline all the clones,
 but make it internal so we won't confuse ourself.  */
 DECL_EXTERNAL (first_clone->decl) = 0;
 TREE_PUBLIC (first_clone->decl) = 0;
 first_clone->ipa_transforms_to_apply.release ();
 /* When doing recursive inlining, the clone may become unnecessary.
 This is possible i.e. in the case when the recursive function is proved to be
 non-throwing and the recursion happens only in the EH landing pad.
-We can not remove the clone until we are done with saving the body.
+We cannot remove the clone until we are done with saving the body.
 Remove it now.  */
 if (!first_clone->callers)
 {
 first_clone->remove_symbol_and_inline_clones ();
 first_clone = NULL;
 /* We might need the body of this function so that we can expand
 it inline somewhere else.  */
 if (preserve_function_body_p (node))
 save_inline_function_body (node);
+profile_count num = node->count;
+profile_count den = ENTRY_BLOCK_PTR_FOR_FN (cfun)->count;
+bool scale = num.initialized_p () && !(num == den);
+if (scale)
+{
+profile_count::adjust_for_ipa_scaling (&num, &den);
+if (dump_file)
+	{
+	  fprintf (dump_file, "Applying count scale ");
+	  num.dump (dump_file);
+	  fprintf (dump_file, "/");
+	  den.dump (dump_file);
+	  fprintf (dump_file, "\n");
+	}
+basic_block bb;
+cfun->cfg->count_max = profile_count::uninitialized ();
+FOR_ALL_BB_FN (bb, cfun)
+	{
+	  bb->count = bb->count.apply_scale (num, den);
+	  cfun->cfg->count_max = cfun->cfg->count_max.max (bb->count);
+	}
+ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = node->count;
+}
 for (e = node->callees; e; e = next)
 {
 if (!e->inline_failed)
 	has_inline = true;
 next = e->next_callee;
-e->redirect_call_stmt_to_callee ();
+cgraph_edge::redirect_call_stmt_to_callee (e);
 }
 node->remove_all_references ();
 timevar_push (TV_INTEGRATION);
 if (node->callees && (opt_for_fn (node->decl, optimize) || has_inline))
 {
-profile_count num = node->count;
-profile_count den = ENTRY_BLOCK_PTR_FOR_FN (cfun)->count;
-bool scale = num.initialized_p () && !(num == den);
-if (scale)
-	{
-	  profile_count::adjust_for_ipa_scaling (&num, &den);
-	  if (dump_file)
-	    {
-	      fprintf (dump_file, "Applying count scale ");
-	      num.dump (dump_file);
-	      fprintf (dump_file, "/");
-	      den.dump (dump_file);
-	      fprintf (dump_file, "\n");
-	    }
-	  basic_block bb;
-	  cfun->cfg->count_max = profile_count::uninitialized ();
-	  FOR_ALL_BB_FN (bb, cfun)
-	    {
-	      bb->count = bb->count.apply_scale (num, den);
-	      cfun->cfg->count_max = cfun->cfg->count_max.max (bb->count);
-	    }
-	  ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = node->count;
-	}
 todo = optimize_inline_calls (current_function_decl);
 }
 timevar_pop (TV_INTEGRATION);
 cfun->always_inline_functions_inlined = true;
 cfun->after_inlining = true;
 todo |= execute_fixup_cfg ();

Mercurial > hg > CbC > CbC_gcc

comparison gcc/ipa-inline-transform.c @ 145:1830386684a0