add a few NativeFonts bots

These are no different from other bots yet, except that they only run
8888 GMs and unit tests.  They will in the future pass --nativeFonts
true, while other bots will pass --nativeFonts false, the effect of
which has not quite yet been pinned down.

Change-Id: I467852269856dda05330957bc357ef15a2c2a1eb
Reviewed-on: https://skia-review.googlesource.com/67769
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

5 files changed, 701 insertions, 104 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 282803c711..f000dfc304 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -119,7 +119,7 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string {
 		ec := []string{}
 		if val := parts["extra_config"]; val != "" {
 			ec = strings.Split(val, "_")
-			ignore := []string{"Skpbench", "AbandonGpuContext", "PreAbandonGpuContext", "Valgrind", "ReleaseAndAbandonGpuContext", "CCPR", "FSAA", "FAAA", "FDAA"}
+			ignore := []string{"Skpbench", "AbandonGpuContext", "PreAbandonGpuContext", "Valgrind", "ReleaseAndAbandonGpuContext", "CCPR", "FSAA", "FAAA", "FDAA", "NativeFonts"}
 			keep := make([]string, 0, len(ec))
 			for _, part := range ec {
 				if !util.In(part, ignore) {
@@ -247,7 +247,6 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 			}
 			d["device"] = device
 		} else if parts["cpu_or_gpu"] == "CPU" {
-			d["gpu"] = "none"
 			modelMapping, ok := map[string]map[string]string{
 				"AVX": {
 					"MacMini7.1": "x86-64-E5-2697_v2",
@@ -255,6 +254,7 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 				},
 				"AVX2": {
 					"GCE": "x86-64-Haswell_GCE",
+					"NUC5i7RYH": "x86-64-i7-5557U",
 				},
 				"AVX512": {
 					"GCE": "x86-64-Skylake_GCE",
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 6735d2a1c9..4aa3dd6bbf 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -285,6 +285,7 @@
   "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android",
   "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android",
+  "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts",
   "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android",
   "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-All-Android",
   "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android",
@@ -356,6 +357,7 @@
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast",
+  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41",
@@ -373,6 +375,7 @@
   "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All",
   "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All",
+  "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts",
   "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN",
   "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All",
   "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer",
@@ -424,6 +427,7 @@
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+  "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts",
   "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
@@ -477,6 +481,7 @@
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
+  "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
diff --git a/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts.json b/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts.json
new file mode 100644
index 0000000000..79ec0d7f41
--- /dev/null
+++ b/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts.json
@@ -0,0 +1,299 @@
+[
+  {
+    "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 downloaded 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 downloaded 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 downloaded 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",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "[START_DIR]\\tmp"
+    ],
+    "infra_step": true,
+    "name": "makedirs tmp_dir"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n  try:\n    with contextlib.closing(\n        urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n      hashes = w.read()\n      with open(sys.argv[1], 'w') as f:\n        f.write(hashes)\n        break\n  except Exception as e:\n    print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n    print e\n    if retry == RETRIES:\n      raise\n    waittime = WAIT_BASE * math.pow(2, retry)\n    print 'Retry in %d seconds.' % waittime\n    time.sleep(waittime)\n",
+      "[START_DIR]\\tmp\\uninteresting_hashes.txt"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug_x64",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]\\out"
+    },
+    "infra_step": true,
+    "name": "get uninteresting hashes",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
+      "@@@STEP_LOG_LINE@python.inline@import math@@@",
+      "@@@STEP_LOG_LINE@python.inline@import socket@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@import time@@@",
+      "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt'@@@",
+      "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@",
+      "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@",
+      "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
+      "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@    with contextlib.closing(@@@",
+      "@@@STEP_LOG_LINE@python.inline@        urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@",
+      "@@@STEP_LOG_LINE@python.inline@      hashes = w.read()@@@",
+      "@@@STEP_LOG_LINE@python.inline@      with open(sys.argv[1], 'w') as f:@@@",
+      "@@@STEP_LOG_LINE@python.inline@        f.write(hashes)@@@",
+      "@@@STEP_LOG_LINE@python.inline@        break@@@",
+      "@@@STEP_LOG_LINE@python.inline@  except Exception as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@    print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@",
+      "@@@STEP_LOG_LINE@python.inline@    print e@@@",
+      "@@@STEP_LOG_LINE@python.inline@    if retry == RETRIES:@@@",
+      "@@@STEP_LOG_LINE@python.inline@      raise@@@",
+      "@@@STEP_LOG_LINE@python.inline@    waittime = WAIT_BASE * math.pow(2, retry)@@@",
+      "@@@STEP_LOG_LINE@python.inline@    print 'Retry in %d seconds.' % waittime@@@",
+      "@@@STEP_LOG_LINE@python.inline@    time.sleep(waittime)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "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]\\out\\Debug_x64\\dm",
+      "--resourcePath",
+      "[START_DIR]\\skia\\resources",
+      "--skps",
+      "[START_DIR]\\skp",
+      "--images",
+      "[START_DIR]\\skimage\\dm",
+      "--colorImages",
+      "[START_DIR]\\skimage\\colorspace",
+      "--nameByHash",
+      "--properties",
+      "gitHash",
+      "abc123",
+      "builder",
+      "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts",
+      "swarming_bot_id",
+      "skia-bot-123",
+      "swarming_task_id",
+      "123456",
+      "--svgs",
+      "[START_DIR]\\svg",
+      "--key",
+      "arch",
+      "x86_64",
+      "compiler",
+      "Clang",
+      "configuration",
+      "Debug",
+      "cpu_or_gpu",
+      "CPU",
+      "cpu_or_gpu_value",
+      "AVX2",
+      "extra_config",
+      "NativeFonts",
+      "model",
+      "GCE",
+      "os",
+      "Win2k8",
+      "--uninterestingHashesFile",
+      "[START_DIR]\\tmp\\uninteresting_hashes.txt",
+      "--writePath",
+      "[CUSTOM_[SWARM_OUT_DIR]]\\dm",
+      "--dont_write",
+      "pdf",
+      "--randomProcessorTest",
+      "--nogpu",
+      "--config",
+      "8888",
+      "--src",
+      "tests",
+      "gm",
+      "--blacklist",
+      "_",
+      "image",
+      "gen_platf",
+      "pal8os2v2.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "pal8os2v2-16.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "rgba32abf.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "rgb24prof.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "rgb24lprof.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "8bpp-pixeldata-cropped.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "4bpp-pixeldata-cropped.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "32bpp-pixeldata-cropped.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "24bpp-pixeldata-cropped.bmp",
+      "_",
+      "gm",
+      "_",
+      "composeshader_bitmap",
+      "_",
+      "image",
+      "gen_platf",
+      "testimgari.jpg",
+      "_",
+      "image",
+      "gen_platf",
+      "rle8-height-negative.bmp",
+      "_",
+      "image",
+      "gen_platf",
+      "rle4-height-negative.bmp",
+      "--verbose"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug_x64",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]\\out"
+    },
+    "name": "dm"
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]
\ No newline at end of file
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 42615c586e..ba0992403d 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -111,6 +111,9 @@ def dm_flags(api, bot):
       # configurations.
       configs = ['8888', 'tiles_rt-8888']
 
+    if 'NativeFonts' in bot:
+      configs = ['8888']
+
   elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU':
     args.append('--nocpu')
 
@@ -266,6 +269,10 @@ def dm_flags(api, bot):
   if 'SK_FORCE_RASTER_PIPELINE_BLITTER' in bot:
     args.remove('tests')
 
+  if 'NativeFonts' in bot:  # images won't exercise native font integration :)
+    args.remove('image')
+    args.remove('colorImage')
+
   # TODO: ???
   blacklist('f16 _ _ dstreadshuffle')
   blacklist('glsrgb image _ _')
@@ -938,6 +945,7 @@ TEST_BUILDERS = [
   'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA',
   'Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All',
   'Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All',
+  'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts',
 ]
 
 
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 63e8f19cb0..1ecf19e9dc 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1725,6 +1725,12 @@
         "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android"
       ]
     },
+    "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts"
+      ]
+    },
     "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": {
       "priority": 0.8,
       "tasks": [
@@ -2151,6 +2157,12 @@
         "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast"
       ]
     },
