Add missing perf results merger scripts.

tools/perf/core/upload_results_to_perf_dashboard.py

+#!/usr/bin/env vpython
+# Copyright 2016 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.
+
+# This file was copy-pasted over from:
+# //build/scripts/slave/upload_perf_dashboard_results.py
+# with sections copied from:
+# //build/scripts/slave/slave_utils.py
+
+import json
+import optparse
+import os
+import re
+import shutil
+import sys
+import tempfile
+import time
+import logging
+import six.moves.urllib.parse  # pylint: disable=import-error
+
+from core import results_dashboard
+
+logging.basicConfig(
+    level=logging.INFO,
+    format='(%(levelname)s) %(asctime)s pid=%(process)d'
+    '  %(module)s.%(funcName)s:%(lineno)d  %(message)s')
+
+RESULTS_LINK_PATH = '/report?masters=%s&bots=%s&tests=%s&rev=%s'
+
+
+def _CommitPositionNumber(commit_pos):
+    """Extracts the number part of a commit position.
+
+  This is used to extract the number from got_revision_cp; This will be used
+  as the value of "rev" in the data passed to results_dashboard.SendResults.
+  """
+    return int(re.search(r'{#(\d+)}', commit_pos).group(1))
+
+
+def _GetDashboardJson(options):
+    main_revision = _CommitPositionNumber(options.got_revision_cp)
+    revisions = _GetPerfDashboardRevisionsWithProperties(options.got_webrtc_revision,
+                                                         options.got_v8_revision,
+                                                         options.git_revision, main_revision)
+    reference_build = 'reference' in options.name
+    stripped_test_name = options.name.replace('.reference', '')
+    results = {}
+    logging.info('Opening results file %s' % options.results_file)
+    with open(options.results_file) as f:
+        results = json.load(f)
+    dashboard_json = {}
+    if 'charts' not in results:
+        # These are legacy results.
+        # pylint: disable=redefined-variable-type
+        dashboard_json = results_dashboard.MakeListOfPoints(
+            results,
+            options.configuration_name,
+            stripped_test_name,
+            options.project,
+            options.buildbucket,
+            options.buildername,
+            options.buildnumber, {},
+            options.perf_dashboard_machine_group,
+            revisions_dict=revisions)
+    else:
+        dashboard_json = results_dashboard.MakeDashboardJsonV1(
+            results,
+            revisions,
+            stripped_test_name,
+            options.configuration_name,
+            options.project,
+            options.buildbucket,
+            options.buildername,
+            options.buildnumber, {},
+            reference_build,
+            perf_dashboard_machine_group=options.perf_dashboard_machine_group)
+    return dashboard_json
+
+
+def _GetDashboardHistogramData(options):
+    revisions = {
+        '--chromium_commit_positions': _CommitPositionNumber(options.got_revision_cp),
+        '--chromium_revisions': options.git_revision
+    }
+
+    if options.got_webrtc_revision:
+        revisions['--webrtc_revisions'] = options.got_webrtc_revision
+    if options.got_v8_revision:
+        revisions['--v8_revisions'] = options.got_v8_revision
+
+    is_reference_build = 'reference' in options.name
+    stripped_test_name = options.name.replace('.reference', '')
+
+    max_bytes = 1 << 20
+    output_dir = tempfile.mkdtemp()
+
+    try:
+        begin_time = time.time()
+        results_dashboard.MakeHistogramSetWithDiagnostics(
+            histograms_file=options.results_file,
+            test_name=stripped_test_name,
+            bot=options.configuration_name,
+            buildername=options.buildername,
+            buildnumber=options.buildnumber,
+            project=options.project,
+            buildbucket=options.buildbucket,
+            revisions_dict=revisions,
+            is_reference_build=is_reference_build,
+            perf_dashboard_machine_group=options.perf_dashboard_machine_group,
+            output_dir=output_dir,
+            max_bytes=max_bytes)
+        end_time = time.time()
+        logging.info('Duration of adding diagnostics for %s: %d seconds' %
+                     (stripped_test_name, end_time - begin_time))
+
+        # Read all batch files from output_dir.
+        dashboard_jsons = []
+        for basename in os.listdir(output_dir):
+            with open(os.path.join(output_dir, basename)) as f:
+                dashboard_jsons.append(json.load(f))
+
+        return dashboard_jsons
+    finally:
+        shutil.rmtree(output_dir)
+
+
+def _CreateParser():
+    # Parse options
+    parser = optparse.OptionParser()
+    parser.add_option('--name')
+    parser.add_option('--results-file')
+    parser.add_option('--output-json-file')
+    parser.add_option('--got-revision-cp')
+    parser.add_option('--configuration-name')
+    parser.add_option('--results-url')
+    parser.add_option('--perf-dashboard-machine-group')
+    parser.add_option('--project')
+    parser.add_option('--buildbucket')
+    parser.add_option('--buildername')
+    parser.add_option('--buildnumber')
+    parser.add_option('--got-webrtc-revision')
+    parser.add_option('--got-v8-revision')
+    parser.add_option('--git-revision')
+    parser.add_option('--output-json-dashboard-url')
+    parser.add_option('--send-as-histograms', action='store_true')
+    return parser
+
+
+def main(args):
+    parser = _CreateParser()
+    options, extra_args = parser.parse_args(args)
+
+    # Validate options.
+    if extra_args:
+        parser.error('Unexpected command line arguments')
+    if not options.configuration_name or not options.results_url:
+        parser.error('configuration_name and results_url are required.')
+
+    if not options.perf_dashboard_machine_group:
+        logging.error('Invalid perf dashboard machine group')
+        return 1
+
+    if not options.send_as_histograms:
+        dashboard_json = _GetDashboardJson(options)
+        dashboard_jsons = []
+        if dashboard_json:
+            dashboard_jsons.append(dashboard_json)
+    else:
+        dashboard_jsons = _GetDashboardHistogramData(options)
+
+        # The HistogramSet might have been batched if it would be too large to
+        # upload together. It's safe to concatenate the batches in order to write
+        # output_json_file.
+        # TODO(crbug.com/918208): Use a script in catapult to merge dashboard_jsons.
+        dashboard_json = sum(dashboard_jsons, [])
+
+    if options.output_json_file:
+        json.dump(dashboard_json, options.output_json_file, indent=4, separators=(',', ': '))
+
+    if dashboard_jsons:
+        if options.output_json_dashboard_url:
+            # Dump dashboard url to file.
+            dashboard_url = GetDashboardUrl(options.name, options.configuration_name,
+                                            options.results_url, options.got_revision_cp,
+                                            options.perf_dashboard_machine_group)
+            with open(options.output_json_dashboard_url, 'w') as f:
+                json.dump(dashboard_url if dashboard_url else '', f)
+
+        for batch in dashboard_jsons:
+            if not results_dashboard.SendResults(
+                    batch,
+                    options.name,
+                    options.results_url,
+                    send_as_histograms=options.send_as_histograms):
+                return 1
+    else:
+        # The upload didn't fail since there was no data to upload.
+        logging.warning('No perf dashboard JSON was produced.')
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main((sys.argv[1:])))
+
+
+def GetDashboardUrl(name, configuration_name, results_url, got_revision_cp,
+                    perf_dashboard_machine_group):
+    """Optionally writes the dashboard URL to a file and returns a link to the
+  dashboard.
+  """
+    name = name.replace('.reference', '')
+    dashboard_url = results_url + RESULTS_LINK_PATH % (
+        six.moves.urllib.parse.quote(perf_dashboard_machine_group),
+        six.moves.urllib.parse.quote(configuration_name), six.moves.urllib.parse.quote(name),
+        _CommitPositionNumber(got_revision_cp))
+
+    return dashboard_url
+
+
+def _GetPerfDashboardRevisionsWithProperties(got_webrtc_revision,
+                                             got_v8_revision,
+                                             git_revision,
+                                             main_revision,
+                                             point_id=None):
+    """Fills in the same revisions fields that process_log_utils does."""
+    versions = {}
+    versions['rev'] = main_revision
+    versions['webrtc_git'] = got_webrtc_revision
+    versions['v8_rev'] = got_v8_revision
+    versions['git_revision'] = git_revision
+    versions['point_id'] = point_id
+    # There are a lot of "bad" revisions to check for, so clean them all up here.
+    for key in versions.keys():
+        if not versions[key] or versions[key] == 'undefined':
+            del versions[key]
+    return versions

