| Index: infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json
|
| diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json
|
| similarity index 70%
|
| copy from infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| copy to infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json
|
| index 9d1e16ca839c193ea8f0b65ff4765be647e5185c..85380493c22066722b28b7f0907ad0c82009b8e6 100644
|
| --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
|
| +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json
|
| @@ -18,7 +18,7 @@
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -32,7 +32,7 @@
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -47,7 +47,7 @@
|
| "$EXTERNAL_STORAGE"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -60,7 +60,7 @@
|
| "root"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -73,7 +73,7 @@
|
| "10"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -86,7 +86,7 @@
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -100,7 +100,7 @@
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -115,7 +115,7 @@
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -129,7 +129,7 @@
|
| "stop"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -143,7 +143,7 @@
|
| "batteryproperties"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -157,7 +157,7 @@
|
| "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -171,7 +171,7 @@
|
| "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -187,7 +187,7 @@
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -222,7 +222,7 @@
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -257,7 +257,7 @@
|
| "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -266,65 +266,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
|
| - "shell",
|
| - "rm",
|
| - "-r",
|
| - "/storage/emulated/legacy/skiabot/skia_perf"
|
| - ],
|
| - "env": {
|
| - "BUILDTYPE": "Release",
|
| - "CHROME_HEADLESS": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "rmdir skia_perf"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
|
| - "shell",
|
| - "if",
|
| - "[",
|
| - "-e",
|
| - "/storage/emulated/legacy/skiabot/skia_perf",
|
| - "];",
|
| - "then",
|
| - "echo",
|
| - "FILE_EXISTS;",
|
| - "fi"
|
| - ],
|
| - "env": {
|
| - "BUILDTYPE": "Release",
|
| - "CHROME_HEADLESS": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "exists skia_perf",
|
| - "stdout": "/path/to/tmp/"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
|
| - "shell",
|
| - "mkdir",
|
| - "-p",
|
| - "/storage/emulated/legacy/skiabot/skia_perf"
|
| - ],
|
| - "env": {
|
| - "BUILDTYPE": "Release",
|
| - "CHROME_HEADLESS": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "mkdir skia_perf"
|
| - },
|
| - {
|
| - "cmd": [
|
| "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia",
|
| "--verbose",
|
| "--logcat",
|
| "-d",
|
| "arm_v7_neon",
|
| "-t",
|
| - "Release",
|
| + "Debug",
|
| "nanobench",
|
| "--undefok",
|
| "-i",
|
| @@ -359,6 +307,7 @@
|
| "~blurroundrect",
|
| "~patch_grid",
|
| "~desk_carsvg",
|
| + "~keymobi_shop_mobileweb_ebay_com.skp",
|
| "~inc0.gif",
|
| "~inc1.gif",
|
| "~incInterlaced.gif",
|
| @@ -377,32 +326,12 @@
|
| "~inc13.png",
|
| "~inc14.png",
|
| "~inc0.webp",
|
| - "~inc1.webp",
|
| - "--outResultsFile",
|
| - "/storage/emulated/legacy/skiabot/skia_perf/nanobench_abc123.json",
|
| - "--properties",
|
| - "gitHash",
|
| - "abc123",
|
| - "build_number",
|
| - "5",
|
| - "--key",
|
| - "arch",
|
| - "Arm7",
|
| - "compiler",
|
| - "GCC",
|
| - "cpu_or_gpu",
|
| - "GPU",
|
| - "cpu_or_gpu_value",
|
| - "Tegra3",
|
| - "model",
|
| - "Nexus7",
|
| - "os",
|
| - "Android"
|
| + "~inc1.webp"
|
| ],
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -411,52 +340,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "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-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data",
|
| - "511"
|
| - ],
|
| - "name": "makedirs perf_dir",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed",
|
| - "--verbose",
|
| - "/storage/emulated/legacy/skiabot/skia_perf",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data"
|
| - ],
|
| - "env": {
|
| - "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| - "CHROME_HEADLESS": "1",
|
| - "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "pull skia_perf"
|
| - },
|
| - {
|
| - "cmd": [
|
| "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
|
| "shell",
|
| "dumpsys",
|
| "batteryproperties"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -468,7 +358,7 @@
|
| "reboot"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -480,7 +370,7 @@
|
| "10"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
| @@ -493,7 +383,7 @@
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -507,7 +397,7 @@
|
| "env": {
|
| "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_ANDROID_VERBOSE_SETUP": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| @@ -520,7 +410,7 @@
|
| "kill-server"
|
| ],
|
| "env": {
|
| - "BUILDTYPE": "Release",
|
| + "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| },
|
|
|