Add jobs for Samsung Chromebook Plus

Also refactor the cipd package used to compile these, as it can be reused.

Bug: skia:
NOTRY=true
Change-Id: I53cf5b7fdfcb8cafd50791a0beaaf557fafa65c3
Reviewed-on: https://skia-review.googlesource.com/13252
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

infra/bots/assets/chromebook_arm_gles/README.md

@@ -1,10 +1,10 @@
 This asset is the necessary includes and libs to compile/link the gpu code
-for the ASUS Flip c100p chromebook. The mali gpu supports EGL and GLES.
+for ARM Chromebooks with gpu supports EGL and GLES.
 
-Zip up the /usr/lib folder on the Asus C100p Chromebook. Extract it somewhere
+Zip up the /usr/lib folder on any Arm Chromebook (e.g. Asus C100p). Extract it somewhere
 on the dev machine and use that folder as the input to create_and_upload:
 
-    ./infra/bots/assets/chromebook_c100p_lib/create_and_upload.py --lib_path [dir]
+    ./infra/bots/assets/chromebook_arm_gles/create_and_upload.py --lib_path [dir]
 
 This script installs the following GL packages and then bundles them with the
 unzipped libs:

infra/bots/assets/chromebook_arm_gles/VERSION

@@ -0,0 +1 @@
+0

infra/bots/assets/chromebook_c100p_lib/VERSION

@@ -1 +0,0 @@
-2

infra/bots/gen_tasks.go

@@ -103,7 +103,7 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string {
 			task_os = "Ubuntu"
 			ec = "Chromecast"
 		} else if strings.Contains(task_os, "ChromeOS") {
-			ec = parts["model"]
+			ec = "Chromebook_ARM_GLES"
 			task_os = "Ubuntu"
 		} else if task_os == "iOS" {
 			ec = task_os
@@ -270,9 +270,7 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str
 	} else if strings.Contains(name, "Chromebook") {
 		pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("clang_linux"))
 		pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("armhf_sysroot"))
-		if strings.Contains(name, "Chromebook_C100p") {
+		pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("chromebook_arm_gles"))
-			pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("chromebook_c100p_lib"))
-		}
 	} else if strings.Contains(name, "Ubuntu") {
 		if strings.Contains(name, "Clang") {
 			pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("clang_linux"))

infra/bots/gpu_map.json

@@ -14,5 +14,6 @@
   "IntelIris540":  "8086:1926",
   "IntelIris6100": "8086:162b",
   "MaliT764":      "MaliT764",
+  "MaliT860":      "MaliT860",
   "RadeonR9M470X": "1002:6646"
 }

infra/bots/jobs.json

@@ -10,9 +10,9 @@
   "Build-Mac-Clang-x86_64-Release",
   "Build-Mac-Clang-x86_64-Release-CommandBuffer",
   "Build-Ubuntu-Clang-arm-Debug-Android",
-  "Build-Ubuntu-Clang-arm-Debug-Chromebook_C100p",
+  "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
   "Build-Ubuntu-Clang-arm-Release-Android",
-  "Build-Ubuntu-Clang-arm-Release-Chromebook_C100p",
+  "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
   "Build-Ubuntu-Clang-arm64-Debug-Android",
   "Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs",
   "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan",
@@ -114,6 +114,8 @@
   "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench",
   "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug",
   "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-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-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
@@ -234,6 +236,8 @@
   "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan",
   "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug",
   "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release",
+  "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug",
+  "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release",
   "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
   "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
   "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",

infra/bots/recipe_modules/flavor/gn_chromebook_flavor.py

@@ -70,15 +70,13 @@ class GNChromebookFlavorUtils(gn_flavor.GNFlavorUtils):
     configuration = self.m.vars.builder_cfg.get('configuration')
     os            = self.m.vars.builder_cfg.get('os')
     target_arch   = self.m.vars.builder_cfg.get('target_arch')
-    extra_config  = self.m.vars.builder_cfg.get('extra_config', '')
 
     clang_linux = self.m.vars.slave_dir.join('clang_linux')
     # This is a pretty typical arm-linux-gnueabihf sysroot
     sysroot_dir = self.m.vars.slave_dir.join('armhf_sysroot')
     # This is the extra things needed to link against for the chromebook.
     #  For example, the Mali GL drivers.