tools/perf/cross_device_test_config.py

+# Copyright 2021 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.
+
+# Dictionary for the repeat config.
+# E.g.:
+# {
+#   'builder-1':
+#   {
+#     'benchmark-1':
+#     {
+#       'story-1': 4,
+#     }
+#   'builder-2':
+#     'benchmark-2':
+#     {
+#       'story-1': 10,
+#       'story-2': 10,
+#     }
+# }
+
+TARGET_DEVICES = {
+    'android-pixel2-perf-fyi': {
+        'speedometer2': {
+            'Speedometer2': 3,
+        },
+        'rendering.mobile': {
+            'css_transitions_triggered_style_element': 4,
+            'canvas_animation_no_clear': 4
+        },
+        'system_health.common_mobile': 3,
+        'system_health.memory_mobile': 3,
+    },
+    'android-pixel2-perf': {
+        'system_health.common_mobile': {
+            # timeToFirstContentfulPaint
+            'browse:media:googleplaystore:2019': 10,
+            'load:social:pinterest:2019': 10,
+            'browse:media:facebook_photos:2019': 10
+        }
+    },
+    'android-go-perf': {
+        'system_health.common_mobile': {
+            # timeToFirstContentfulPaint
+            'background:social:facebook:2019': 10,
+            # cputimeToFirstContentfulPaint
+            'load:search:google:2018': 10
+        }
+    },
+    'linux-perf': {
+        'system_health.common_desktop': {
+            # cputimeToFirstContentfulPaint
+            'browse:social:tumblr_infinite_scroll:2018': 10,
+            'long_running:tools:gmail-background': 10,
+            'browse:media:youtubetv:2019': 10
+        }
+    },
+    'win-10-perf': {
+        'system_health.common_desktop': {
+            # cputimeToFirstContentfulPaint
+            'browse:media:tumblr:2018': 10,
+            'browse:social:tumblr_infinite_scroll:2018': 10,
+            'load:search:google:2018': 10,
+        }
+    },
+    'linux-perf-calibration': {
+        'speedometer2': {
+            'Speedometer2': 28,
+        },
+        'blink_perf.shadow_dom': 31
+    }
+}