Turn tp_first_run counts back to 32bit values.

	* cgraph.c (cgraph_node::verify_node): Verify tp_first_run.
	* cgraph.h (cgrpah_node): Turn tp_first_run back to int.
	* cgraphunit.c (tp_first_run_node_cmp): Do not watch for overflows.
	(expand_all_functions): First expand ordered section and then
	unordered.
	* lto-partition.c (lto_balanced_map): Fix printing of tp_first_run.
	* profile.c (compute_value_histograms): Error on out of range
	tp_first_runs.

From-SVN: r279178

diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 5c7a03d61be077395db8dbad04fa60361b9029a2..ba5f2767e4b0573a2ef73068ecdaaf44f383b4e0 100644 (file)
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -3066,6 +3066,11 @@ cgraph_node::verify_node (void)
       inlined_to->count.debug ();
       error_found = true;
     }
+  if (tp_first_run < 0)
+    {
+      error ("tp_first_run must be non-negative");
+      error_found = true;
+    }
   if (!definition && !in_other_partition && local)
     {
       error ("local symbols must be defined");

diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index cdeea4d9953114717d3ab56760e29f47183543cf..e96cb51d80338e8aca507a220c8697861666f0da 100644 (file)
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -926,9 +926,9 @@ struct GTY((tag ("SYMTAB_FUNCTION"))) cgraph_node : public symtab_node
       clone_of (NULL), call_site_hash (NULL), former_clone_of (NULL),
       simdclone (NULL), simd_clones (NULL), ipa_transforms_to_apply (vNULL),
       inlined_to (NULL), rtl (NULL), clone (), thunk (),
-      count (profile_count::uninitialized ()), tp_first_run (false),
+      count (profile_count::uninitialized ()),
       count_materialization_scale (REG_BR_PROB_BASE), profile_id (0),
-      unit_id (0), used_as_abstract_origin (false),
+      unit_id (0), tp_first_run (0), used_as_abstract_origin (false),
       lowered (false), process (false), frequency (NODE_FREQUENCY_NORMAL),
       only_called_at_startup (false), only_called_at_exit (false),
       tm_clone (false), dispatcher_function (false), calls_comdat_local (false),
@@ -1469,8 +1469,6 @@ struct GTY((tag ("SYMTAB_FUNCTION"))) cgraph_node : public symtab_node
 
   /* Expected number of executions: calculated in profile.c.  */
   profile_count count;
-  /* Time profiler: first run of function.  */
-  gcov_type tp_first_run;
   /* How to scale counts at materialization time; used to merge
      LTO units with different number of profile runs.  */
   int count_materialization_scale;
@@ -1478,6 +1476,8 @@ struct GTY((tag ("SYMTAB_FUNCTION"))) cgraph_node : public symtab_node
   unsigned int profile_id;
   /* ID of the translation unit.  */
   int unit_id;
+  /* Time profiler: first run of function.  */
+  int tp_first_run;
 
   /* Set when decl is an abstract function pointed to by the
      ABSTRACT_DECL_ORIGIN of a reachable function.  */

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index e630a4f5b497008f0b96b7b22d9c32b28cff8f3a..6b8a466eecb0e75a375e8b77177f8273ebf773da 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -2364,8 +2364,8 @@ tp_first_run_node_cmp (const void *pa, const void *pb)
 {
   const cgraph_node *a = *(const cgraph_node * const *) pa;
   const cgraph_node *b = *(const cgraph_node * const *) pb;
-  gcov_type tp_first_run_a = a->tp_first_run;
-  gcov_type tp_first_run_b = b->tp_first_run;
+  unsigned int tp_first_run_a = a->tp_first_run;
+  unsigned int tp_first_run_b = b->tp_first_run;
 
   if (!opt_for_fn (a->decl, flag_profile_reorder_functions)
       || a->no_reorder)
@@ -2378,14 +2378,10 @@ tp_first_run_node_cmp (const void *pa, const void *pb)
     return a->order - b->order;
 
   /* Functions with time profile must be before these without profile.  */
-  if (!tp_first_run_a || !tp_first_run_b)
-    return tp_first_run_b ? 1 : -1;
+  tp_first_run_a = (tp_first_run_a - 1) & INT_MAX;
+  tp_first_run_b = (tp_first_run_b - 1) & INT_MAX;
 
-  /* Watch for overlflow - tp_first_run is 64bit.  */
-  if (tp_first_run_a > tp_first_run_b)
-    return 1;
-  else
-    return -1;
+  return tp_first_run_a - tp_first_run_b;
 }
 
 /* Expand all functions that must be output.
@@ -2425,43 +2421,45 @@ expand_all_functions (void)
           order[new_order_pos++] = order[i];
       }
 
-  /* Output functions in RPO so callers get optimized before callees.  This
-     makes ipa-ra and other propagators to work.
-     FIXME: This is far from optimal code layout.  */
-  for (i = new_order_pos - 1; i >= 0; i--)
+  /* First output functions with time profile in specified order.  */
+  qsort (tp_first_run_order, tp_first_run_order_pos,
+        sizeof (cgraph_node *), tp_first_run_node_cmp);
+  for (i = 0; i < tp_first_run_order_pos; i++)
     {
-      node = order[i];
+      node = tp_first_run_order[i];
 
       if (node->process)
        {
          expanded_func_count++;
+         profiled_func_count++;
+
+         if (symtab->dump_file)
+           fprintf (symtab->dump_file,
+                    "Time profile order in expand_all_functions:%s:%d\n",
+                    node->asm_name (), node->tp_first_run);
          node->process = 0;
          node->expand ();
        }
     }
-  qsort (tp_first_run_order, tp_first_run_order_pos,
-        sizeof (cgraph_node *), tp_first_run_node_cmp);
-  for (i = 0; i < tp_first_run_order_pos; i++)
+
+  /* Output functions in RPO so callees get optimized before callers.  This
+     makes ipa-ra and other propagators to work.
+     FIXME: This is far from optimal code layout.  */
+  for (i = new_order_pos - 1; i >= 0; i--)
     {
-      node = tp_first_run_order[i];
+      node = order[i];
 
       if (node->process)
        {
          expanded_func_count++;
-         profiled_func_count++;
-
-         if (symtab->dump_file)
-           fprintf (symtab->dump_file,
-                    "Time profile order in expand_all_functions:%s:%" PRId64
-                    "\n", node->asm_name (), (int64_t) node->tp_first_run);
          node->process = 0;
          node->expand ();
        }
     }
 
-    if (dump_file)
-      fprintf (dump_file, "Expanded functions with time profile (%s):%u/%u\n",
-               main_input_filename, profiled_func_count, expanded_func_count);
+  if (dump_file)
+    fprintf (dump_file, "Expanded functions with time profile (%s):%u/%u\n",
+            main_input_filename, profiled_func_count, expanded_func_count);
 
   if (symtab->dump_file && tp_first_run_order_pos)
     fprintf (symtab->dump_file, "Expanded functions with time profile:%u/%u\n",

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index d80b2bd61bf6fe8297eda040539458d6fa7946eb..9f974afb123dd13c08f1875608b19dc0bc161e67 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,11 +1,16 @@
 2019-12-07  Jan Hubicka  <hubicka@ucw.cz>
 
+       * lto-partition.c (lto_balanced_map): Fix printing of tp_first_run.
+
+2019-12-10  Jan Hubicka  <hubicka@ucw.cz>
+
        * lto-partition.c (node_cmp): Turn into simple order comparsions.
        (varpool_node_cmp): Remove.
        (add_sorted_nodes): Use node_cmp.
        (lto_balanced_map): Use tp_first_run_node_cmp.
 
-/bin/bash: :q: command not found
+2019-11-25  Joseph Myers  <joseph@codesourcery.com>
+
        PR c/91985
        * lto-lang.c (lto_type_for_mode): Handle decimal floating-point
        types being NULL_TREE.

diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index 4da76509616b209c904bd9ad60ab9a2d5a27311f..3c67b8a94359f148dea191ee708a5662db01fe2d 100644 (file)
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -514,11 +514,11 @@ lto_balanced_map (int n_lto_partitions, int max_partition_size)
   if (dump_file)
     {
       for (unsigned i = 0; i < order.length (); i++)
-       fprintf (dump_file, "Balanced map symbol order:%s:%" PRId64 "\n",
-                order[i]->name (), (int64_t) order[i]->tp_first_run);
+       fprintf (dump_file, "Balanced map symbol order:%s:%u\n",
+                order[i]->name (), order[i]->tp_first_run);
       for (unsigned i = 0; i < noreorder.length (); i++)
-       fprintf (dump_file, "Balanced map symbol no_reorder:%s:%" PRId64 "\n",
-                noreorder[i]->name (), (int64_t) noreorder[i]->tp_first_run);
+       fprintf (dump_file, "Balanced map symbol no_reorder:%s:%u\n",
+                noreorder[i]->name (), noreorder[i]->tp_first_run);
     }
 
   /* Collect all variables that should not be reordered.  */

diff --git a/gcc/profile.c b/gcc/profile.c
index 7d4121712228d3a87c7325cd03b2280428651793..e300ba6d58932a6a1b2ca851003608f71460ac5c 100644 (file)
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -871,11 +871,18 @@ compute_value_histograms (histogram_values values, unsigned cfg_checksum,
       if (hist->type == HIST_TYPE_TIME_PROFILE)
         {
          node = cgraph_node::get (hist->fun->decl);
-         node->tp_first_run = hist->hvalue.counters[0];
+         if (hist->hvalue.counters[0] >= 0
+             && hist->hvalue.counters[0] < INT_MAX / 2)
+           node->tp_first_run = hist->hvalue.counters[0];
+         else
+           {
+             if (flag_profile_correction)
+               error ("corrupted profile info: invalid time profile");
+             node->tp_first_run = 0;
+           }
 
           if (dump_file)
-            fprintf (dump_file, "Read tp_first_run: %" PRId64 "\n",
-                    (int64_t) node->tp_first_run);
+            fprintf (dump_file, "Read tp_first_run: %d\n", node->tp_first_run);
         }
     }