AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add new Metal bots

Browse Source 
Bug: skia:8243
Change-Id: I660ccd8aa17c2c6575f006d2e07a4b904e636935
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/215451
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Jim Van Verth 2019-05-22 14:52:11 -04:00 committed by Skia Commit-Bot
parent f084bb1310
commit 40479ae5b0
4 changed files with 3725 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
infra/bots/jobs.json
View File

@ -85,18 +85,22 @@
"Build-Mac-Clang-arm64-Debug-iOS",
"Build-Mac-Clang-arm64-Debug-iOS_Metal",
"Build-Mac-Clang-arm64-Release-iOS",
"Build-Mac-Clang-arm64-Release-iOS_Metal",
"Build-Mac-Clang-x64-Release-iOS",
"Build-Mac-Clang-x86_64-Debug",
"Build-Mac-Clang-x86_64-Debug-ASAN",
"Build-Mac-Clang-x86_64-Debug-ASAN_Metal",
"Build-Mac-Clang-x86_64-Debug-CommandBuffer",
"Build-Mac-Clang-x86_64-Debug-Metal",
"Build-Mac-Clang-x86_64-Debug-MoltenVK_Vulkan",
"Build-Mac-Clang-x86_64-Debug-OpenCL",
"Build-Mac-Clang-x86_64-Release",
"Build-Mac-Clang-x86_64-Release-ASAN_Metal",
"Build-Mac-Clang-x86_64-Release-CommandBuffer",
"Build-Mac-Clang-x86_64-Release-Metal",
"Build-Mac-Clang-x86_64-Release-MoltenVK_Vulkan",
"Build-Mac-Clang-x86_64-Release-TSAN",
"Build-Mac-Clang-x86_64-Release-TSAN_Metal",
"Build-Win-Clang-arm64-Debug",
"Build-Win-Clang-arm64-Debug-ANGLE",
"Build-Win-Clang-arm64-Release",
@ -275,9 +279,9 @@
"Perf-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-ASAN",
"Perf-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All",
"Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All",
"Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-MoltenVK_Vulkan",
"Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All",
"Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-CommandBuffer",
"Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal",
"Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan",
"Perf-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All",
"Perf-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All",
@ -285,6 +289,7 @@
"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All",
"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All",
"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-CommandBuffer",
"Perf-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal",
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN",
"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
@ -366,8 +371,10 @@
"Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
"Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Debug-All",
"Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All",
"Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal",
"Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All",
"Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All",
"Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal",
"Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All",
"Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All",
"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android",
@ -529,21 +536,30 @@
"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All",
"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All-TSAN",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-ASAN_Metal",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-MoltenVK_Vulkan",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-OpenCL",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-ASAN_Metal",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-MoltenVK_Vulkan",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN",
"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN_Metal",
"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All",
"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer",
"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All",
"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-Metal",
"Test-Mac10.14-Clang-MacBookAir7.2-CPU-AVX2-x86_64-Debug-All-NativeFonts",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal",
"Test-Mac10.14-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal",
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN",
"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1",
@ -662,6 +678,7 @@
"Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All",
"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All",
"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All",
"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal",
"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All",
"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All-Metal",
"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All"

248
infra/bots/recipes/perf.expected/Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal.json Normal file
View File

@ -0,0 +1,248 @@
[
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get skp VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]/tmp/SKP_VERSION"
],
"infra_step": true,
"name": "write SKP_VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get skimage VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]/tmp/SK_IMAGE_VERSION"
],
"infra_step": true,
"name": "write SK_IMAGE_VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"[START_DIR]/skia/infra/bots/assets/svg/VERSION",
"/path/to/tmp/"
],
"infra_step": true,
"name": "Get svg VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
"[START_DIR]/tmp/SVG_VERSION"
],
"infra_step": true,
"name": "write SVG_VERSION"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"rmtree",
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "rmtree [SWARM_OUT_DIR]"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs [SWARM_OUT_DIR]"
},
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
],
"name": "get swarming bot id",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
],
"name": "get swarming task id",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"[START_DIR]/build/nanobench",
"-i",
"[START_DIR]/skia/resources",
"--skps",
"[START_DIR]/skp",
"--images",
"[START_DIR]/skimage/nanobench",
"--svgs",
"[START_DIR]/svg",
"--pre_log",
"--images",
"--gpuStatsDump",
"true",
"--scales",
"1.0",
"1.1",
"--nocpu",
"--config",
"mtl",
"--match",
"~inc0.gif",
"~inc1.gif",
"~incInterlaced.gif",
"~inc0.jpg",
"~incGray.jpg",
"~inc0.wbmp",
"~inc1.wbmp",
"~inc0.webp",
"~inc1.webp",
"~inc0.ico",
"~inc1.ico",
"~inc0.png",
"~inc1.png",
"~inc2.png",
"~inc12.png",
"~inc13.png",
"~inc14.png",
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
"[START_DIR]/[SWARM_OUT_DIR]/nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
"123456",
"--key",
"arch",
"x86_64",
"compiler",
"Clang",
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
"RadeonHD8870M",
"extra_config",
"Metal",
"model",
"MacBookPro11.5",
"os",
"Mac10.13"
],
"env": {
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"name": "nanobench"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
},
{
"jsonResult": null,
"name": "$result"
}
]

5
infra/bots/recipes/perf.py
View File

@ -114,6 +114,9 @@ def nanobench_flags(api, bot):
if 'Vulkan' in bot:
configs = ['vk']
if 'Metal' in bot:
configs = ['mtl']
if 'ANGLE' in bot:
# Test only ANGLE configs.
configs = ['angle_d3d11_es2']
@ -408,6 +411,8 @@ TEST_BUILDERS = [
'Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All',
('Perf-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-'
'CommandBuffer'),
('Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-'
'Metal'),
('Perf-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-'
'MoltenVK_Vulkan'),
('Perf-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-'

3785
infra/bots/tasks.json
View File

File diff suppressed because it is too large Load Diff