CbC/CbC_gcc: gcc/tree-profile.c comparison

comparison gcc/tree-profile.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
 /* Calculate branch probabilities, and basic block execution counts.
-Copyright (C) 1990-2018 Free Software Foundation, Inc.
+Copyright (C) 1990-2020 Free Software Foundation, Inc.
 Contributed by James E. Wilson, UC Berkeley/Cygnus Support;
 based on some ideas from Dain Samples of UC Berkeley.
 Further mangling by Bob Manson, Cygnus Support.
 Converted to use trees by Dale Johannesen, Apple Computer.
 #include "tree-cfg.h"
 #include "tree-into-ssa.h"
 #include "value-prof.h"
 #include "profile.h"
 #include "tree-cfgcleanup.h"
-#include "params.h"
 #include "stringpool.h"
 #include "attribs.h"
 #include "tree-pretty-print.h"
 #include "langhooks.h"
 #include "stor-layout.h"
+#include "xregex.h"
 static GTY(()) tree gcov_type_node;
 static GTY(()) tree tree_interval_profiler_fn;
 static GTY(()) tree tree_pow2_profiler_fn;
-static GTY(()) tree tree_one_value_profiler_fn;
+static GTY(()) tree tree_topn_values_profiler_fn;
 static GTY(()) tree tree_indirect_call_profiler_fn;
 static GTY(()) tree tree_average_profiler_fn;
 static GTY(()) tree tree_ior_profiler_fn;
 static GTY(()) tree tree_time_profiler_counter;
 static GTY(()) tree ic_tuple_callee_field;
 /* Do initialization work for the edge profiler.  */
 /* Add code:
-__thread gcov*	__gcov_indirect_call_counters; // pointer to actual counter
+__thread gcov*	__gcov_indirect_call.counters; // pointer to actual counter
-__thread void*	__gcov_indirect_call_callee; // actual callee address
+__thread void*	__gcov_indirect_call.callee; // actual callee address
 __thread int __gcov_function_counter; // time profiler function counter
 */
 static void
 init_ic_make_global_vars (void)
 {
 finish_builtin_struct (tuple_type, "indirect_call_tuple",
 			 ic_tuple_counters_field, NULL_TREE);
 ic_tuple_var
 = build_decl (UNKNOWN_LOCATION, VAR_DECL,
-		  get_identifier (
+		  get_identifier ("__gcov_indirect_call"), tuple_type);
-			  (PARAM_VALUE (PARAM_INDIR_CALL_TOPN_PROFILE) ?
-			   "__gcov_indirect_call_topn" :
-			   "__gcov_indirect_call")),
-		  tuple_type);
 TREE_PUBLIC (ic_tuple_var) = 1;
 DECL_ARTIFICIAL (ic_tuple_var) = 1;
 DECL_INITIAL (ic_tuple_var) = NULL;
 DECL_EXTERNAL (ic_tuple_var) = 1;
 if (targetm.have_tls)
