Hash :
9566011b
Author :
Date :
2023-02-23T15:01:59
Add support for permissive pixel comparison Adds support for running ANGLE pixel tests with a more permissive inexact matching algorithm. This is done by passing in --use-permissive-pixel-comparison=1 to the test runner. This is intended to reduce the amount of manual triage work required on CLs that are expected to have a larger amount of differences, such as SwiftShader rolls. On the bots, this will normally be disabled, but will be enabled if "Use-Permissive-Angle-Pixel-Comparison: True" is present as a CL footer. This footer is not yet included automatically anywhere, so there should be no functional change as a result of this CL yet. Bug: angleproject:7985 Change-Id: Ie815fac42edb2198dd4d115fc50650504df136c0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4288612 Auto-Submit: Brian Sheedy <bsheedy@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
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
#!/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.
"""Script to generate the test spec JSON files. Calls Chromium's generate_buildbot_json.
=== NOTE: DO NOT RUN THIS SCRIPT DIRECTLY. ===
Run scripts/run_code_generation.py instead to update necessary hashes.
"""
import os
import pprint
import sys
import subprocess
d = os.path.dirname
THIS_DIR = d(os.path.abspath(__file__))
TESTING_BBOT_DIR = os.path.join(d(d(THIS_DIR)), 'testing', 'buildbot')
sys.path.insert(0, TESTING_BBOT_DIR)
import generate_buildbot_json
# Add custom mixins here.
ADDITIONAL_MIXINS = {
'angle_skia_gold_test': {
'$mixin_append': {
'args': [
'--git-revision=${got_angle_revision}',
# BREAK GLASS IN CASE OF EMERGENCY
# Uncommenting this argument will bypass all interactions with Skia
# Gold in any tests that use it. This is meant as a temporary
# emergency stop in case of a Gold outage that's affecting the bots.
# '--bypass-skia-gold-functionality',
],
'precommit_args': [
'--gerrit-issue=${patch_issue}',
'--gerrit-patchset=${patch_set}',
'--buildbucket-id=${buildbucket_build_id}',
# This normally evaluates to "0", but will evaluate to "1" if
# "Use-Permissive-Angle-Pixel-Comparison: True" is present as a
# CL footer.
'--use-permissive-pixel-comparison=${use_permissive_angle_pixel_comparison}',
],
}
},
'timeout_120m': {
'swarming': {
'hard_timeout': 7200,
'io_timeout': 300
}
},
}
MIXIN_FILE_NAME = os.path.join(THIS_DIR, 'mixins.pyl')
MIXINS_PYL_TEMPLATE = """\
# GENERATED FILE - DO NOT EDIT.
# Generated by {script_name} using data from {data_source}
#
# 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.
#
# This is a .pyl, or "Python Literal", file. You can treat it just like a
# .json file, with the following exceptions:
# * all keys must be quoted (use single quotes, please);
# * comments are allowed, using '#' syntax; and
# * trailing commas are allowed.
#
# For more info see Chromium's mixins.pyl in testing/buildbot.
{mixin_data}
"""
def main():
if len(sys.argv) > 1:
gen_bb_json = os.path.join(TESTING_BBOT_DIR, 'generate_buildbot_json.py')
mixins_pyl = os.path.join(TESTING_BBOT_DIR, 'mixins.pyl')
inputs = [
'test_suite_exceptions.pyl', 'test_suites.pyl', 'variants.pyl', 'waterfalls.pyl',
gen_bb_json, mixins_pyl
]
outputs = ['angle.json', 'mixins.pyl']
if sys.argv[1] == 'inputs':
print(','.join(inputs))
elif sys.argv[1] == 'outputs':
print(','.join(outputs))
else:
print('Invalid script parameters')
return 1
return 0
chromium_args = generate_buildbot_json.BBJSONGenerator.parse_args(sys.argv[1:])
chromium_generator = generate_buildbot_json.BBJSONGenerator(chromium_args)
chromium_generator.load_configuration_files()
override_args = sys.argv[1:] + ['--pyl-files-dir', THIS_DIR]
angle_args = generate_buildbot_json.BBJSONGenerator.parse_args(override_args)
angle_generator = generate_buildbot_json.BBJSONGenerator(angle_args)
angle_generator.load_configuration_files()
angle_generator.resolve_configuration_files()
seen_mixins = set()
for waterfall in angle_generator.waterfalls:
seen_mixins = seen_mixins.union(waterfall.get('mixins', set()))
for bot_name, tester in waterfall['machines'].items():
seen_mixins = seen_mixins.union(tester.get('mixins', set()))
for suite in angle_generator.test_suites.values():
if isinstance(suite, list):
# Don't care about this, it's a composition, which shouldn't include a
# swarming mixin.
continue
for test in suite.values():
assert isinstance(test, dict)
seen_mixins = seen_mixins.union(test.get('mixins', set()))
found_mixins = ADDITIONAL_MIXINS.copy()
for mixin in seen_mixins:
if mixin in found_mixins:
continue
assert (mixin in chromium_generator.mixins), 'Error with %s mixin' % mixin
found_mixins[mixin] = chromium_generator.mixins[mixin]
pp = pprint.PrettyPrinter(indent=2)
format_data = {
'script_name': os.path.basename(__file__),
'data_source': 'waterfall.pyl and Chromium\'s mixins.pyl',
'mixin_data': pp.pformat(found_mixins),
}
generated_mixin_pyl = MIXINS_PYL_TEMPLATE.format(**format_data)
with open(MIXIN_FILE_NAME, 'w') as f:
f.write(generated_mixin_pyl)
f.close()
return angle_generator.main()
if __name__ == '__main__': # pragma: no cover
sys.exit(main())