Teach `mojo_benchmark` to upload results to perf dashboard.

mojo/devtools/common/mojo_benchmark

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runner for Mojo application benchmarks."""
 
 import argparse
 import json
 import logging
@@ skipping 154 matching lines @@
 
 
 def main():
   parser = argparse.ArgumentParser(
       formatter_class=argparse.RawDescriptionHelpFormatter,
       description=_DESCRIPTION)
   parser.add_argument('benchmark_list_file', type=file,
                       help='a file listing benchmarks to run')
   parser.add_argument('--save-traces', action='store_true',
                       help='save the traces produced by benchmarks to disk')
-  parser.add_argument('--chart-data-output-file', type=argparse.FileType('w'),
-                      help='file to write chart data for the performance '
-                      'dashboard to')
+  perf_dashboard.add_argparse_server_arguments(parser)
 
   # Common shell configuration arguments.
   shell_config.add_shell_arguments(parser)
   script_args = parser.parse_args()
   config = shell_config.get_shell_config(script_args)
 
   try:
     shell, common_shell_args = shell_arguments.get_shell(config, [])
   except shell_arguments.ShellConfigurationException as e:
     print e
     return 1
 
   target_os = 'android' if script_args.android else 'linux'
   benchmark_list_params = {"target_os": target_os}
   exec script_args.benchmark_list_file in benchmark_list_params
 
   exit_code = 0
   for benchmark_spec in benchmark_list_params['benchmarks']:
     benchmark_name = benchmark_spec['name']
-    chart_data_recorder = None
-    if script_args.chart_data_output_file:
-      chart_data_recorder = perf_dashboard.ChartDataRecorder(benchmark_name)
 
     for variant_spec in _generate_benchmark_variants(benchmark_spec):
       variant_name = variant_spec['variant_name']
       app = variant_spec['app']
       duration = variant_spec['duration']
       shell_args = variant_spec.get('shell-args', []) + common_shell_args
       measurements = variant_spec['measurements']
 
       output_file = None
       if script_args.save_traces:
         output_file = 'benchmark-%s-%s-%s.trace' % (
             benchmark_name.replace(' ', '_'),
             variant_name.replace(' ', '_'),
             time.strftime('%Y%m%d%H%M%S'))
+
+      chart_data_recorder = None
+      if script_args.upload:
+        chart_data_recorder = perf_dashboard.ChartDataRecorder(
+            script_args.test_name)
+
       benchmark_succeeded, benchmark_error, output = _run_benchmark(
           shell, shell_args, variant_name, app, duration, measurements,
           script_args.verbose, script_args.android, output_file)
 
       print '[ %s ] %s ' % (benchmark_name, variant_name)
 
       some_measurements_failed = False
       if benchmark_succeeded:
         measurement_results = _parse_measurement_results(output)
         # Iterate over the list of specs, not the dictionary, to detect missing
         # results and preserve the required order.
         for measurement_spec in measurements:
           if measurement_spec in measurement_results:
             result = measurement_results[measurement_spec]
             print '%s %s' % (measurement_spec, result)
 
             if chart_data_recorder:
-              measurement_name = measurement_spec.replace('/', '-')
-              chart_data_recorder.record_scalar(variant_name, measurement_name,
-                                                'ms', result)
+              chart_name = benchmark_name + '__' + variant_name
+              chart_data_recorder.record_scalar(
+                  perf_dashboard.normalize_label(chart_name),
+                  perf_dashboard.normalize_label(measurement_spec),
+                  'ms', result)
           else:
             print '%s ?' % measurement_spec
             some_measurements_failed = True
 
       if not benchmark_succeeded or some_measurements_failed:
         if not benchmark_succeeded:
           print 'benchmark failed: ' + benchmark_error
         if some_measurements_failed:
           print 'some measurements failed'
         print 'output: '
         print '-' * 72
         print output
         print '-' * 72
         exit_code = 1
 
-      if script_args.chart_data_output_file:
-        script_args.chart_data_output_file.write(
-            json.dumps(chart_data_recorder.get_chart_data()))
-        script_args.chart_data_output_file.write('\n')
+      if script_args.upload:
+        perf_dashboard.upload_chart_data(
+            script_args.master_name, script_args.bot_name,
+            script_args.test_name, script_args.builder_name,
+            script_args.build_number, chart_data_recorder.get_chart_data(),
+            script_args.server_url, script_args.dry_run)
 
   return exit_code
 
 if __name__ == '__main__':
   sys.exit(main())