+    "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts"
+      ]
+    },
     "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
       "priority": 0.8,
       "tasks": [
@@ -2253,6 +2265,12 @@
         "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All"
       ]
     },
+    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts"
+      ]
+    },
     "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN": {
       "priority": 0.8,
       "tasks": [
@@ -2561,6 +2579,12 @@
         "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
+    "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts"
+      ]
+    },
     "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
       "priority": 0.8,
       "tasks": [
@@ -2879,6 +2903,12 @@
         "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI"
       ]
     },
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts"
+      ]
+    },
     "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -5681,7 +5711,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -7987,7 +8016,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8035,7 +8063,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8088,7 +8115,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8141,7 +8167,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8189,7 +8214,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8237,7 +8261,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8290,7 +8313,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8338,7 +8360,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8391,7 +8412,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8439,7 +8459,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8487,7 +8506,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8540,7 +8558,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8588,7 +8605,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Skylake_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8636,7 +8652,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Skylake_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8872,7 +8887,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8920,7 +8934,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -8968,7 +8981,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -9016,7 +9028,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "gpu:none",
         "os:Mac-10.12.2",
         "pool:Skia"
       ],
@@ -9064,7 +9075,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "gpu:none",
         "os:Mac-10.12.2",
         "pool:Skia"
       ],
