Skip to content

A
angle
Commit ec8cdd5d by Jamie Madill Committed by Angle LUCI CQ
Options

infra: Add perf tests to Android/Linux/Mac.

These use the same config as the previous perf bots. Bug: angleproject:6090 Change-Id: I0ed4bc32cdc5b27f1fbd00fded1fa8d2ccbe45d9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2993458Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 69c2d820
Showing with 267 additions and 15 deletions
infra/specs/angle.json
{ {
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {},
"android-arm-builder": {},
"android-arm64-builder": {},
"android-arm64-pixel4": { "android-arm64-pixel4": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -459,7 +457,48 @@ ...@@ -459,7 +457,48 @@
} }
] ]
}, },
"linux-builder": {}, "android-arm64-pixel4-perf": {
"isolated_scripts": [
{
"args": [
"angle_perftests",
"--non-telemetry=true",
"--gtest-benchmark-name=angle_perftests",
"-v",
"--test-timeout=100",
"--test-launcher-batch-limit=1"
],
"isolate_name": "angle_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "R",
"device_os_type": "userdebug",
"device_type": "flame",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 12
},
"test_id_prefix": "ninja://src/tests:angle_perftests/"
}
]
},
"linux-intel": { "linux-intel": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -640,6 +679,42 @@ ...@@ -640,6 +679,42 @@
} }
] ]
}, },
"linux-intel-perf": {
"isolated_scripts": [
{
"args": [
"angle_perftests",
"--non-telemetry=true",
"--gtest-benchmark-name=angle_perftests",
"-v",
"--test-timeout=100",
"--batch-size=1",
"--bot-mode",
"--max-processes=1",
"--print-test-stdout"
],
"isolate_name": "angle_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:5912-19.0.2",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://src/tests:angle_perftests/"
}
]
},
"linux-nvidia": { "linux-nvidia": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -1268,6 +1343,42 @@ ...@@ -1268,6 +1343,42 @@
} }
] ]
}, },
"linux-nvidia-perf": {
"isolated_scripts": [
{
"args": [
"angle_perftests",
"--non-telemetry=true",
"--gtest-benchmark-name=angle_perftests",
"-v",
"--test-timeout=100",
"--batch-size=1",
"--bot-mode",
"--max-processes=1",
"--print-test-stdout"
],
"isolate_name": "angle_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://src/tests:angle_perftests/"
}
]
},
"mac-amd": { "mac-amd": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -1507,7 +1618,6 @@ ...@@ -1507,7 +1618,6 @@
} }
] ]
}, },
"mac-builder": {},
"mac-intel": { "mac-intel": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -1792,8 +1902,6 @@ ...@@ -1792,8 +1902,6 @@
} }
] ]
}, },
"win-x64-builder": {},
"win-x86-builder": {},
"win10-x64-intel": { "win10-x64-intel": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -1999,6 +2107,42 @@ ...@@ -1999,6 +2107,42 @@
} }
] ]
}, },
"win10-x64-intel-perf": {
"isolated_scripts": [
{
"args": [
"angle_perftests",
"--non-telemetry=true",
"--gtest-benchmark-name=angle_perftests",
"-v",
"--test-timeout=100",
"--batch-size=1",
"--bot-mode",
"--max-processes=1",
"--print-test-stdout"
],
"isolate_name": "angle_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "8086:5912-26.20.100.8141|8086:3e92-26.20.100.8141",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://src/tests:angle_perftests/"
}
]
},
"win10-x64-nvidia": { "win10-x64-nvidia": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -2758,6 +2902,42 @@ ...@@ -2758,6 +2902,42 @@
} }
] ]
}, },
"win10-x64-nvidia-perf": {
"isolated_scripts": [
{
"args": [
"angle_perftests",
"--non-telemetry=true",
"--gtest-benchmark-name=angle_perftests",
"-v",
"--test-timeout=100",
"--batch-size=1",
"--bot-mode",
"--max-processes=1",
"--print-test-stdout"
],
"isolate_name": "angle_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-27.21.14.5148",
"os": "Windows-10-18363",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 10
},
"test_id_prefix": "ninja://src/tests:angle_perftests/"
}
]
},
"win7-x64-nvidia": { "win7-x64-nvidia": {
"gtest_tests": [ "gtest_tests": [
{ {
......
infra/specs/test_suites.pyl
...@@ -647,6 +647,37 @@ ...@@ -647,6 +647,37 @@
}, },
}, },
# Actually uploads results to the perf dashboard
'angle_perf_isolated_scripts': {
'angle_perftests': {
'args': [
'angle_perftests',
'--non-telemetry=true',
'--gtest-benchmark-name=angle_perftests',
'-v',
'--test-timeout=100',
],
'android_args': [
'--test-launcher-batch-limit=1',
],
'desktop_args': [
'--batch-size=1',
'--bot-mode',
'--max-processes=1',
'--print-test-stdout',
],
'merge': {
'script': '//tools/perf/process_perf_results.py',
},
'android_swarming': {
'shards': 12,
},
'swarming': {
'shards': 10,
},
},
},
# The angle perf tests should eventually be run on every platform # The angle perf tests should eventually be run on every platform
# ANGLE supports. Currently they run on Windows, Linux and Android. # ANGLE supports. Currently they run on Windows, Linux and Android.
'angle_perf_smoke_isolated_scripts': { 'angle_perf_smoke_isolated_scripts': {
......
infra/specs/waterfalls.pyl
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
'swarming_containment_auto', 'swarming_containment_auto',
], ],
'machines': { 'machines': {
'android-arm-builder': {},
'android-arm64-builder': {},
'android-arm64-pixel4': { 'android-arm64-pixel4': {
'os_type': 'android', 'os_type': 'android',
'mixins': [ 'mixins': [
...@@ -33,7 +31,17 @@ ...@@ -33,7 +31,17 @@
'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'linux-builder': {}, 'android-arm64-pixel4-perf': {
'os_type': 'android',
'mixins': [
'android_r',
'flame',
'gpu-swarming-pool',
],
'test_suites': {
'isolated_scripts': 'angle_perf_isolated_scripts',
},
},
'linux-intel': { 'linux-intel': {
'os_type': 'linux', 'os_type': 'linux',
'mixins': [ 'mixins': [
...@@ -44,6 +52,15 @@ ...@@ -44,6 +52,15 @@
'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'linux-intel-perf': {
'os_type': 'linux',
'mixins': [
'linux_intel_hd_630_stable',
],
'test_suites': {
'isolated_scripts': 'angle_perf_isolated_scripts',
},
},
'linux-nvidia': { 'linux-nvidia': {
'os_type': 'linux', 'os_type': 'linux',
'mixins': [ 'mixins': [
...@@ -54,6 +71,15 @@ ...@@ -54,6 +71,15 @@
'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'linux-nvidia-perf': {
'os_type': 'linux',
'mixins': [
'linux_nvidia_quadro_p400_stable',
],
'test_suites': {
'isolated_scripts': 'angle_perf_isolated_scripts',
},
},
'mac-amd': { 'mac-amd': {
'os_type': 'mac', 'os_type': 'mac',
'mixins': [ 'mixins': [
...@@ -63,7 +89,6 @@ ...@@ -63,7 +89,6 @@
'gtest_tests': 'mac_amd_and_intel_gtests', 'gtest_tests': 'mac_amd_and_intel_gtests',
}, },
}, },
'mac-builder': {},
'mac-intel': { 'mac-intel': {
'os_type': 'mac', 'os_type': 'mac',
'mixins': [ 'mixins': [
...@@ -83,8 +108,6 @@ ...@@ -83,8 +108,6 @@
'gtest_tests': 'mac_nvidia_gtests', 'gtest_tests': 'mac_nvidia_gtests',
}, },
}, },
'win-x64-builder': {},
'win-x86-builder': {},
'win10-x64-intel': { 'win10-x64-intel': {
'os_type': 'win', 'os_type': 'win',
'mixins': [ 'mixins': [
...@@ -95,6 +118,15 @@ ...@@ -95,6 +118,15 @@
'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'win10-x64-intel-perf': {
'os_type': 'win',
'mixins': [
'win10_intel_hd_630_stable',
],
'test_suites': {
'isolated_scripts': 'angle_perf_isolated_scripts',
},
},
'win10-x64-nvidia': { 'win10-x64-nvidia': {
'os_type': 'win', 'os_type': 'win',
'mixins': [ 'mixins': [
...@@ -105,6 +137,15 @@ ...@@ -105,6 +137,15 @@
'isolated_scripts': 'common_isolated_scripts', 'isolated_scripts': 'common_isolated_scripts',
}, },
}, },
'win10-x64-nvidia-perf': {
'os_type': 'win',
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'isolated_scripts': 'angle_perf_isolated_scripts',
},
},
'win7-x64-nvidia': { 'win7-x64-nvidia': {
'os_type': 'win', 'os_type': 'win',
'mixins': [ 'mixins': [
......
scripts/code_generation_hashes/Test_spec_JSON.json
{ {
"infra/specs/angle.json": "infra/specs/angle.json":
"af1d088e331b9c7865a245c36bb443df", "547d1f383864aad07707de3ffd192f92",
"infra/specs/generate_test_spec_json.py": "infra/specs/generate_test_spec_json.py":
"348921bf70270ec6ee51fbb7e97d6925", "348921bf70270ec6ee51fbb7e97d6925",
"infra/specs/mixins.pyl": "infra/specs/mixins.pyl":
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
"infra/specs/test_suite_exceptions.pyl": "infra/specs/test_suite_exceptions.pyl":
"723460da84a90884a9668c07a0893390", "723460da84a90884a9668c07a0893390",
"infra/specs/test_suites.pyl": "infra/specs/test_suites.pyl":
"63d18d896eddba97b4131e1e4d181b6f", "bcd6464decf7be73472fa1837d6c2c96",
"infra/specs/variants.pyl": "infra/specs/variants.pyl":
"8cfcaa99fa07ad2a2d5d14f220fd5037", "8cfcaa99fa07ad2a2d5d14f220fd5037",
"infra/specs/waterfalls.pyl": "infra/specs/waterfalls.pyl":
"fee8d5386149cf4b347eaa9036eb3d0d", "5cba5fb3a739bbc3f1710db863fde2a8",
"testing/buildbot/generate_buildbot_json.py": "testing/buildbot/generate_buildbot_json.py":
"9f5d39d58f4a8baf4b74349147feb606", "9f5d39d58f4a8baf4b74349147feb606",
"testing/buildbot/mixins.pyl": "testing/buildbot/mixins.pyl":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment