mojo_benchmark: don't duplicate benchmark name in variant name.

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 65 matching lines @@
 
 def _generate_benchmark_variants(benchmark_spec):
   """Generates benchmark specifications for individual variants of the given
   benchmark: cold start and warm start.
 
   Returns:
     A list of benchmark specs corresponding to individual variants of the given
         benchmark.
   """
   variants = []
-  # Cold start.
   variants.append({
-    'name': benchmark_spec['name'] + ' (cold start)',
+    'variant_name': 'cold start',
     'app': benchmark_spec['app'],
     'duration': benchmark_spec['duration'],
     'measurements': benchmark_spec['measurements'],
     'shell-args': benchmark_spec.get('shell-args',
                                      []) + _COLD_START_SHELL_ARGS})
-  # Warm start.
   variants.append({
-    'name': benchmark_spec['name'] + ' (warm start)',
+    'variant_name': 'warm start',
     'app': benchmark_spec['app'],
     'duration': benchmark_spec['duration'],
     'measurements': benchmark_spec['measurements'],
     'shell-args': benchmark_spec.get('shell-args', [])})
   return variants
 
 
 def _run_benchmark(shell, shell_args, name, app, duration_seconds, measurements,
-                   verbose, android, save_traces):
+                   verbose, android, output_file):
   """Runs the given benchmark by running `benchmark.mojo` in mojo shell with
   appropriate arguments and returns the produced output.
 
   Returns:
     A tuple of (succeeded, error_msg, output).
   """
   timeout = duration_seconds + _EXTRA_TIMEOUT
   benchmark_args = []
   benchmark_args.append('--app=' + app)
   benchmark_args.append('--duration=' + str(duration_seconds))
 
-  output_file = None
   device_output_file = None
-  if save_traces:
-    output_file = 'benchmark-%s-%s.trace' % (name.replace(' ', '_'),
-        time.strftime('%Y%m%d%H%M%S'))
+  if output_file:
     if android:
       device_output_file = os.path.join(shell.get_tmp_dir_path(), output_file)
       benchmark_args.append('--trace-output=' + device_output_file)
     else:
       benchmark_args.append('--trace-output=' + output_file)
 
   for measurement in measurements:
     benchmark_args.append(measurement)
 
   shell_args = list(shell_args)
@@ skipping 59 matching lines @@
   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):
-      name = variant_spec['name']
+      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']
 
-      chart_data_recorder = None
-      if script_args.chart_data_output_file:
-        chart_data_recorder = perf_dashboard.ChartDataRecorder(name)
+      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'))
       benchmark_succeeded, benchmark_error, output = _run_benchmark(
-          shell, shell_args, name, app, duration, measurements,
-          script_args.verbose, script_args.android,
-          script_args.save_traces)
+          shell, shell_args, variant_name, app, duration, measurements,
+          script_args.verbose, script_args.android, output_file)
 
-      print '[ %s ]' % name
+      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(name, measurement_name, 'ms',
-                                                result)
+              chart_data_recorder.record_scalar(variant_name, measurement_name,
+                                                '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')
 
   return exit_code
 
 if __name__ == '__main__':
   sys.exit(main())