-set_decl_tls_model (ic_tuple_var, decl_default_tls_model (tuple_type));
+set_decl_tls_model (ic_tuple_var, decl_default_tls_model (ic_tuple_var));
 }
 /* Create the type and function decls for the interface with gcov.  */
 void
 gimple_init_gcov_profiler (void)
 {
 tree interval_profiler_fn_type;
 tree pow2_profiler_fn_type;
-tree one_value_profiler_fn_type;
+tree topn_values_profiler_fn_type;
 tree gcov_type_ptr;
 tree ic_profiler_fn_type;
 tree average_profiler_fn_type;
-const char *profiler_fn_name;
 const char *fn_name;
 if (!gcov_type_node)
 {
 const char *fn_suffix
 DECL_ATTRIBUTES (tree_pow2_profiler_fn)
 	= tree_cons (get_identifier ("leaf"), NULL,
 		     DECL_ATTRIBUTES (tree_pow2_profiler_fn));
 /* void (*) (gcov_type *, gcov_type)  */
-one_value_profiler_fn_type
+topn_values_profiler_fn_type
 	      = build_function_type_list (void_type_node,
 					  gcov_type_ptr, gcov_type_node,
 					  NULL_TREE);
-fn_name = concat ("__gcov_one_value_profiler", fn_suffix, NULL);
+fn_name = concat ("__gcov_topn_values_profiler", fn_suffix, NULL);
-tree_one_value_profiler_fn = build_fn_decl (fn_name,
+tree_topn_values_profiler_fn
-						  one_value_profiler_fn_type);
+	= build_fn_decl (fn_name, topn_values_profiler_fn_type);
 free (CONST_CAST (char *, fn_name));
-TREE_NOTHROW (tree_one_value_profiler_fn) = 1;
-DECL_ATTRIBUTES (tree_one_value_profiler_fn)
+TREE_NOTHROW (tree_topn_values_profiler_fn) = 1;
+DECL_ATTRIBUTES (tree_topn_values_profiler_fn)
 	= tree_cons (get_identifier ("leaf"), NULL,
-		     DECL_ATTRIBUTES (tree_one_value_profiler_fn));
+		     DECL_ATTRIBUTES (tree_topn_values_profiler_fn));
 init_ic_make_global_vars ();
 /* void (*) (gcov_type, void *)  */
 ic_profiler_fn_type
 	       = build_function_type_list (void_type_node,
 					  gcov_type_node,
 					  ptr_type_node,
 					  NULL_TREE);
-profiler_fn_name = "__gcov_indirect_call_profiler_v2";
+fn_name = concat ("__gcov_indirect_call_profiler_v4", fn_suffix, NULL);
-if (PARAM_VALUE (PARAM_INDIR_CALL_TOPN_PROFILE))
-	profiler_fn_name = "__gcov_indirect_call_topn_profiler";
 tree_indirect_call_profiler_fn
-	      = build_fn_decl (profiler_fn_name, ic_profiler_fn_type);
+	= build_fn_decl (fn_name, ic_profiler_fn_type);
+free (CONST_CAST (char *, fn_name));
 TREE_NOTHROW (tree_indirect_call_profiler_fn) = 1;
 DECL_ATTRIBUTES (tree_indirect_call_profiler_fn)
 	= tree_cons (get_identifier ("leaf"), NULL,
 		     DECL_ATTRIBUTES (tree_indirect_call_profiler_fn));
 /* LTO streamer needs assembler names.  Because we create these decls
 late, we need to initialize them by hand.  */
 DECL_ASSEMBLER_NAME (tree_interval_profiler_fn);
 DECL_ASSEMBLER_NAME (tree_pow2_profiler_fn);
-DECL_ASSEMBLER_NAME (tree_one_value_profiler_fn);
+DECL_ASSEMBLER_NAME (tree_topn_values_profiler_fn);
 DECL_ASSEMBLER_NAME (tree_indirect_call_profiler_fn);
 DECL_ASSEMBLER_NAME (tree_average_profiler_fn);
 DECL_ASSEMBLER_NAME (tree_ior_profiler_fn);
 }
 }
 /* Output instructions as GIMPLE trees to increment the interval histogram
 counter.  VALUE is the expression whose value is profiled.  TAG is the
 tag of the section for counters, BASE is offset of the counter position.  */
 void
-gimple_gen_interval_profiler (histogram_value value, unsigned tag, unsigned base)
+gimple_gen_interval_profiler (histogram_value value, unsigned tag)
 {
 gimple *stmt = value->hvalue.stmt;
 gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
-tree ref = tree_coverage_counter_ref (tag, base), ref_ptr;
+tree ref = tree_coverage_counter_ref (tag, 0), ref_ptr;
 gcall *call;
 tree val;
 tree start = build_int_cst_type (integer_type_node,
 				   value->hdata.intvl.int_start);
 tree steps = build_int_cst_type (unsigned_type_node,
 gsi_insert_before (&gsi, call, GSI_NEW_STMT);
 }
 /* Output instructions as GIMPLE trees to increment the power of two histogram
 counter.  VALUE is the expression whose value is profiled.  TAG is the tag
-of the section for counters, BASE is offset of the counter position.  */
+of the section for counters.  */
 void
-gimple_gen_pow2_profiler (histogram_value value, unsigned tag, unsigned base)
+gimple_gen_pow2_profiler (histogram_value value, unsigned tag)
 {
 gimple *stmt = value->hvalue.stmt;
 gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
-tree ref_ptr = tree_coverage_counter_addr (tag, base);
+tree ref_ptr = tree_coverage_counter_addr (tag, 0);
 gcall *call;
 tree val;
 ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
 				      true, NULL_TREE, true, GSI_SAME_STMT);
 val = prepare_instrumented_value (&gsi, value);
 call = gimple_build_call (tree_pow2_profiler_fn, 2, ref_ptr, val);
 gsi_insert_before (&gsi, call, GSI_NEW_STMT);
 }