@@ -12770,7 +12780,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -12818,7 +12827,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -12866,7 +12874,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -13008,7 +13015,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -13056,7 +13062,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -13104,7 +13109,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -13152,7 +13156,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -13200,7 +13203,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -13248,7 +13250,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -13296,7 +13297,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -13344,7 +13344,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -13392,7 +13391,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -13440,7 +13438,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -13488,7 +13485,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -13778,6 +13774,40 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts": {
+      "dependencies": [
+        "Build-Debian9-Clang-arm64-Release-Android",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:MMB29K",
+        "device_type:zerofltetmo",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "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-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": {
       "dependencies": [
         "Build-Debian9-Clang-arm64-Debug-Android",
@@ -15620,7 +15650,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -15668,7 +15697,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -15721,7 +15749,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -15774,7 +15801,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -15827,7 +15853,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -15880,7 +15905,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -15933,7 +15957,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -15986,7 +16009,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16039,7 +16061,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16092,7 +16113,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16140,7 +16160,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16188,7 +16207,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16241,7 +16259,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16289,7 +16306,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16337,7 +16353,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16385,7 +16400,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16433,7 +16447,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16481,7 +16494,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16529,7 +16541,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16577,7 +16588,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16625,7 +16635,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16673,7 +16682,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16721,7 +16729,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16769,7 +16776,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16817,7 +16823,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16865,7 +16870,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16918,7 +16922,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16966,7 +16969,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -16990,6 +16992,53 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:32"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:93"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Debian9-Clang-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "os:Debian-9.1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
       "cipd_packages": [
         {
@@ -17014,7 +17063,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17062,7 +17110,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17110,7 +17157,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17158,7 +17204,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17211,7 +17256,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17264,7 +17308,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17312,7 +17355,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Skylake_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17360,7 +17402,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Skylake_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17596,7 +17637,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17644,7 +17684,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17692,7 +17731,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
       ],
@@ -17740,7 +17778,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "gpu:none",
         "os:Mac-10.12.2",
         "pool:Skia"
       ],
@@ -17788,7 +17825,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "gpu:none",
         "os:Mac-10.12.2",
         "pool:Skia"
       ],
@@ -17812,6 +17848,53 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:32"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:93"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-E5-2697_v2",
+        "os:Mac-10.12.2",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "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-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-TSAN": {
       "cipd_packages": [
         {
@@ -17836,7 +17919,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2697_v2",
-        "gpu:none",
         "os:Mac-10.12.2",
         "pool:Skia"
       ],
@@ -20293,6 +20375,53 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:32"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:93"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-i7-5557U",
+        "os:Windows-10-15063",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
@@ -21872,7 +22001,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -21920,7 +22048,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -21968,7 +22095,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22016,7 +22142,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22064,7 +22189,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22112,7 +22236,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22160,7 +22283,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22208,7 +22330,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22256,7 +22377,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22304,7 +22424,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22446,7 +22565,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22494,7 +22612,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22542,7 +22659,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22590,7 +22706,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
@@ -22638,7 +22753,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -22686,7 +22800,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -22734,7 +22847,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -22782,7 +22894,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -22806,6 +22917,53 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:32"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:93"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-E5-2670",
+        "os:Windows-7-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All": {
       "cipd_packages": [
         {
@@ -22830,7 +22988,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -22878,7 +23035,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
@@ -22926,7 +23082,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -22974,7 +23129,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -23022,7 +23176,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -23070,7 +23223,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -23118,7 +23270,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -23166,7 +23317,6 @@
       ],
       "dimensions": [
         "cpu:x86-64-E5-2670",
-        "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
@@ -25737,6 +25887,33 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts": {
+      "dependencies": [
+        "Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.1",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Android-Clang-GalaxyS6-CPU-Exynos7420-arm64-Release-All-Android_NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "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-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android": {
       "dependencies": [
         "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android"
@@ -27403,6 +27580,33 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+      "dependencies": [
+        "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.1",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "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-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
       "dependencies": [
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD"
@@ -27808,6 +28012,33 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts": {
+      "dependencies": [
+        "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.1",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "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-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": {
       "dependencies": [
         "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All"
@@ -28796,6 +29027,33 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts": {
+      "dependencies": [
+        "Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.1",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-Clang-NUC5i7RYH-CPU-AVX2-x86_64-Release-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "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-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
       "dependencies": [
         "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE"
@@ -30227,6 +30485,33 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts": {
+      "dependencies": [
+        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.1",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-NativeFonts",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "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-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All": {
       "dependencies": [
         "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All"