Split GenerateBenchGraphs into three build steps

slave/skia_slave_scripts/upload_bench_results_appengine.py

Index: slave/skia_slave_scripts/upload_bench_results_appengine.py
===================================================================
--- slave/skia_slave_scripts/upload_bench_results_appengine.py	(revision 8061)
+++ slave/skia_slave_scripts/upload_bench_results_appengine.py	(working copy)
@@ -3,62 +3,34 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-""" Generate performance graphs from bench output. """
+""" Upload benchmark results to AppEngine.. """
 
 from build_step import BuildStep
-from utils import bench_common
 from utils import shell_utils
-from utils import sync_bucket_subdir
 
-import errno
 import os
-import posixpath
+import skia_vars
 import sys
 
 
-class GenerateBenchGraphs(BuildStep):
+class UploadBenchResultsToAppengine(BuildStep):
   def __init__(self, timeout=600, no_output_timeout=600, **kwargs):
-    super(GenerateBenchGraphs, self).__init__(
+    super(UploadBenchResultsToAppengine, self).__init__(
         timeout=timeout,
         no_output_timeout=no_output_timeout,
         **kwargs)
 
   def _RunInternal(self, representation):
-    try:
-      os.makedirs(self._perf_graphs_dir)
-    except OSError as e:
-      if e.errno == errno.EEXIST:
-        pass
-      else:
-        raise e
-    dest_gsbase = (self._args.get('dest_gsbase') or
-                   sync_bucket_subdir.DEFAULT_PERFDATA_GS_BASE)
-
     path_to_bench_graph_svg = os.path.join('bench', 'bench_graph_svg.py')
-    path_to_bench_expectations = os.path.join('bench',
-                                              'bench_expectations.txt')
     graph_title = 'Bench_Performance_for_%s' % self._builder_name
-    graph_filepath = bench_common.GraphFilePath(self._perf_graphs_dir,
-                                                self._builder_name,
-                                                representation)
-    sync_bucket_subdir.SyncBucketSubdir(directory=self._perf_data_dir,
-        dest_gsbase=dest_gsbase,
-        subdir=posixpath.join('perfdata', self._builder_name),
-        do_upload=False,
-        do_download=True,
-        min_download_revision=self._got_revision -
-            bench_common.BENCH_GRAPH_NUM_REVISIONS)
 
     cmd = ['python', path_to_bench_graph_svg,

[epoger, 2013/03/12 15:58:33]

Maybe add comment like this:

Run bench_graph_svg in such a mode that it just uploads the latest benchmark
data to AppEngine.

            '-d', self._perf_data_dir,
-           '-e', path_to_bench_expectations,
-           '-r', '-%d' % bench_common.BENCH_GRAPH_NUM_REVISIONS,
-           '-f', '-%d' % bench_common.BENCH_GRAPH_NUM_REVISIONS,
-           '-x', '%d' % bench_common.BENCH_GRAPH_X,
-           '-y', '%d' % bench_common.BENCH_GRAPH_Y,
+           '-r', '-1',
+           '-f', '-1',
            '-l', graph_title,
            '-m', representation,
-           '-o', graph_filepath,
+           '-a', skia_vars.GetGlobalVariable('skia_dashboard_add_point_url'),
            ]
     if self._builder_name.find('_Win') >= 0:
       cmd.extend(['-i', 'c'])  # Ignore cpu time for Windows.
@@ -72,4 +44,4 @@
 
 
 if '__main__' == __name__:
-  sys.exit(BuildStep.RunBuildStep(GenerateBenchGraphs))
+  sys.exit(BuildStep.RunBuildStep(UploadBenchResultsToAppengine))