-/* Output instructions as GIMPLE trees for code to find the most common value.
+/* Output instructions as GIMPLE trees for code to find the most N common
-VALUE is the expression whose value is profiled.  TAG is the tag of the
+values.  VALUE is the expression whose value is profiled.  TAG is the tag
-section for counters, BASE is offset of the counter position.  */
+of the section for counters.  */
 void
-gimple_gen_one_value_profiler (histogram_value value, unsigned tag, unsigned base)
+gimple_gen_topn_values_profiler (histogram_value value, unsigned tag)
 {
 gimple *stmt = value->hvalue.stmt;
 gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
-tree ref_ptr = tree_coverage_counter_addr (tag, base);
+tree ref_ptr = tree_coverage_counter_addr (tag, 0);
 gcall *call;
 tree val;
 ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
 				      true, NULL_TREE, true, GSI_SAME_STMT);
 val = prepare_instrumented_value (&gsi, value);
-call = gimple_build_call (tree_one_value_profiler_fn, 2, ref_ptr, val);
+call = gimple_build_call (tree_topn_values_profiler_fn, 2, ref_ptr, val);
 gsi_insert_before (&gsi, call, GSI_NEW_STMT);
 }
 /* Output instructions as GIMPLE trees for code to find the most
 common called function in indirect call.
 VALUE is the call expression whose indirect callee is profiled.
-TAG is the tag of the section for counters, BASE is offset of the
+TAG is the tag of the section for counters.  */
-counter position.  */
 void