-    if extra_config == 'Chromebook_C100p':
+    gl_dir   = self.m.vars.slave_dir.join('chromebook_arm_gles')
-      gl_dir   = self.m.vars.slave_dir.join('chromebook_c100p_lib')
 
     extra_asmflags = [
       '--target=armv7a-linux-gnueabihf',

infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json

@@ -100,7 +100,7 @@
       "[CUSTOM_/_B_WORK]/skia/bin/gn",
       "gen",
       "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p/Release",
-      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_asmflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-march=armv7-a\", \"-mfpu=neon\", \"-mthumb\"] extra_cflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-I[START_DIR]/chromebook_c100p_lib/include\", \"-I[START_DIR]/armhf_sysroot/include\", \"-I[START_DIR]/armhf_sysroot/include/c++/4.8.4\", \"-I[START_DIR]/armhf_sysroot/include/c++/4.8.4/arm-linux-gnueabihf\", \"-DMESA_EGL_NO_X11_HEADERS\"] extra_ldflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-B[START_DIR]/armhf_sysroot/bin\", \"-B[START_DIR]/armhf_sysroot/gcc-cross\", \"-L[START_DIR]/armhf_sysroot/gcc-cross\", \"-L[START_DIR]/armhf_sysroot/lib\", \"-L[START_DIR]/chromebook_c100p_lib/lib\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"arm\""
+      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_asmflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-march=armv7-a\", \"-mfpu=neon\", \"-mthumb\"] extra_cflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-I[START_DIR]/chromebook_arm_gles/include\", \"-I[START_DIR]/armhf_sysroot/include\", \"-I[START_DIR]/armhf_sysroot/include/c++/4.8.4\", \"-I[START_DIR]/armhf_sysroot/include/c++/4.8.4/arm-linux-gnueabihf\", \"-DMESA_EGL_NO_X11_HEADERS\"] extra_ldflags=[\"--target=armv7a-linux-gnueabihf\", \"--sysroot=[START_DIR]/armhf_sysroot\", \"-B[START_DIR]/armhf_sysroot/bin\", \"-B[START_DIR]/armhf_sysroot/gcc-cross\", \"-L[START_DIR]/armhf_sysroot/gcc-cross\", \"-L[START_DIR]/armhf_sysroot/lib\", \"-L[START_DIR]/chromebook_arm_gles/lib\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"arm\""
     ],
     "cwd": "[CUSTOM_/_B_WORK]/skia",
     "env": {

infra/bots/tasks.json

@@ -66,10 +66,10 @@
         "Build-Ubuntu-Clang-arm-Debug-Android"
       ]
     },
-    "Build-Ubuntu-Clang-arm-Debug-Chromebook_C100p": {
+    "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm-Debug-Chromebook_C100p"
+        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES"
       ]
     },
     "Build-Ubuntu-Clang-arm-Release-Android": {
@@ -78,10 +78,10 @@
         "Build-Ubuntu-Clang-arm-Release-Android"
       ]
     },
-    "Build-Ubuntu-Clang-arm-Release-Chromebook_C100p": {
+    "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES": {
       "priority": 0.8,
       "tasks": [
-        "Build-Ubuntu-Clang-arm-Release-Chromebook_C100p"
+        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES"
       ]
     },
     "Build-Ubuntu-Clang-arm64-Debug-Android": {
@@ -680,6 +680,18 @@
         "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench"
       ]
     },
+    "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug"
+      ]
+    },
+    "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release"
+      ]
+    },
     "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -1400,6 +1412,18 @@
         "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ]
     },
+    "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug"
+      ]
+    },
+    "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release"
+      ]
+    },
     "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -2153,7 +2177,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm-Debug-Chromebook_C100p": {
+    "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES": {
       "cipd_packages": [
         {
           "name": "skia/bots/clang_linux",
@@ -2166,9 +2190,9 @@
           "version": "version:3"
         },
         {
-          "name": "skia/bots/chromebook_c100p_lib",
+          "name": "skia/bots/chromebook_arm_gles",
-          "path": "chromebook_c100p_lib",
+          "path": "chromebook_arm_gles",
-          "version": "version:2"
+          "version": "version:0"
         }
       ],
       "dimensions": [
@@ -2182,7 +2206,7 @@
         "../../..",
         "compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm-Debug-Chromebook_C100p",
+        "buildername=Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
@@ -2221,7 +2245,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-arm-Release-Chromebook_C100p": {
+    "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES": {
       "cipd_packages": [
         {
           "name": "skia/bots/clang_linux",
@@ -2234,9 +2258,9 @@
           "version": "version:3"
         },
         {
-          "name": "skia/bots/chromebook_c100p_lib",
+          "name": "skia/bots/chromebook_arm_gles",
-          "path": "chromebook_c100p_lib",
+          "path": "chromebook_arm_gles",
-          "version": "version:2"
+          "version": "version:0"
         }
       ],
       "dimensions": [
@@ -2250,7 +2274,7 @@
         "../../..",
         "compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm-Release-Chromebook_C100p",
+        "buildername=Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_storage=<(PATCH_STORAGE)",
@@ -5669,6 +5693,98 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:45"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:MaliT860",
+        "os:ChromeOS",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "perf",
+        "repository=<(REPO)",
+        "buildername=Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:45"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:MaliT860",
+        "os:ChromeOS",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "perf",
+        "repository=<(REPO)",
+        "buildername=Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
       "cipd_packages": [
         {
@@ -5688,7 +5804,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Chromebook_C100p",
+        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -5734,7 +5850,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Chromebook_C100p",
+        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -11268,6 +11384,98 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:45"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:MaliT860",
+        "os:ChromeOS",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:45"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:5"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:MaliT860",
+        "os:ChromeOS",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_unix.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
       "cipd_packages": [
         {
@@ -11287,7 +11495,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Chromebook_C100p",
+        "Build-Ubuntu-Clang-arm-Debug-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -11333,7 +11541,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Chromebook_C100p",
+        "Build-Ubuntu-Clang-arm-Release-Chromebook_ARM_GLES",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -15672,6 +15880,32 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
+      "dependencies": [
+        "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release": {
       "dependencies": [
         "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release"
@@ -17622,6 +17856,58 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug": {
+      "dependencies": [
+        "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release": {
+      "dependencies": [
+        "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug": {
       "dependencies": [
         "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug"