cc: Increased robustness of rasterize and record benchmark.

- 'protected' relevent trace events from changes, by putting argument strings
  as constants into separate file.
- fixed a bug in the collection of raster times, that would output wrong 
  statistics for layers with multiple pictures in a pile.
- Added command line parameters to set number of raster and record repeats,
  wait time before starting the benchmark, and wait time before taking the
  measurements. 
- Reduced the default number of raster and record repeats from 100 to 20. 
  This increases variance, but improves overall robustness (e.g. avoiding
  event buffer overflows)
- Added command line option to print statistics after every page run.

R=nduca@chromium.org,tengs@chromium.org
BUG=226489

Review URL: https://chromiumcodereview.appspot.com/18048006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211728 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/cc/resources/picture_pile.cc b/cc/resources/picture_pile.cc
index b6c41ba..17283dd 100644
--- a/cc/resources/picture_pile.cc
+++ b/cc/resources/picture_pile.cc
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "cc/base/region.h"
+#include "cc/debug/benchmark_instrumentation.h"
 #include "cc/resources/picture_pile_impl.h"
 
 namespace {
@@ -37,8 +38,7 @@ bool PicturePile::Update(
     bool contents_opaque,
     const Region& invalidation,
     gfx::Rect visible_layer_rect,
-    RenderingStatsInstrumentation* stats_instrumentation,
-    int commit_number) {
+    RenderingStatsInstrumentation* stats_instrumentation) {
   background_color_ = background_color;
   contents_opaque_ = contents_opaque;
 
@@ -112,10 +112,8 @@ bool PicturePile::Update(
          pic != pic_list.end(); ++pic) {
       if (!(*pic)->HasRecording()) {
         modified_pile = true;
-        // If you change the name of this event or its arguments, please update
-        // tools/perf/perf_tools/rasterize_and_record_benchmark.py as well.
-        TRACE_EVENT1("cc", "PicturePile::Update recording loop",
-                     "commit_number", commit_number);
+        TRACE_EVENT0(benchmark_instrumentation::kCategory,
+                     benchmark_instrumentation::kRecordLoop);
         for (int i = 0; i < repeat_count; i++)
           (*pic)->Record(painter, tile_grid_info_, stats_instrumentation);
         (*pic)->GatherPixelRefs(tile_grid_info_, stats_instrumentation);