Include release benchmark data in perf aggregation
Change-Id: Ib3cdfae60517f74819f4cb8a9632eddd30220aa4
diff --git a/tools/perf.py b/tools/perf.py
index 4131bce..577647d 100755
--- a/tools/perf.py
+++ b/tools/perf.py
@@ -214,8 +214,10 @@
return json.loads(''.join(lines))
-def GetArtifactLocation(benchmark, target, version, filename):
+def GetArtifactLocation(benchmark, target, version, filename, branch=None):
if version:
+ if branch and branch != 'main':
+ return f'branches/{branch}/{benchmark}/{target}/{version}/{filename}'
return f'{benchmark}/{target}/{version}/{filename}'
else:
commit = utils.get_HEAD_commit()
diff --git a/tools/upload_benchmark_data_to_google_storage.py b/tools/upload_benchmark_data_to_google_storage.py
index bd4e5bb..cde8390 100755
--- a/tools/upload_benchmark_data_to_google_storage.py
+++ b/tools/upload_benchmark_data_to_google_storage.py
@@ -10,6 +10,8 @@
import argparse
import json
import os
+import re
+import subprocess
import sys
TARGETS = ['r8-full']
@@ -29,6 +31,63 @@
flags=['-R'])
+def GetMainCommits():
+ top = utils.get_sha1_from_revision('origin/main')
+ bottom = utils.get_nth_sha1_from_revision(NUM_COMMITS - 1, 'origin/main')
+ commits = historic_run.enumerate_git_commits(top, bottom)
+ assert len(commits) == NUM_COMMITS
+ return commits
+
+
+def GetReleaseBranches():
+ remote_branches = subprocess.check_output(
+ ['git', 'branch', '-r']).decode('utf-8').strip().splitlines()
+ result = []
+ for remote_branch in remote_branches:
+ remote_branch = remote_branch.strip()
+
+ # Strip 'origin/'.
+ try:
+ remote_name_end_index = remote_branch.index('/')
+ remote_branch = remote_branch[remote_name_end_index + 1:]
+ except ValueError:
+ pass
+
+ # Filter out branches that are not on the form X.Y
+ if not re.search('^(0|[1-9]\d*)\.(0|[1-9]\d*)$', remote_branch):
+ continue
+
+ # Filter out branches prior to 8.9.
+ dot_index = remote_branch.index('.')
+ [major, minor] = remote_branch.split('.')
+ if int(major) < 8 or (major == '8' and int(minor) < 9):
+ continue
+
+ result.append(remote_branch)
+ return result
+
+
+def GetReleaseCommits():
+ release_commits = []
+ for branch in GetReleaseBranches():
+ (major, minor) = branch.split('.')
+ candidate_commits = subprocess.check_output([
+ 'git', 'log', '--grep=-dev', '--max-count=100',
+ '--pretty=format:%H %s', 'origin/' + branch, '--',
+ 'src/main/java/com/android/tools/r8/Version.java'
+ ]).decode('utf-8').strip().splitlines()
+ for candidate_commit in candidate_commits:
+ separator_index = candidate_commit.index(' ')
+ git_hash = candidate_commit[:separator_index]
+ git_title = candidate_commit[separator_index + 1:]
+ if not re.search(
+ '^Version %s\.%s\.(0|[1-9]\d*)-dev$' %
+ (major, minor), git_title):
+ continue
+ release_commits.append(historic_run.git_commit_from_hash(git_hash))
+ return release_commits
+
+
def ParseJsonFromCloudStorage(filename, local_bucket):
abs_path = os.path.join(local_bucket, filename)
if not os.path.exists(abs_path):
@@ -59,8 +118,11 @@
def RecordSingleBenchmarkResult(commit, benchmark, local_bucket, target,
benchmarks):
- filename = perf.GetArtifactLocation(benchmark, target, commit.hash(),
- 'result.json')
+ filename = perf.GetArtifactLocation(benchmark,
+ target,
+ commit.hash(),
+ 'result.json',
+ branch=commit.branch())
benchmark_data = ParseJsonFromCloudStorage(filename, local_bucket)
if benchmark_data:
benchmarks[benchmark] = benchmark_data
@@ -107,16 +169,16 @@
def run_bucket():
# Get the N most recent commits sorted by newest first.
- top = utils.get_sha1_from_revision('origin/main')
- bottom = utils.get_nth_sha1_from_revision(NUM_COMMITS - 1, 'origin/main')
- commits = historic_run.enumerate_git_commits(top, bottom)
- assert len(commits) == NUM_COMMITS
+ main_commits = GetMainCommits()
+
+ # Get all release commits from 8.9 and onwards.
+ release_commits = GetReleaseCommits()
# Download all benchmark data from the cloud bucket to a temp folder.
with utils.TempDir() as temp:
local_bucket = os.path.join(temp, perf.BUCKET)
DownloadCloudBucket(local_bucket)
- run(commits, local_bucket, temp)
+ run(main_commits + release_commits, local_bucket, temp)
def run_local(local_bucket):