-gimple_gen_ic_profiler (histogram_value value, unsigned tag, unsigned base)
+gimple_gen_ic_profiler (histogram_value value, unsigned tag)
 {
 tree tmp1;
 gassign *stmt1, *stmt2, *stmt3;
 gimple *stmt = value->hvalue.stmt;
 gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
-tree ref_ptr = tree_coverage_counter_addr (tag, base);
+tree ref_ptr = tree_coverage_counter_addr (tag, 0);
-if ( (PARAM_VALUE (PARAM_INDIR_CALL_TOPN_PROFILE) &&
-tag == GCOV_COUNTER_V_INDIR) ||
-(!PARAM_VALUE (PARAM_INDIR_CALL_TOPN_PROFILE) &&
-tag == GCOV_COUNTER_ICALL_TOPNV))
-return;
 ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
 				      true, NULL_TREE, true, GSI_SAME_STMT);
 /* Insert code:
 Example:
 f_1 = foo;
 __gcov_indirect_call.counters = &__gcov4.main[0];
 PROF_9 = f_1;
-__gcov_indirect_call_callee = PROF_9;
+__gcov_indirect_call.callee = PROF_9;
 _4 = f_1 ();
 */
 tree gcov_type_ptr = build_pointer_type (get_gcov_type ());
 		      EDGE_FALSE_VALUE);
 e->probability = true_edge->probability.invert ();
 /* Insert code:
-if (__gcov_indirect_call_callee != NULL)
+if (__gcov_indirect_call.callee != NULL)
-__gcov_indirect_call_profiler_v2 (profile_id, &current_function_decl);
+__gcov_indirect_call_profiler_v3 (profile_id, &current_function_decl);
-The function __gcov_indirect_call_profiler_v2 is responsible for
+The function __gcov_indirect_call_profiler_v3 is responsible for
-resetting __gcov_indirect_call_callee to NULL.  */
+resetting __gcov_indirect_call.callee to NULL.  */
 gimple_stmt_iterator gsi = gsi_start_bb (cond_bb);
 void0 = build_int_cst (ptr_type_node, 0);
 tree callee_ref = build3 (COMPONENT_REF, ptr_type_node,
 /* Output instructions as GIMPLE tree at the beginning for each function.
 TAG is the tag of the section for counters, BASE is offset of the
 counter position and GSI is the iterator we place the counter.  */
 void
-gimple_gen_time_profiler (unsigned tag, unsigned base)
+gimple_gen_time_profiler (unsigned tag)
 {
 tree type = get_gcov_type ();
 basic_block entry = ENTRY_BLOCK_PTR_FOR_FN (cfun);
 basic_block cond_bb = split_edge (single_succ_edge (entry));
 basic_block update_bb = split_edge (single_succ_edge (cond_bb));
 edge e
 = make_edge (cond_bb, single_succ_edge (update_bb)->dest, EDGE_FALSE_VALUE);
 e->probability = true_edge->probability.invert ();
 gimple_stmt_iterator gsi = gsi_start_bb (cond_bb);
-tree original_ref = tree_coverage_counter_ref (tag, base);
+tree original_ref = tree_coverage_counter_ref (tag, 0);
 tree ref = force_gimple_operand_gsi (&gsi, original_ref, true, NULL_TREE,
 				       true, GSI_SAME_STMT);
 tree one = build_int_cst (type, 1);
 /* Emit: if (counters[0] != 0).  */
 /* Output instructions as GIMPLE trees to increment the average histogram
 counter.  VALUE is the expression whose value is profiled.  TAG is the
 tag of the section for counters, BASE is offset of the counter position.  */
 void
-gimple_gen_average_profiler (histogram_value value, unsigned tag, unsigned base)
+gimple_gen_average_profiler (histogram_value value, unsigned tag)
 {
 gimple *stmt = value->hvalue.stmt;
 gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
-tree ref_ptr = tree_coverage_counter_addr (tag, base);
+tree ref_ptr = tree_coverage_counter_addr (tag, 0);
 gcall *call;
 tree val;
 ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
 				      true, NULL_TREE,
 /* Output instructions as GIMPLE trees to increment the ior histogram
 counter.  VALUE is the expression whose value is profiled.  TAG is the
 tag of the section for counters, BASE is offset of the counter position.  */
 void
-gimple_gen_ior_profiler (histogram_value value, unsigned tag, unsigned base)
+gimple_gen_ior_profiler (histogram_value value, unsigned tag)
 {
 gimple *stmt = value->hvalue.stmt;
 gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
-tree ref_ptr = tree_coverage_counter_addr (tag, base);
+tree ref_ptr = tree_coverage_counter_addr (tag, 0);
 gcall *call;
 tree val;
 ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
 				      true, NULL_TREE, true, GSI_SAME_STMT);
 val = prepare_instrumented_value (&gsi, value);
 call = gimple_build_call (tree_ior_profiler_fn, 2, ref_ptr, val);
 gsi_insert_before (&gsi, call, GSI_NEW_STMT);
+}
+static vec<regex_t> profile_filter_files;
+static vec<regex_t> profile_exclude_files;
+/* Parse list of provided REGEX (separated with semi-collon) and
+create expressions (of type regex_t) and save them into V vector.
+If there is a regular expression parsing error, error message is
+printed for FLAG_NAME.  */
+static void
+parse_profile_filter (const char *regex, vec<regex_t> *v,
+		      const char *flag_name)
+{
+v->create (4);
+if (regex != NULL)
+{
+char *str = xstrdup (regex);
+for (char *p = strtok (str, ";"); p != NULL; p = strtok (NULL, ";"))
+	{
+	  regex_t r;
+	  if (regcomp (&r, p, REG_EXTENDED | REG_NOSUB) != 0)
+	    {
+	      error ("invalid regular expression %qs in %qs",
+		     p, flag_name);
+	      return;
+	    }
+	  v->safe_push (r);
+	}
+}
+}
+/* Parse values of -fprofile-filter-files and -fprofile-exclude-files
+options.  */
+static void
+parse_profile_file_filtering ()
+{
+parse_profile_filter (flag_profile_filter_files, &profile_filter_files,
+			"-fprofile-filter-files");
+parse_profile_filter (flag_profile_exclude_files, &profile_exclude_files,
+			"-fprofile-exclude-files");
+}
+/* Parse vectors of regular expressions.  */
+static void
+release_profile_file_filtering ()
+{
+profile_filter_files.release ();
+profile_exclude_files.release ();
+}
+/* Return true when FILENAME should be instrumented based on
+-fprofile-filter-files and -fprofile-exclude-files options.  */
+static bool
+include_source_file_for_profile (const char *filename)
+{
+/* First check whether file is included in flag_profile_exclude_files.  */
+for (unsigned i = 0; i < profile_exclude_files.length (); i++)
+if (regexec (&profile_exclude_files[i],
+		 filename, 0, NULL, 0) == REG_NOERROR)
+return false;
+/* For non-empty flag_profile_filter_files include only files matching a
+regex in the flag.  */
+if (profile_filter_files.is_empty ())
+return true;
+for (unsigned i = 0; i < profile_filter_files.length (); i++)
+if (regexec (&profile_filter_files[i], filename, 0, NULL, 0) == REG_NOERROR)
+return true;
+return false;
 }
 #ifndef HAVE_sync_compare_and_swapsi
 #define HAVE_sync_compare_and_swapsi 0
 #endif
 /* This is a small-ipa pass that gets called only once, from
 cgraphunit.c:ipa_passes().  */
 gcc_assert (symtab->state == IPA_SSA);
 init_node_map (true);
+parse_profile_file_filtering ();
 FOR_EACH_DEFINED_FUNCTION (node)
 {
-if (!gimple_has_body_p (node->decl))
+bool thunk = false;
+if (!gimple_has_body_p (node->decl) && !node->thunk.thunk_p)
 	continue;
 /* Don't profile functions produced for builtin stuff.  */
 if (DECL_SOURCE_LOCATION (node->decl) == BUILTINS_LOCATION)
 	continue;
 	 will get acocunted), testsuite expects that.  */
 if (DECL_EXTERNAL (node->decl)
 	  && flag_test_coverage)
 	continue;
+const char *file = LOCATION_FILE (DECL_SOURCE_LOCATION (node->decl));
+if (!include_source_file_for_profile (file))
+	continue;
+if (node->thunk.thunk_p)
+	{
+	  /* We cannot expand variadic thunks to Gimple.  */
+	  if (stdarg_p (TREE_TYPE (node->decl)))
+	    continue;
+	  thunk = true;
+	  /* When generate profile, expand thunk to gimple so it can be
+	     instrumented same way as other functions.  */
+	  if (profile_arc_flag)
+	    node->expand_thunk (false, true);
+	  /* Read cgraph profile but keep function as thunk at profile-use
+	     time.  */
+	  else
+	    {
+	      read_thunk_profile (node);
+	      continue;
+	    }
+	}
 push_cfun (DECL_STRUCT_FUNCTION (node->decl));
 if (dump_file)
 	dump_function_header (dump_file, cfun->decl, dump_flags);
 /* Local pure-const may imply need to fixup the cfg.  */
-if (execute_fixup_cfg () & TODO_cleanup_cfg)
+if (gimple_has_body_p (node->decl)
+	  && (execute_fixup_cfg () & TODO_cleanup_cfg))
 	cleanup_tree_cfg ();
-branch_prob ();
+branch_prob (thunk);
 if (! flag_branch_probabilities
 	  && flag_profile_values)
 	gimple_gen_ic_func_profiler ();
 if (flag_branch_probabilities
+	  && !thunk
 	  && flag_profile_values
-	  && flag_value_profile_transformations)
+	  && flag_value_profile_transformations
+	  && profile_status_for_fn (cfun) == PROFILE_READ)
 	gimple_value_profile_transformations ();
 /* The above could hose dominator info.  Currently there is
 	 none coming in, this is a safety valve.  It should be
 	 easy to adjust it, if and when there is some.  */
 free_dominance_info (CDI_DOMINATORS);
 free_dominance_info (CDI_POST_DOMINATORS);
 pop_cfun ();
 }
+release_profile_file_filtering ();
 /* Drop pure/const flags from instrumented functions.  */
 if (profile_arc_flag || flag_test_coverage)
 FOR_EACH_DEFINED_FUNCTION (node)
 {
 bool
 pass_ipa_tree_profile::gate (function *)
 {
 /* When profile instrumentation, use or test coverage shall be performed.
 But for AutoFDO, this there is no instrumentation, thus this pass is
-diabled.  */
+disabled.  */
 return (!in_lto_p && !flag_auto_profile
 	  && (flag_branch_probabilities || flag_test_coverage
 	      || profile_arc_flag));
 }

Mercurial > hg > CbC > CbC_gcc

comparison gcc/tree-profile.c @ 145:1830386684a0