Hash :
f30cfd18
Author :
Date :
2022-08-16T16:50:33
Perf and gold tests detect test SKIPs from json results. Make angle_test_util.RunTestSuite() gets and returns json results (using --isolated-script-test-output). perf tests has an additional special case (filed https://anglebug.com/7578): Previously when metrics were missing it was assumed that this was due to tests being skipped - which seems to currently be the case except for the special case of GLMark2Benchmark* tests. Those produce .fps/.score metrics instead of the metrics expected by this script. This CL keeps those tests running (once) but then marks them as SKIP in test results when no metrics are found (which is the behavior before this CL; it might actually make more sense to count this as PASS because everything matches our expectations). We're still running them once, so if they FAIL we'll get notified. gold tests: Use json results file instead of checking for '[ SKIPPED ]' in stdout. Bug: angleproject:7299 Bug: angleproject:7578 Change-Id: Ia751784ad1aa94dc855c8b58ebfe5ba3e06e462f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3826167 Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525
#! /usr/bin/env vpython3
#
# Copyright 2021 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# run_perf_test.py:
# Runs ANGLE perf tests using some statistical averaging.
import argparse
import fnmatch
import importlib
import io
import json
import logging
import time
import os
import pathlib
import re
import subprocess
import sys
PY_UTILS = str(pathlib.Path(__file__).resolve().parent / 'py_utils')
if PY_UTILS not in sys.path:
os.stat(PY_UTILS) and sys.path.insert(0, PY_UTILS)
import android_helper
import angle_path_util
import angle_test_util
angle_path_util.AddDepsDirToPath('testing/scripts')
import common
angle_path_util.AddDepsDirToPath('third_party/catapult/tracing')
from tracing.value import histogram
from tracing.value import histogram_set
from tracing.value import merge_histograms
ANGLE_PERFTESTS = 'angle_perftests'
DEFAULT_LOG = 'info'
DEFAULT_SAMPLES = 4
DEFAULT_TRIALS = 3
DEFAULT_MAX_ERRORS = 3
DEFAULT_WARMUP_LOOPS = 2
DEFAULT_CALIBRATION_TIME = 2
# Test expectations
FAIL = 'FAIL'
PASS = 'PASS'
SKIP = 'SKIP'
EXIT_FAILURE = 1
EXIT_SUCCESS = 0
def _filter_tests(tests, pattern):
return [test for test in tests if fnmatch.fnmatch(test, pattern)]
def _shard_tests(tests, shard_count, shard_index):
return [tests[index] for index in range(shard_index, len(tests), shard_count)]
def _get_results_from_output(output, result):
m = re.search(r'Running (\d+) tests', output)
if m and int(m.group(1)) > 1:
raise Exception('Found more than one test result in output')
# Results are reported in the format:
# name_backend.result: story= value units.
pattern = r'\.' + result + r':.*= ([0-9.]+)'
logging.debug('Searching for %s in output' % pattern)
m = re.findall(pattern, output)
if not m:
logging.warning('Did not find the result "%s" in the test output:\n%s' % (result, output))
return None
return [float(value) for value in m]
def _get_tests_from_output(output):
out_lines = output.split('\n')
start = out_lines.index('Tests list:')
end = out_lines.index('End tests list.')
return out_lines[start + 1:end]
def _truncated_list(data, n):
"""Compute a truncated list, n is truncation size"""
if len(data) < n * 2:
raise ValueError('list not large enough to truncate')
return sorted(data)[n:-n]
def _mean(data):
"""Return the sample arithmetic mean of data."""
n = len(data)
if n < 1:
raise ValueError('mean requires at least one data point')
return float(sum(data)) / float(n) # in Python 2 use sum(data)/float(n)
def _sum_of_square_deviations(data, c):
"""Return sum of square deviations of sequence data."""
ss = sum((float(x) - c)**2 for x in data)
return ss
def _coefficient_of_variation(data):
"""Calculates the population coefficient of variation."""
n = len(data)
if n < 2:
raise ValueError('variance requires at least two data points')
c = _mean(data)
ss = _sum_of_square_deviations(data, c)
pvar = ss / n # the population variance
stddev = (pvar**0.5) # population standard deviation
return stddev / c
def _save_extra_output_files(args, results, histograms):
isolated_out_dir = os.path.dirname(args.isolated_script_test_output)
if not os.path.isdir(isolated_out_dir):
return
benchmark_path = os.path.join(isolated_out_dir, args.test_suite)
if not os.path.isdir(benchmark_path):
os.makedirs(benchmark_path)
test_output_path = os.path.join(benchmark_path, 'test_results.json')
results.save_to_json_file(test_output_path)
perf_output_path = os.path.join(benchmark_path, 'perf_results.json')
logging.info('Saving perf histograms to %s.' % perf_output_path)
with open(perf_output_path, 'w') as out_file:
out_file.write(json.dumps(histograms.AsDicts(), indent=2))
class Results:
def __init__(self):
self._results = {
'tests': {},
'interrupted': False,
'seconds_since_epoch': time.time(),
'path_delimiter': '.',
'version': 3,
'num_failures_by_type': {
FAIL: 0,
PASS: 0,
SKIP: 0,
},
}
self._test_results = {}
def has_failures(self):
return self._results['num_failures_by_type'][FAIL] > 0
def has_result(self, test):
return test in self._test_results
def result_skip(self, test):
self._test_results[test] = {'expected': SKIP, 'actual': SKIP}
self._results['num_failures_by_type'][SKIP] += 1
def result_pass(self, test):
self._test_results[test] = {'expected': PASS, 'actual': PASS}
self._results['num_failures_by_type'][PASS] += 1
def result_fail(self, test):
self._test_results[test] = {'expected': PASS, 'actual': FAIL, 'is_unexpected': True}
self._results['num_failures_by_type'][FAIL] += 1
def save_to_output_file(self, test_suite, fname):
self._update_results(test_suite)
with open(fname, 'w') as out_file:
out_file.write(json.dumps(self._results, indent=2))
def save_to_json_file(self, fname):
logging.info('Saving test results to %s.' % fname)
with open(fname, 'w') as out_file:
out_file.write(json.dumps(self._results, indent=2))
def _update_results(self, test_suite):
if self._test_results:
self._results['tests'][test_suite] = self._test_results
self._test_results = {}
def _read_histogram(histogram_file_path):
with open(histogram_file_path) as histogram_file:
histogram = histogram_set.HistogramSet()
histogram.ImportDicts(json.load(histogram_file))
return histogram
def _merge_into_one_histogram(test_histogram_set):
with common.temporary_file() as merge_histogram_path:
logging.info('Writing merged histograms to %s.' % merge_histogram_path)
with open(merge_histogram_path, 'w') as merge_histogram_file:
json.dump(test_histogram_set.AsDicts(), merge_histogram_file)
merge_histogram_file.close()
merged_dicts = merge_histograms.MergeHistograms(merge_histogram_path, groupby=['name'])
merged_histogram = histogram_set.HistogramSet()
merged_histogram.ImportDicts(merged_dicts)
return merged_histogram
def _wall_times_stats(wall_times):
if len(wall_times) > 7:
truncation_n = len(wall_times) >> 3
logging.debug('Truncation: Removing the %d highest and lowest times from wall_times.' %
truncation_n)
wall_times = _truncated_list(wall_times, truncation_n)
if len(wall_times) > 1:
return ('truncated mean wall_time = %.2f, cov = %.2f%%' %
(_mean(wall_times), _coefficient_of_variation(wall_times) * 100.0))
return None
def _run_test_suite(args, cmd_args, env):
android_test_runner_args = [
'--extract-test-list-from-filter',
'--enable-device-cache',
'--skip-clear-data',
'--use-existing-test-data',
]
return angle_test_util.RunTestSuite(
args.test_suite,
cmd_args,
env,
runner_args=android_test_runner_args,
use_xvfb=args.xvfb,
show_test_stdout=args.show_test_stdout)
def _run_calibration(args, common_args, env):
exit_code, calibrate_output, json_results = _run_test_suite(
args, common_args + [
'--calibration',
'--warmup-loops',
str(args.warmup_loops),
], env)
if exit_code != EXIT_SUCCESS:
raise RuntimeError('%s failed. Output:\n%s' % (args.test_suite, calibrate_output))
if SKIP in json_results['num_failures_by_type']:
return SKIP, None
steps_per_trial = _get_results_from_output(calibrate_output, 'steps_to_run')
if not steps_per_trial:
return FAIL, None
assert (len(steps_per_trial) == 1)
return PASS, int(steps_per_trial[0])
def _run_perf(args, common_args, env, steps_per_trial):
run_args = common_args + [
'--steps-per-trial',
str(steps_per_trial),
'--trials',
str(args.trials_per_sample),
]
if args.smoke_test_mode:
run_args += ['--no-warmup']
else:
run_args += ['--warmup-loops', str(args.warmup_loops)]
if args.perf_counters:
run_args += ['--perf-counters', args.perf_counters]
with common.temporary_file() as histogram_file_path:
run_args += ['--isolated-script-test-perf-output=%s' % histogram_file_path]
exit_code, output, json_results = _run_test_suite(args, run_args, env)
if exit_code != EXIT_SUCCESS:
raise RuntimeError('%s failed. Output:\n%s' % (args.test_suite, output))
if SKIP in json_results['num_failures_by_type']:
return SKIP, None, None
sample_wall_times = _get_results_from_output(output, 'wall_time')
if sample_wall_times:
sample_histogram = _read_histogram(histogram_file_path)
return PASS, sample_wall_times, sample_histogram
return FAIL, None, None
class _MaxErrorsException(Exception):
pass
def _skipped_or_glmark2(test, test_status):
if test_status == SKIP:
logging.info('Test skipped by suite: %s' % test)
return True
# GLMark2Benchmark logs .fps/.score instead of our perf metrics.
if test.startswith('GLMark2Benchmark.Run/'):
logging.info('GLMark2Benchmark missing metrics (as expected, skipping): %s' % test)
return True
return False
def _run_tests(tests, args, extra_flags, env):
results = Results()
histograms = histogram_set.HistogramSet()
total_errors = 0
prepared_traces = set()
for test_index in range(len(tests)):
if total_errors >= args.max_errors:
raise _MaxErrorsException()
test = tests[test_index]
if angle_test_util.IsAndroid():
trace = android_helper.GetTraceFromTestName(test)
if trace and trace not in prepared_traces:
android_helper.PrepareRestrictedTraces([trace])
prepared_traces.add(trace)
common_args = [
'--gtest_filter=%s' % test,
'--verbose',
'--calibration-time',
str(args.calibration_time),
] + extra_flags
if args.steps_per_trial:
steps_per_trial = args.steps_per_trial
else:
try:
test_status, steps_per_trial = _run_calibration(args, common_args, env)
except RuntimeError as e:
logging.fatal(e)
total_errors += 1
results.result_fail(test)
continue
if _skipped_or_glmark2(test, test_status):
results.result_skip(test)
continue
if not steps_per_trial:
logging.error('Test %s missing steps_per_trial' % test)
results.result_fail(test)
continue
logging.info('Test %d/%d: %s (samples=%d trials_per_sample=%d steps_per_trial=%d)' %
(test_index + 1, len(tests), test, args.samples_per_test,
args.trials_per_sample, steps_per_trial))
wall_times = []
test_histogram_set = histogram_set.HistogramSet()
for sample in range(args.samples_per_test):
try:
test_status, sample_wall_times, sample_histogram = _run_perf(
args, common_args, env, steps_per_trial)
except RuntimeError as e:
logging.error(e)
results.result_fail(test)
total_errors += 1
break
if _skipped_or_glmark2(test, test_status):
results.result_skip(test)
break
if not sample_wall_times:
logging.error('Test %s failed to produce a sample output' % test)
results.result_fail(test)
break
logging.info('Test %d/%d Sample %d/%d wall_times: %s' %
(test_index + 1, len(tests), sample + 1, args.samples_per_test,
str(sample_wall_times)))
wall_times += sample_wall_times
test_histogram_set.Merge(sample_histogram)
if not results.has_result(test):
if len(wall_times) == (args.samples_per_test * args.trials_per_sample):
stats = _wall_times_stats(wall_times)
if stats:
logging.info('Test %d/%d: %s: %s' % (test_index + 1, len(tests), test, stats))
histograms.Merge(_merge_into_one_histogram(test_histogram_set))
results.result_pass(test)
else:
logging.error('Test %s failed to record some samples' % test)
results.result_fail(test)
return results, histograms
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--isolated-script-test-output', type=str)
parser.add_argument('--isolated-script-test-perf-output', type=str)
parser.add_argument(
'-f', '--filter', '--isolated-script-test-filter', type=str, help='Test filter.')
parser.add_argument('--test-suite', help='Test suite to run.', default=ANGLE_PERFTESTS)
parser.add_argument('--xvfb', help='Use xvfb.', action='store_true')
parser.add_argument(
'--shard-count',
help='Number of shards for test splitting. Default is 1.',
type=int,
default=1)
parser.add_argument(
'--shard-index',
help='Index of the current shard for test splitting. Default is 0.',
type=int,
default=0)
parser.add_argument(
'-l', '--log', help='Log output level. Default is %s.' % DEFAULT_LOG, default=DEFAULT_LOG)
parser.add_argument(
'-s',
'--samples-per-test',
help='Number of samples to run per test. Default is %d.' % DEFAULT_SAMPLES,
type=int,
default=DEFAULT_SAMPLES)
parser.add_argument(
'-t',
'--trials-per-sample',
help='Number of trials to run per sample. Default is %d.' % DEFAULT_TRIALS,
type=int,
default=DEFAULT_TRIALS)
parser.add_argument(
'--steps-per-trial', help='Fixed number of steps to run per trial.', type=int)
parser.add_argument(
'--max-errors',
help='After this many errors, abort the run. Default is %d.' % DEFAULT_MAX_ERRORS,
type=int,
default=DEFAULT_MAX_ERRORS)
parser.add_argument(
'--smoke-test-mode', help='Do a quick run to validate correctness.', action='store_true')
parser.add_argument(
'--warmup-loops',
help='Number of warmup loops to run in the perf test. Default is %d.' %
DEFAULT_WARMUP_LOOPS,
type=int,
default=DEFAULT_WARMUP_LOOPS)
parser.add_argument(
'--calibration-time',
help='Amount of time to spend each loop in calibration and warmup. Default is %d seconds.'
% DEFAULT_CALIBRATION_TIME,
type=int,
default=DEFAULT_CALIBRATION_TIME)
parser.add_argument(
'--show-test-stdout', help='Prints all test stdout during execution.', action='store_true')
parser.add_argument(
'--perf-counters', help='Colon-separated list of extra perf counter metrics.')
args, extra_flags = parser.parse_known_args()
angle_test_util.SetupLogging(args.log.upper())
start_time = time.time()
# Use fast execution for smoke test mode.
if args.smoke_test_mode:
args.steps_per_trial = 1
args.trials_per_sample = 1
args.samples_per_test = 1
env = os.environ.copy()
if angle_test_util.HasGtestShardsAndIndex(env):
args.shard_count, args.shard_index = angle_test_util.PopGtestShardsAndIndex(env)
angle_test_util.Initialize(args.test_suite)
# Get test list
if angle_test_util.IsAndroid():
tests = android_helper.ListTests(args.test_suite)
else:
exit_code, output, _ = _run_test_suite(args, ['--list-tests', '--verbose'], env)
if exit_code != EXIT_SUCCESS:
logging.fatal('Could not find test list from test output:\n%s' % output)
tests = _get_tests_from_output(output)
if args.filter:
tests = _filter_tests(tests, args.filter)
# Get tests for this shard (if using sharding args)
tests = _shard_tests(tests, args.shard_count, args.shard_index)
if not tests:
logging.error('No tests to run.')
return EXIT_FAILURE
if angle_test_util.IsAndroid() and args.test_suite == ANGLE_PERFTESTS:
android_helper.RunSmokeTest()
logging.info('Running %d test%s' % (len(tests), 's' if len(tests) > 1 else ' '))
try:
results, histograms = _run_tests(tests, args, extra_flags, env)
except _MaxErrorsException:
logging.error('Error count exceeded max errors (%d). Aborting.' % args.max_errors)
return EXIT_FAILURE
for test in tests:
assert results.has_result(test)
if args.isolated_script_test_output:
results.save_to_output_file(args.test_suite, args.isolated_script_test_output)
# Uses special output files to match the merge script.
_save_extra_output_files(args, results, histograms)
if args.isolated_script_test_perf_output:
with open(args.isolated_script_test_perf_output, 'w') as out_file:
out_file.write(json.dumps(histograms.AsDicts(), indent=2))
end_time = time.time()
logging.info('Elapsed time: %.2lf seconds.' % (end_time - start_time))
if results.has_failures():
return EXIT_FAILURE
return EXIT_SUCCESS
if __name__ == '__main__':
sys.exit(main())