Rename Chromecast CPU tests to GPU tests
Also fix command flags to use skps instead of svgs Bug: skia:6706 Change-Id: Ie099abac738e6eb8808db9aef513a51940c5ccb1 Reviewed-on: https://skia-review.googlesource.com/18441 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
parent
18166eeaf2
commit
c78a2d70fc
@ -129,8 +129,8 @@
|
||||
"Perf-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release",
|
||||
"Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug",
|
||||
"Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release",
|
||||
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug",
|
||||
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release",
|
||||
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug",
|
||||
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release",
|
||||
"Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
|
||||
"Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
|
||||
"Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
|
||||
|
@ -303,8 +303,8 @@
|
||||
"/cache/skia/resources",
|
||||
"--images",
|
||||
"/cache/skia/resources/color_wheel.jpg",
|
||||
"--svgs",
|
||||
"/cache/skia/svgs",
|
||||
"--skps",
|
||||
"/cache/skia/skps",
|
||||
"--pre_log",
|
||||
"--match",
|
||||
"~matrixconvolution",
|
@ -339,8 +339,8 @@
|
||||
"/cache/skia/resources",
|
||||
"--images",
|
||||
"/cache/skia/resources/color_wheel.jpg",
|
||||
"--svgs",
|
||||
"/cache/skia/svgs",
|
||||
"--skps",
|
||||
"/cache/skia/skps",
|
||||
"--pre_log",
|
||||
"--match",
|
||||
"~matrixconvolution",
|
||||
@ -362,7 +362,7 @@
|
||||
"compiler",
|
||||
"GCC",
|
||||
"cpu_or_gpu",
|
||||
"CPU",
|
||||
"GPU",
|
||||
"cpu_or_gpu_value",
|
||||
"Cortex_A7",
|
||||
"model",
|
||||
@ -383,7 +383,7 @@
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release/data",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release/data",
|
||||
"511"
|
||||
],
|
||||
"name": "makedirs perf_dir",
|
||||
@ -405,7 +405,7 @@
|
||||
"adb",
|
||||
"pull",
|
||||
"/cache/skia/perf",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release/data"
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release/data"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
@ -415,7 +415,7 @@
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "pull /cache/skia/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release/data"
|
||||
"name": "pull /cache/skia/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release/data"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
@ -247,7 +247,7 @@ def perf_steps(api):
|
||||
'-i', api.flavor.device_dirs.resource_dir,
|
||||
'--images', api.flavor.device_path_join(
|
||||
api.flavor.device_dirs.resource_dir, 'color_wheel.jpg'),
|
||||
'--svgs', api.flavor.device_dirs.svg_dir,
|
||||
'--skps', api.flavor.device_dirs.skp_dir,
|
||||
'--pre_log',
|
||||
'--match', # skia:6581
|
||||
'~matrixconvolution',
|
||||
@ -339,8 +339,8 @@ TEST_BUILDERS = [
|
||||
'Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan',
|
||||
'Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android',
|
||||
'Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release',
|
||||
'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug',
|
||||
'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release',
|
||||
'Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug',
|
||||
'Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release',
|
||||
'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release',
|
||||
'Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer',
|
||||
'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release',
|
||||
|
@ -783,16 +783,16 @@
|
||||
"Upload-Perf-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release"
|
||||
]
|
||||
},
|
||||
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug": {
|
||||
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug": {
|
||||
"priority": 0.8,
|
||||
"tasks": [
|
||||
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug"
|
||||
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug"
|
||||
]
|
||||
},
|
||||
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release": {
|
||||
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release": {
|
||||
"priority": 0.8,
|
||||
"tasks": [
|
||||
"Upload-Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release"
|
||||
"Upload-Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release"
|
||||
]
|
||||
},
|
||||
"Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
|
||||
@ -6180,7 +6180,7 @@
|
||||
"max_attempts": 1,
|
||||
"priority": 0.8
|
||||
},
|
||||
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug": {
|
||||
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug": {
|
||||
"dependencies": [
|
||||
"Build-Ubuntu-GCC-arm-Debug-Chromecast",
|
||||
"Housekeeper-PerCommit-BundleRecipes",
|
||||
@ -6199,7 +6199,7 @@
|
||||
"../../..",
|
||||
"perf",
|
||||
"repository=<(REPO)",
|
||||
"buildername=Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug",
|
||||
"buildername=Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug",
|
||||
"swarm_out_dir=${ISOLATED_OUTDIR}",
|
||||
"revision=<(REVISION)",
|
||||
"patch_repo=<(PATCH_REPO)",
|
||||
@ -6212,7 +6212,7 @@
|
||||
"max_attempts": 1,
|
||||
"priority": 0.8
|
||||
},
|
||||
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release": {
|
||||
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release": {
|
||||
"dependencies": [
|
||||
"Build-Ubuntu-GCC-arm-Release-Chromecast",
|
||||
"Housekeeper-PerCommit-BundleRecipes",
|
||||
@ -6231,7 +6231,7 @@
|
||||
"../../..",
|
||||
"perf",
|
||||
"repository=<(REPO)",
|
||||
"buildername=Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release",
|
||||
"buildername=Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release",
|
||||
"swarm_out_dir=${ISOLATED_OUTDIR}",
|
||||
"revision=<(REVISION)",
|
||||
"patch_repo=<(PATCH_REPO)",
|
||||
@ -17900,9 +17900,9 @@
|
||||
"isolate": "upload_nano_results.isolate",
|
||||
"priority": 0.8
|
||||
},
|
||||
"Upload-Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release": {
|
||||
"Upload-Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release": {
|
||||
"dependencies": [
|
||||
"Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release"
|
||||
"Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release"
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-avx2",
|
||||
@ -17915,7 +17915,7 @@
|
||||
"../../..",
|
||||
"upload_nano_results",
|
||||
"repository=<(REPO)",
|
||||
"buildername=Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release",
|
||||
"buildername=Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release",
|
||||
"swarm_out_dir=${ISOLATED_OUTDIR}",
|
||||
"revision=<(REVISION)",
|
||||
"patch_repo=<(PATCH_REPO)",
|
||||
|
Loading…
Reference in New Issue
Block a user